diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts index b1de142..d0d7d49 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts @@ -30,7 +30,7 @@ export class AbilitiesComponent implements OnInit { .pipe(first()) .subscribe((characterId) => { this.characterService - .getCharacterStats(2) + .getCharacterStats(characterId) .pipe(first()) .subscribe( (characterStats) => { diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html index 3397a90..86bfa75 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html @@ -1,19 +1,19 @@
-
{{ability.value}}
+
{{ability.value}}
Mod: {{ability.modification > 0? '+' + ability.modification : + ability.modification}}
{{ability.name}}
-
ST: {{ability.savingThrows > 0? '+' + ability.savingThrows : ability.savingThrows}}
+
ST: {{ability.savingThrows > 0? '+' + ability.savingThrows : ability.savingThrows}}
- + {{skill.name}}     diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts index a5a2fb1..01c921f 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts @@ -46,7 +46,7 @@ export class AbilityCardComponent implements OnInit { } } - public OpenPrimaryThrowDialog(abilityName: string, abilityValue: number, abilityMod: number): void { + public OpenThrowDialog(abilityName: string, abilityValue: number, abilityMod: number): void { this.dialog.open(ThrowPrimaryAbilityComponent, { data: { abilityName: abilityName, @@ -55,6 +55,5 @@ export class AbilityCardComponent implements OnInit { } }); } - } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.css index 4a844fc..1723c44 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.css @@ -55,6 +55,7 @@ border-radius: 10px; margin-bottom: 5%; font-size: 14px; + text-align: center; } .radio-button:hover { @@ -68,7 +69,6 @@ } .score-result { - height: 50px; padding-bottom: 5%; font-weight: bold; } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.html index abea869..eb11727 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.html @@ -6,10 +6,12 @@
+ + Normal throw on ability @@ -17,11 +19,15 @@ Hidden throw for Game Master -
+ +
Your score has been send to Game Master
-
Your roll result is: {{score}}
-
Your roll with mode result is: {{score+abilityMod}}
+
+
Your roll result is: {{score}}
+
Your roll with modification is: {{score+abilityMod}}
+
+
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.ts index 1492347..42fa488 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/throws/throw-primary-ability/throw-primary-ability.component.ts @@ -12,11 +12,6 @@ export class ThrowPrimaryAbilityComponent implements OnInit { checked = false; choosedThrow: string; throws: string[] = [`Normal throw on ability`, 'Hidden throw for Game Master']; - dataCube: { - currentFaceIndex: 0, - isRolling: false, - faces: [], - }; showSendToGMMessage: boolean; @Input() abilityName: string;