From 1de2439a8a431556d242d55f0c770b72cbb326ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Pons?= <clement.pons@stms.fr>
Date: Tue, 22 Apr 2025 13:24:48 +0200
Subject: [PATCH] Completed ability editor

---
 db.sqlite                                 | Bin 614400 -> 614400 bytes
 db.sqlite-shm                             | Bin 32768 -> 32768 bytes
 db.sqlite-wal                             | Bin 325512 -> 103032 bytes
 pages/character/[id]/edit.client.vue      |  78 +++++++++-------------
 pages/character/[id]/index.client.vue     |   6 ++
 server/api/character/[id]/compiled.get.ts |  39 +++++------
 shared/character-config.json              |  46 ++++++++-----
 types/character.d.ts                      |   2 +-
 8 files changed, 87 insertions(+), 84 deletions(-)

diff --git a/db.sqlite b/db.sqlite
index bee505bf9b436d890b788b5e86def83f5c6c5fc2..aa8c1949889ec5cc537507704b04b6f99d6e7cd0 100644
GIT binary patch
delta 611
zcmY*WL2J}N7|njI&4#Y6So9!>?%>u-kggtz3$C&UdsPqw!!Asd>1HsQEHkqUrGza?
zm9U9Dc$i~7i=xoOUZnIY^xz*5ynEiG=p-o%9$vz{y!YmP`Swp6`=^bs-+B<PAD{Fd
z*7Nt@@$5#$dObUu&W<XzU#o^;ELd&BYS%umcB)&)^-G)8l~>#{jVsoHV>}~5s^1x0
zQy(U9RV}B0)F6RHCEmfBVyWgnrEp!@3Dng06xMHbZRGlxQxRg+a-62U(Y2ks#q&+D
zWE!`v?1B23!DH1*;Du>B=svQW)AtE{tc($sen2F3h4vO!gk2tO<NqkiBn_#j$%tv)
zMjnntKxp5W(T<OqH+Kt3a3FnsE-D}~<Rd!5!Q4jKNRLSSMc8<*^Qn*#-<{`R?qZe?
zRK^UMN4SvsCd&Gny;oEi5blz}d8?8NiAP+@$UI1E#1M<Jc{!n0oV#w8`LT_{$fG+{
zYf)=2jt?%Ira`S_OFf@Jvxc{6KqV#lN9AYm@}i9-$CMRi_LP;u9o0+WsX9xctyWTa
zqQ2-YSp%`_`gs>sPxR8d87yn7kesl7@so1Cq5h;$Rc8};1abVfa|jv>8jBhiG?p~X
KY3Hzd^5Y+~fXFid

delta 285
zcmZoTpxSUib;F)GrU3KJ`{L{sLG=Inukwr>&0ptl|2m(M=K(M86$WOG*9;u5x&8Q^
zHY*C;<=|{dU}I-c=j>FS?%v6?VEg+{rj?9RwK__<`6-!cnW;s^N><giwXMwT><pQl
zoto3P^)MMu5AR^oo4&u7iEa9aKBj=_YJE&W)7Nz{se#0_r&shb$xd(YV&a|7+sPyb
zS0^z2NEegf^om|4#pzS~fTn!zVan#JWnf^;13I9?9OMAE=?Yy;Y)ndK(-r%eM5eFq
zWHOl!bW#sbtd3H0X;Ef=ab`*7^ow0g3ez`qG4XMNgfkM0GK<@t`k8>38Hibcm=%cG
NfS7%|Q$NSP3jl&rWrF|!

diff --git a/db.sqlite-shm b/db.sqlite-shm
index 5ae9413bdbaa0909c5efc38075f96f9ae395237c..f68e0ef159a5ca46c0f23751d386d8a73a830990 100644
GIT binary patch
delta 223
zcmZo@U}|V!s+V}A%K!pGK+MR%ARq~(rvb4r-~BJ&H`_k3`+n4ImYB=LJr{4zO0oDC
zL8^M7QD6Wv_dgPV3bQe=f>;y(Msu<QX(=F1+<cJnu@9pJkWy!1WSsmlTy*mx#urSC
r;y{tVOu|e+E$j@O4BQO74Ezj&48jbeKnZIuMoA!*FTuzRqykw1z(zq*

delta 320
zcmb7=yG{aO5QV?p6++M$;uWtbqN0KqTt&GkDtH52t@I73A@*)#Z2e=j-p1Ojy*>j4
zg{|@go7ls@hQgLFIhmQ0$(dwKQ#DQXF8CA2B`Kvqz>xLDoj;q2-eL9Q_W3^b@LDfs
z^-8mm`L1=lFQfi&b6fxD*j|EeCxjs^T|8b2D<`a&{rgpVS8g;-L3?tp2a}_WF~Jle
z!bDgg$}%xlSto(cHan!qut$zV@*H!@IVCP^=gm`A>A{N+KYjEQV1OY;<k@j1nP!GL
o=2>Kk72>S1!6sYs8@r^*vd;lW6gc6GB4rHQsfLwV+qv?z0iX*>fdBvi

diff --git a/db.sqlite-wal b/db.sqlite-wal
index d3e350d754e9941ce9391ec465efebcf07dac831..f840e85ba4ae57b1028c1b0e3825334879740c8d 100644
GIT binary patch
delta 1511
zcmeBpFZ^Q(n}vBjTN8usBMAlu0R|AT`+n4ImYB;#={3IsQ*OMN02E>a;%PAPl}GGE
zn5C4zZx0Y=+QY|`o4=h;iOGvm04D$Epdw@3-#fLN0|fr^Yv<;x0X1tP8{mA@=4L3b
zK^renkeSntfzys>Ex!|o`^G?X4!))$PId-S&emv#kksOm=@W#QB&Tx=F^Nx)6=YIk
zHqkMdepY}<Yx-J2CfVt+{7f8RAvr-Nb(L5hrR0pnqRislL?x@}XhR)?Se<AiFxi&F
z#?GM5*=svphlgpw^gH}aoZHXxFs)#$S4u3&$Vn~9OfClM0V`HYOfJe#N`wl5O;O6s
zE6L2wOaTh!=K<9jfDBbC&PmNo&nU@H%Sg;i0g6JD7MG+Z=9FXr`9QaVRFxK$WtJu8
zz_n%Ol>t4LnGQCr9w=-KR+o`kT#{c@2{$LPC^<0?<PnH;X<kZdQE>^-rp&x_xM)FY
zQF3Yl)Kw7sa#K@MlQZ*D;RXTK6qhCzLtGAVBTxlYmjcAowK__<`6-!cnLxElR@Jq&
ztwQYV44Isr?$i7Em<+ee3ot1%!z0+%Y$A{6trAsO0%$`^02+5*ywnogb{L!hq;uOq
z2>>MpJ)YVcb+K>NBd7t@^Uw^iKCpQEI)|5EAO=*=!!V%nK3B(d+eC4g0SnL!Sj?%Y
z`n~h+U#I~KFbr6JAye#aj6Dm?fQ4uV+)!A%nPcZCIj8{(F%0OfSl*Hy`s5|dfaPcg
zu=z(nWIrrF9csXG3<KEZI)g%PWV68xSdC_YLi2O|of7&hpa!hQFksTm`3$Qn6=%Z?
zSchi7be0y`X-|Jogc`68!vLeSlYIA0@4bK-umR10(}wNZFFU0sK@He|VL*>?_Mi1(
z*L7hAY(+C5+N0y<>;sjr!3HQ*Z-p5EFJZ1NYxo$Jo_hjR5U}&@+i1U)kEt4LiYuco
zJ93e6=*P|Ji}jyaaDi3cX5eS#yUl-{znNd3e=UC`f8^$g1~d6sHCaMA87H6PQ(@zP
zF#iCV>=33FzX}^0m^r;biAjYGqImi|5Ss-eeg?#5hOmEu*i0Hg134!P2&kw4?Ue#z
zxYG|lknCS(;%*LdIwSuR2L31fCxDLF!yhBX#B9uBW@2e>Y++<%U|?)yY;Iv@VPKJ-
zxMPD9BT!D)*v!Dd(!k8X)WX2f+{nzr+$@8=^D@w&L?DJ2vtRD>2|uyj{2k<FM*f!!
c{4e=00&O_TuP@GQ%!tJTCNXAXPArB405}-p0RR91

delta 2601
zcmZYAc`)2(7zglOI_pfx=voa@q{O*OscX7YkyIt?TygADsiRr4kwHY*73&B_2zHn4
zI7%X!b~F_>Y^Scq*=Z#t6Q+_7#TcqZ(AKSq-=otv?>qDU^Zw>D-{*a2e$TU7OUYf(
za&)*t$sk!x=#WU7q}MA^lI@&xYw)DTIcbiTF;({Ji1KQe?wzae6R!GoGD~FX@3-z(
z@V_WyxO$Q`_rB7Gp6e^$etu8pqq(J_>wnSYP40QZ)XV-;^)lc|D1Tw>EQ-5kUjRG_
z<4&5n?hLAw1w0?+0lzD8|4{ie4R}7rIsPLdy?HJwz@;c(6#2c|-;vV?T#E6@!ZgjA
zmiWJc*P?vNan^n+O6zOjwHV(~R+_%7_mmC15#_7*3oRs6@fqNa827*M7U$c#;AG&<
zC||1$6YBN*+X8RKIMY0JDQ38}0Jt3G1M*(^+d5P>a5=`q=4qyPcc@Q+_n^G$rwAr(
zph^#T55~7DHq%^J-}wsoFv@Eqdb{GcRhxhhV?62~kHoruh92-4lvi&Y_;Om-7!7;|
z<JZ-MalVx+%LHd>p?oW=Z*lB<?Uw{+X<@wayyX6qVP-DD1Jh8h?NJ>6LtnQu!2{DU
zZpd8|dH<Xu0iKTX%^L;xgbM<A`M`9HKdje?id^sy0ltp%*4V=zau>*ANMFY|Rp++c
zgONr9zJ>A!0Zz#iDh9^8+$?bGH8=bJ|31>Z$XuguxbIW*A}K1*k(B4u?`XI+_>L;8
zWQ9|dNJmuij79Zk)v`eIZ^#D)mPWj|NNzMYDn7x;IaMGak;tEsxGH&OqC-|TqE2g?
z$i<o`Dx~{~$aHTR)rzh7U+?IC5+XNfD1Ss08pKBnJ#Un7_GUxe5#pXfeC(bbtd@tD
z&n*24T!8X8^2^w^e2N=z0mgO22|S@?x&!cHl-u%Kv@5dA1ArG}yf8YCrF0<XJK)tQ
zr<W?4-Rej+0A7u8myv;EykC;GfWOfi_%`&&IvyheINlmMmCDx#j{h|Uyd6z1)P0;&
z=F1xc-j1bT?bdg)91l7Sd=%v~_2YhRC-Z%Qk7B&X+T_OyXS)>O%P42=H_3L*xXK5<
zjPXa;QtVQrX4MEDtblTo=bW%;jaozSU<Hi3ACGZUVzmbmoc+c`ar&U*`Y9pf2Ep0*
zL}}Ntre3PC*&#TGxtp%BH_tjPM#g%pb7kI|+ZwtYCKkTklHl{(k}(5xE?RqI)?@nt
zes&QN&dJ3%`)H-C%Ud`EyaeTocQRR~K9%LbOE5k(IJUjv$<G2VLiuc+cq9GTd>C*M
z&Q)c@)+Gfzf`?k5{F3-w{>|(lU4n;NU|g(kd#Fiu#S6G6%10K<)i(2;?gID3_<Pdv
zVaEr?UjX+*xg^gpRYzSv6u2M8<372vUGc(c6*vdw8PBYqCDRH%2hPDbWqhVI-Kgth
z;6jwUcq>|1m}Kq%7h=4oR#G)ly^;Yu2jz6(d~67}DG_)M#*^))v`=T2Yyj^@Iop*|
zUO9M_47?lTAFUKkW(+03%ZI6=eELEbC#cNeEWyK6F>WZWSUPp^w17wtUqZR<WV=I~
N0#$97D~2zd{0p3%?WzC(

diff --git a/pages/character/[id]/edit.client.vue b/pages/character/[id]/edit.client.vue
index 291a4ef..485107d 100644
--- a/pages/character/[id]/edit.client.vue
+++ b/pages/character/[id]/edit.client.vue
@@ -26,6 +26,18 @@ const mainStatTexts: Record<MainStat, string> = {
     "charisma": "Charisme",
     "psyche": "Psyché",
 }
+
+function abilitySpecialFeatures(type: "points" | "max", curiosity: DoubleIndex<TrainingLevel>[], value: number): number
+{
+    if(type === 'points')
+    {
+        if(curiosity.find(e => e[0] == 7 && e[1] === 0))
+            return Math.max(6, value);
+        if(curiosity.find(e => e[0] == 7 && e[1] === 2))
+            return value + 1;
+    }
+    return value;
+}
 </script>
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
@@ -71,11 +83,11 @@ const trainingPoints = computed(() => {
 });
 const training = computed(() => Object.entries(characterConfig.training).map(e => [e[0], getFeaturesOf(e[0] as MainStat, data.value.progress.training[e[0] as MainStat])]) as [MainStat, TrainingOption[]][])
 const maxTraining = computed(() => Object.entries(data.value.progress.training).reduce((p, v) => { p[v[0]] = v[1].reduce((_p, _v) => Math.max(_p, _v[0]) , 0); return p; }, {} as Record<MainStat, number>));
-const trainingSpent = computed(() => Object.values(maxTraining.value).reduce((p, v) => p + v));
-const modifiers = computed(() => Object.entries(maxTraining.value).reduce((p, v) => { p[v[0]] = Math.floor(v[1] / 3) + (data.value.progress.modifiers ? data.value.progress.modifiers[v[0]] : 0); return p; }, {} as Record<MainStat, number>))
+const trainingSpent = computed(() => Object.values(maxTraining.value).reduce((p, v) => p + v, 0));
+const modifiers = computed(() => Object.entries(maxTraining.value).reduce((p, v) => { p[v[0]] = Math.floor(v[1] / 3) + (data.value.progress.modifiers ? (data.value.progress.modifiers[v[0] as MainStat] ?? 0) : 0); return p; }, {} as Record<MainStat, number>))
 const abilityPoints = computed(() => training.value.flatMap(e => e[1].filter(_e => _e.ability !== undefined)).reduce((p, v) => p + v.ability!, 0));
-const abilityMax = computed(() => Object.entries(characterConfig.ability).reduce((p, v) => { p[v[0]] = Math.floor(maxTraining.value[v[1].max[0]] / 3) + Math.floor(maxTraining.value[v[1].max[1]] / 3); return p; }, {} as Record<Ability, number>));
-const abilitySpent = computed(() => Object.values(data.value.progress.abilities ?? {}).reduce((p, v) => p + v[1], 0));
+const abilityMax = computed(() => Object.entries(characterConfig.ability).reduce((p, v) => { p[v[0]] = abilitySpecialFeatures("max", data.value.progress.training.curiosity, Math.floor(maxTraining.value[v[1].max[0]] / 3) + Math.floor(maxTraining.value[v[1].max[1]] / 3)); return p; }, {} as Record<Ability, number>));
+const abilitySpent = computed(() => Object.values(data.value.progress.abilities ?? {}).reduce((p, v) => p + v[0], 0));
 
 if(id !== 'new')
 {
@@ -167,6 +179,11 @@ function updateLevel()
 }
 async function save(leave: boolean)
 {
+    if(data.value.name === '' || data.value.progress.race.index === undefined || data.value.progress.race.index === -1)
+    {                
+        add({ title: 'Données manquantes', content: "Merci de saisir un nom et une race avant de pouvoir enregistrer votre personnage", type: 'error', duration: 25000, timer: true });
+        return;
+    }
     if(id === 'new')
     {
         id = await useRequestFetch()(`/api/character`, {
@@ -263,46 +280,10 @@ useShortcuts({
                             <Icon icon="radix-icons:caret-right" class="w-6 h-6 border border-light-30 dark:border-dark-30 cursor-pointer" @click="() => trainingTab = clamp(trainingTab + 1, 0, 6)" />
                         </div>
                         <div class="flex gap-4 relative" :style="`left: calc(calc(-100% - 1em) * ${trainingTab}); transition: left .5s ease;`">
-                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative">
-                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">Force<span v-if="maxTraining.strength >= 0">: Niveau {{ maxTraining.strength }} (+{{ modifiers.strength }})</span></div>
-                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training.strength" :class="{ 'opacity-30': index > maxTraining.strength + 1 }">
-                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption('strength', index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining.strength + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training.strength?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
-                                </div>
-                            </div>
-                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative">
-                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">Dextérité<span v-if="maxTraining.dexterity >= 0">: Niveau {{ maxTraining.dexterity }} (+{{ modifiers.dexterity }})</span></div>
-                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training.dexterity" :class="{ 'opacity-30': index > maxTraining.dexterity + 1 }">
-                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption('dexterity', index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining.dexterity + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training.dexterity?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
-                                </div>
-                            </div>
-                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative">
-                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">Constitution<span v-if="maxTraining.constitution >= 0">: Niveau {{ maxTraining.constitution }} (+{{ modifiers.constitution }})</span></div>
-                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training.constitution" :class="{ 'opacity-30': index > maxTraining.constitution + 1 }">
-                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption('constitution', index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining.constitution + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training.constitution?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
-                                </div>
-                            </div>
-                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative">
-                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">Intelligence<span v-if="maxTraining.intelligence >= 0">: Niveau {{ maxTraining.intelligence }} (+{{ modifiers.intelligence }})</span></div>
-                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training.intelligence" :class="{ 'opacity-30': index > maxTraining.intelligence + 1 }">
-                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption('intelligence', index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining.intelligence + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training.intelligence?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
-                                </div>
-                            </div>
-                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative">
-                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">Curiosité<span v-if="maxTraining.curiosity >= 0">: Niveau {{ maxTraining.curiosity }} (+{{ modifiers.curiosity }})</span></div>
-                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training.curiosity" :class="{ 'opacity-30': index > maxTraining.curiosity + 1 }">
-                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption('curiosity', index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining.curiosity + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training.curiosity?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
-                                </div>
-                            </div>
-                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative">
-                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">Charisme<span v-if="maxTraining.charisma >= 0">: Niveau {{ maxTraining.charisma }} (+{{ modifiers.charisma }})</span></div>
-                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training.charisma" :class="{ 'opacity-30': index > maxTraining.charisma + 1 }">
-                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption('charisma', index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining.charisma + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training.charisma?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
-                                </div>
-                            </div>
-                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative">
-                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">Psyché<span v-if="maxTraining.psyche >= 0">: Niveau {{ maxTraining.psyche }} (+{{ modifiers.psyche }})</span></div>
-                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training.psyche" :class="{ 'opacity-30': index > maxTraining.psyche + 1 }">
-                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption('psyche', index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining.psyche + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training.psyche?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
+                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative" v-for="(text, stat) of mainStatTexts">
+                                <div class="sticky top-1 left-16 py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold self-start border border-light-30 dark:border-dark-30">{{ text }}<span v-if="maxTraining[stat] >= 0">: Niveau {{ maxTraining[stat] }} (+{{ modifiers[stat] }})</span></div>
+                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training[stat]" :class="{ 'opacity-30': index > maxTraining[stat] + 1 }">
+                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption(stat, index as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining[stat] + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.progress.training[stat]?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
                                 </div>
                             </div>
                         </div>
@@ -314,12 +295,14 @@ useShortcuts({
                     <span class="font-bold text-xl">Compétences</span>
                 </template>
                 <template #default>
-                    <div class="flex flex-col gap-2 px-4">
-                        <span class="text-xl -mx-2" :class="{ 'text-light-red dark:text-dark-red': (abilityPoints ?? 0) < abilitySpent }">Points d'entrainement restants: {{ (abilityPoints ?? 0) - abilitySpent }}</span>
+                    <div class="flex flex-col gap-2 max-h-[50vh] px-4 relative overflow-y-auto">
+                        <div class="sticky top-0 py-2 bg-light-0 dark:bg-dark-0 z-10 flex justify-between">
+                            <span class="text-xl -mx-2" :class="{ 'text-light-red dark:text-dark-red': (abilityPoints ?? 0) < abilitySpent }">Points d'entrainement restants: {{ (abilityPoints ?? 0) - abilitySpent }}</span>
+                        </div>
                         <div v-for="(ability, index) of characterConfig.ability" class="grid grid-cols-10 gap-4 items-center">
                             <span class="text-lg col-span-2">{{ ability.name }}</span>
                             <span class="text-sm text-light-70 dark:text-dark-70 col-span-2">({{ mainStatTexts[ability.max[0]] }} + {{ mainStatTexts[ability.max[1]] }})</span>
-                            <NumberFieldRoot :min="0" :max="20" :default-value="data.progress.abilities[index] ? data.progress.abilities[index][0] : 0" @update:model-value="(value) => { data.progress.abilities[index] = [value, data.progress.abilities[index] ? data.progress.abilities[index][1] : 0]; console.log(abilitySpent) }" class="flex justify-center border border-light-35 dark:border-dark-35 bg-light-20 dark:bg-dark-20 data-[disabled]:border-light-20 dark:data-[disabled]:border-dark-20 data-[disabled]:bg-light-20 dark:data-[disabled]:bg-dark-20 
+                            <NumberFieldRoot :min="0" :max="abilityMax[index]" :default-value="data.progress.abilities[index] ? data.progress.abilities[index][0] : 0" @update:model-value="(value) => { data.progress.abilities[index] = [value, data.progress.abilities[index] ? data.progress.abilities[index][1] : 0]; console.log(abilitySpent) }" class="flex justify-center border border-light-35 dark:border-dark-35 bg-light-20 dark:bg-dark-20 data-[disabled]:border-light-20 dark:data-[disabled]:border-dark-20 data-[disabled]:bg-light-20 dark:data-[disabled]:bg-dark-20 
                         data-[disabled]:text-light-70 dark:data-[disabled]:text-dark-70 hover:border-light-50 dark:hover:border-dark-50 has-[:focus]:shadow-raw transition-[box-shadow] has-[:focus]:shadow-light-40 dark:has-[:focus]:shadow-dark-40">
                                 <NumberFieldInput class="tabular-nums w-20 bg-transparent px-3 py-1 outline-none caret-light-50 dark:caret-dark-50" />
                             </NumberFieldRoot>
@@ -328,7 +311,6 @@ useShortcuts({
                     </div>
                 </template>
             </Collapsible>
-            <div class="h-[50vh]"></div>
         </div>
     </div>
 </template>
\ No newline at end of file
diff --git a/pages/character/[id]/index.client.vue b/pages/character/[id]/index.client.vue
index 8b3b474..f01cf5b 100644
--- a/pages/character/[id]/index.client.vue
+++ b/pages/character/[id]/index.client.vue
@@ -96,6 +96,12 @@ const { data: character, status, error } = await useAsyncData(() => useRequestFe
                         <span>Sorts de savoir: <span class="font-bold">{{ character.spellranks.knowledge }}</span></span>
                         <span>Sorts d'instinct: <span class="font-bold">{{ character.spellranks.instinct }}</span></span>
                     </div>
+                    <div class="flex flex-col">
+                        <span class="text-lg font-semibold border-b border-light-30 dark:border-dark-30 mb-2">Compétences</span>
+                        <div class="grid grid-cols-3 gap-1">
+                            <div class="flex flex-col px-2 items-center" v-for="(value, ability) of character.abilities"><span class="font-bold">+{{ value }}</span><span>{{ config.ability[ability].name }}</span></div>
+                        </div>
+                    </div>
                 </div>
                 <div class="flex flex-1 flex-col border-l border-light-30 dark:border-dark-30 ps-8 gap-4 py-8 max-w-[80rem]">
                     <div class="grid grid-cols-3 gap-2">
diff --git a/server/api/character/[id]/compiled.get.ts b/server/api/character/[id]/compiled.get.ts
index ffde9e6..264d0ec 100644
--- a/server/api/character/[id]/compiled.get.ts
+++ b/server/api/character/[id]/compiled.get.ts
@@ -135,23 +135,23 @@ function compileCharacter(character: Character & { username?: string }): Compile
             misc: [],
         },
         abilities: {
-            athletics: [0, 0],
-            acrobatics: [0, 0],
-            intimidation: [0, 0],
-            sleightofhand: [0, 0],
-            stealth: [0, 0],
-            survival: [0, 0],
-            investigation: [0, 0],
-            history: [0, 0],
-            religion: [0, 0],
-            arcana: [0, 0],
-            understanding: [0, 0],
-            perception: [0, 0],
-            performance: [0, 0],
-            medecine: [0, 0],
-            persuasion: [0, 0],
-            animalhandling: [0, 0],
-            deception: [0, 0]
+            athletics: 0,
+            acrobatics: 0,
+            intimidation: 0,
+            sleightofhand: 0,
+            stealth: 0,
+            survival: 0,
+            investigation: 0,
+            history: 0,
+            religion: 0,
+            arcana: 0,
+            understanding: 0,
+            perception: 0,
+            performance: 0,
+            medecine: 0,
+            persuasion: 0,
+            animalhandling: 0,
+            deception: 0
         },
         spellslots: 0,
         spellranks: {
@@ -195,14 +195,15 @@ function compileCharacter(character: Character & { username?: string }): Compile
 
     features.forEach(e => e[1].forEach((_e, i) => applyTrainingOption(e[0], _e, compiled, i === e[1].length - 1)));
     specialFeatures(compiled, character.progress.training);
+
+    Object.entries(character.progress.abilities).forEach(e => compiled.abilities[e[0]] += e[1][0]);
+    
     return compiled;
 }
 function applyTrainingOption(stat: MainStat, option: TrainingOption, character: CompiledCharacter, last: boolean)
 {
     if(option.health) character.health += option.health;
     if(option.mana) character.mana += option.mana;
-    if(option.modifier) option.modifier.forEach(e => character.modifier[e[0]] += e[1]);
-    if(option.ability) option.ability.forEach(e => character.abilities[e[0]]![0] += e[1]);
     if(option.mastery) character.mastery[option.mastery]++;
     if(option.speed) character.speed = option.speed;
     if(option.initiative) character.initiative += option.initiative;
diff --git a/shared/character-config.json b/shared/character-config.json
index 078f88c..ba591c4 100644
--- a/shared/character-config.json
+++ b/shared/character-config.json
@@ -1720,7 +1720,8 @@
                             "disposable": false,
                             "replaced": true
                         }
-                    ]
+                    ],
+                    "ability": 6
                 }
             ],
             "1": [
@@ -1735,7 +1736,8 @@
                             "disposable": false,
                             "replaced": true
                         }
-                    ]
+                    ],
+                    "ability": 3
                 }
             ],
             "2": [
@@ -1745,7 +1747,8 @@
                             "text": "+5 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 5
                 }
             ],
             "3": [
@@ -1755,7 +1758,8 @@
                             "text": "+3 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 3
                 }
             ],
             "4": [
@@ -1765,7 +1769,8 @@
                             "text": "+4 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 4
                 }
             ],
             "5": [
@@ -1799,7 +1804,8 @@
                             "text": "+3 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 3
                 }
             ],
             "6": [
@@ -1822,7 +1828,8 @@
                             "text": "+1 point de compétence.",
                             "disposable": false
                         }
-                    ]
+                    ],
+                    "ability": 1
                 },
                 {
                     "description": [
@@ -1830,7 +1837,8 @@
                             "text": "+3 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 3
                 }
             ],
             "7": [
@@ -1838,13 +1846,14 @@
                     "description": [
                         {
                             "text": "Le maximum de toutes les compétences est de 6 points, sauf s'il est déjà supérieur.",
-                            "disposable": false
+                            "disposable": true
                         },
                         {
                             "text": "+2 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 2
                 },
                 {
                     "description": [
@@ -1858,13 +1867,14 @@
                     "description": [
                         {
                             "text": "Le maximum de toutes les compétences augmente de 1 point.",
-                            "disposable": false
+                            "disposable": true
                         },
                         {
                             "text": "+2 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 2
                 }
             ],
             "8": [
@@ -1890,7 +1900,8 @@
                             "text": "+4 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 4
                 }
             ],
             "9": [
@@ -1942,7 +1953,8 @@
                             "text": "+4 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 4
                 }
             ],
             "11": [
@@ -1968,7 +1980,8 @@
                             "text": "+4 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 4
                 }
             ],
             "12": [
@@ -2020,7 +2033,8 @@
                             "text": "+5 points de compétence.",
                             "disposable": true
                         }
-                    ]
+                    ],
+                    "ability": 5
                 }
             ],
             "14": [
diff --git a/types/character.d.ts b/types/character.d.ts
index 28b98a6..9758c52 100644
--- a/types/character.d.ts
+++ b/types/character.d.ts
@@ -145,7 +145,7 @@ export type CompiledCharacter = {
     };
 
     modifier: Record<MainStat, number>;
-    abilities: Partial<Record<Ability, [number, number]>>;
+    abilities: Partial<Record<Ability, number>>;
     level: number;
     features: Record<Category, string[]>; //Currently: List of training option as text. TODO: Update to a more complex structure later
 };
\ No newline at end of file