unified damage and heal values to numbers

src/app/journal/journal-stats/life-container/life/life-details/life-details.component.ts

@@ -42,8 +42,6 @@ export class LifeDetailsComponent {
   }
 
   public setHitDice(hitDiceData: any): void {
-    console.log('HITDICE IN DETAILS: ', hitDiceData);
-
     this.hitDice = hitDiceData;
   }
 

src/app/journal/journal-stats/weapons-container/spell-table/spell-table.component.html

@@ -148,12 +148,12 @@
       @if (spell.doesDamage) {
         <div *ngFor="let damage of spell.damage; let index = index">
           <span>
-            {{ damage.diceNumber }} {{ "general.dice" | translate }}
-            {{ damage.diceType }}
+            {{ damage.diceNumber }}
+            {{ "general.dice" | translate }}{{ damage.diceType }}
           </span>
           <span>
             <icon
-              [size]="'xs'"
+              [size]="'m'"
               [type]="'damage'"
               [icon]="damage.damageType"
             ></icon>
@@ -163,8 +163,8 @@
       @if (spell.doesHeal) {
         <div class="heal">
           <span
-            >{{ spell.heal.diceNumber }} {{ "general.dice" | translate }}
-            {{ spell.heal.diceType }}
+            >{{ spell.heal.diceNumber }} {{ "general.dice" | translate
+            }}{{ spell.heal.diceType }}
           </span>
           <span *ngIf="spell.heal.additionalHeal"
             >+{{ spell.heal.additionalHeal }}

src/app/journal/journal-stats/weapons-container/weapon-table/weapon-modal/weapon-modal.component.html

@@ -110,9 +110,9 @@
                 </div>
                 <mat-form-field appearance="outline">
                   <mat-select [(ngModel)]="magicBonus">
-                    @for (magicBonus of magicBonuses; track magicBonus) {
-                      <mat-option [value]="magicBonus.value">
-                        {{ magicBonus.display }}
+                    @for (magicBonus of [1, 2, 3, 4, 5]; track magicBonus) {
+                      <mat-option [value]="magicBonus">
+                        +{{ magicBonus }}
                       </mat-option>
                     }
                   </mat-select>
@@ -169,7 +169,9 @@
                     <mat-form-field appearance="outline">
                       <mat-select [(ngModel)]="versatileDamage">
                         @for (die of dice; track die) {
-                          <mat-option [value]="die"> {{ die }} </mat-option>
+                          <mat-option [value]="die">
+                            {{ die }}{{ "general.die" | translate }}
+                          </mat-option>
                         }
                       </mat-select>
                     </mat-form-field>

src/app/journal/journal-stats/weapons-container/weapon-table/weapon-modal/weapon-modal.component.ts

@@ -19,7 +19,7 @@ export class WeaponModalComponent {
   public hasReach: boolean = false;
   public throwRange: number[] = [5, 5];
   public attackBonus: string = '+0';
-  public damage: Damage[] = [{ diceNumber: '', diceType: '', damageType: '' }];
+  public damage: Damage[] = [{ diceNumber: 0, diceType: 0, damageType: '' }];
   public hasAdditionalDamage: boolean = false;
   public additionalDamage: number = 0;
   public useAttributeModifier: boolean = false;
@@ -96,14 +96,6 @@ export class WeaponModalComponent {
 
   additonalDamages: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
-  public magicBonuses: any[] = [
-    { display: '+1', value: 1 },
-    { display: '+2', value: 2 },
-    { display: '+3', value: 3 },
-    { display: '+4', value: 4 },
-    { display: '+5', value: 5 },
-  ];
-
   public ngOnInit(): void {
     if (this.isUpdate) {
       this.loadItem();
@@ -185,7 +177,7 @@ export class WeaponModalComponent {
     this.hasReach = false;
     this.throwRange = [5, 5];
     this.attackBonus = '+0';
-    this.damage = [{ diceNumber: '', diceType: '', damageType: '' }];
+    this.damage = [{ diceNumber: 0, diceType: 0, damageType: '' }];
     this.hasAdditionalDamage = false;
     this.additionalDamage = 0;
     this.useAttributeModifier = false;
@@ -205,7 +197,7 @@ export class WeaponModalComponent {
   // COMPONENT LOGIC
 
   public addDamage(): void {
-    this.damage.push({ diceNumber: '', diceType: '', damageType: '' });
+    this.damage.push({ diceNumber: 0, diceType: 0, damageType: '' });
   }
 
   public removeDamage(index: number): void {

src/app/journal/journal-stats/weapons-container/weapon-table/weapon-table.component.ts

@@ -82,6 +82,8 @@ export class WeaponTableComponent {
       } else {
         value = this.strengthValue;
       }
+    } else {
+      value = 10;
     }
     if (weapon.isMagical) {
       bonus = weapon.magicBonus!;

src/app/journal/spell-modal/spell-modal.component.ts

@@ -43,12 +43,12 @@ export class SpellModalComponent {
   public needsSavingThrow: boolean = false;
   public savingThrowAttribute: string = '';
   public heal: Heal = {
-    diceNumber: '',
-    diceType: '',
+    diceNumber: 0,
+    diceType: 0,
     additionalHeal: 0,
   };
   public attackBonus: string = '';
-  public damage: Damage[] = [{ diceNumber: '', diceType: '', damageType: '' }];
+  public damage: Damage[] = [{ diceNumber: 0, diceType: 0, damageType: '' }];
   public isRanged: boolean = false;
   public range: number = 5;
   public hasAreaOfEffect: boolean = false;
@@ -201,13 +201,13 @@ export class SpellModalComponent {
     this.needsVerbal = false;
     this.needsSomatic = false;
     this.needsMaterial = false;
-    this.school = 'Evocation';
+    this.school = 'evocation';
     this.description_de = '';
     this.description_en = '';
     this.doesDamage = true;
     this.needsSavingThrow = false;
     this.savingThrowAttribute = '';
-    this.damage = [{ diceNumber: '', diceType: '', damageType: '' }];
+    this.damage = [{ diceNumber: 0, diceType: 0, damageType: '' }];
     this.isRanged = false;
     this.range = 5;
     this.hasAreaOfEffect = false;
@@ -216,11 +216,11 @@ export class SpellModalComponent {
     this.needsAttackRoll = false;
     this.attackBonus = '';
     this.doesHeal = false;
-    this.heal = { diceNumber: '', diceType: '', additionalHeal: 0 };
+    this.heal = { diceNumber: 0, diceType: 0, additionalHeal: 0 };
   }
 
   public addDamage(): void {
-    this.damage.push({ diceNumber: '', diceType: '', damageType: '' });
+    this.damage.push({ diceNumber: 0, diceType: 0, damageType: '' });
   }
 
   public removeDamage(index: number): void {

src/app/shared-components/full-spellcard/full-spellcard.component.html

@@ -24,15 +24,6 @@
             }
           </td>
         </tr>
-        <!-- <tr>
-          <td>Benötigt Geste</td>
-          <td>{{ spell.needsSomatic }}</td>
-        </tr>
-        <tr>
-          <td>Benötigt materielle Komponente</td>
-          <td>{{ spell.needsMaterial }}</td>
-        </tr> -->
-
         <tr>
           <td>Stufe</td>
           <td>{{ spell.level }}</td>
@@ -101,7 +92,8 @@
             <td>Schaden</td>
             <td>
               @for (damage of spell.damage; track damage) {
-                {{ damage.diceNumber }} {{ damage.diceType }}
+                {{ damage.diceNumber }} {{ "general.dice" | translate
+                }}{{ damage.diceType }}
                 {{ damage.damageType }}
                 @if (damage.additionalDamage) {
                   + {{ damage.additionalDamage }}

src/interfaces/attribute.ts

@@ -2,4 +2,5 @@ export interface Attribute {
   name: string;
   value: number;
   proficiency: boolean;
+  advantage?: 'none' | 'advantage' | 'disadvantage';
 }

src/interfaces/damage.ts

@@ -1,6 +1,6 @@
 export interface Damage {
-  diceNumber: string;
-  diceType: string;
+  diceNumber: number;
+  diceType: number;
   damageType: string;
-  additionalDamage?: string;
+  additionalDamage?: number;
 }

src/interfaces/heal.ts

@@ -1,5 +1,5 @@
 export interface Heal {
-  diceNumber: string;
-  diceType: string;
+  diceNumber: number;
+  diceType: number;
   additionalHeal?: number;
 }

src/interfaces/skill.ts

@@ -2,4 +2,5 @@ export interface Skill {
   name: string;
   proficiency: boolean;
   bardicExpertise?: boolean;
+  advantage?: 'none' | 'advantage' | 'disadvantage';
 }

src/interfaces/spell.ts

@@ -38,23 +38,19 @@ export interface Spell {
 // Possible Additions
 
 // Number of targets
-// duration
-// cost um 1 minute/10 minutes/1 hour/8 hours/24 hours zu casten erhöhen
 // Material
-// Better way of handling the text.
-// come up with a way to mark that it is selected as a ritual
 
 interface Damage {
-  diceNumber: string;
-  diceType: string;
+  diceNumber: number;
+  diceType: number;
   damageType: string;
-  additionalDamage?: string;
+  additionalDamage?: number;
 }
 
 // additions
 
 interface Heal {
-  diceNumber: string;
-  diceType: string;
+  diceNumber: number;
+  diceType: number;
   additionalHeal?: number;
 }

src/interfaces/weapon.ts

@@ -22,8 +22,8 @@ export interface Weapon {
 }
 
 interface Damage {
-  diceNumber: string;
-  diceType: string;
+  diceNumber: number;
+  diceType: number;
   damageType: string;
-  additionalDamage?: string;
+  additionalDamage?: number;
 }