WIP
This commit is contained in:
+12
-4
@@ -15,10 +15,18 @@
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class='form-group' *ngIf="showSkill">
|
||||
<label for='' class='MD2text g-font-size-22 label mb-2'>
|
||||
<div class='form-group'>
|
||||
<!-- <label for='' class='MD2text g-font-size-22 label mb-2'>
|
||||
<md2-icon icon="blackDice" size="lg"></md2-icon> {{skillTriggerHtml}} <md2-icon icon="enemySkill" size="md">
|
||||
</md2-icon>
|
||||
</label>
|
||||
<div class='g-font-size-20 skillDesc MD2text' [innerHtml]="mob.combatSkill.description"></div>
|
||||
</label> -->
|
||||
<div *ngFor="let skill of mob.skills" class=" g-brd-bottom--dashed g-brd-gray-light-v2">
|
||||
<div *ngIf="skill.uiDisplay">
|
||||
<label for='' class='MD2text g-font-size-22 label mb-2'>
|
||||
{{MobSkillType[skill.type]}} {{skill.skillRoll}} <md2-icon icon="enemySkill" size="md"></md2-icon>
|
||||
</label>
|
||||
<div class='g-font-size-20 skillDesc MD2text' [innerHtml]="skill.description"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
+5
-2
@@ -23,6 +23,9 @@
|
||||
font-size: 45px;
|
||||
}
|
||||
}
|
||||
.skillDesc .MD2Icon {
|
||||
font-size: 45px;
|
||||
|
||||
//override the style of the skillDesc class and sub elements
|
||||
|
||||
:host ::ng-deep .skillDesc .MD2Icon {
|
||||
font-size: 30px;
|
||||
}
|
||||
|
||||
+18
-18
@@ -8,7 +8,7 @@ import { MobSkillType } from '../../../massive-darkness2.model.boss';
|
||||
styleUrls: ['./mob-combat-info.component.scss']
|
||||
})
|
||||
export class MobCombatInfoComponent implements OnInit {
|
||||
|
||||
MobSkillType = MobSkillType;
|
||||
MD2Icon = MD2Icon;
|
||||
private _mob: MobInfo;
|
||||
public get mob(): MobInfo {
|
||||
@@ -28,23 +28,23 @@ export class MobCombatInfoComponent implements OnInit {
|
||||
constructor() { }
|
||||
|
||||
ngOnInit(): void {
|
||||
if (this.mob.combatSkill) {
|
||||
switch (this.mode) {
|
||||
case MobDlgType.Activating:
|
||||
this.showSkill = [MobSkillType.Combat, MobSkillType.Attack].includes(this.mob.combatSkill.type);
|
||||
break;
|
||||
case MobDlgType.BeenAttacked:
|
||||
this.showSkill = [MobSkillType.Combat, MobSkillType.Defense].includes(this.mob.combatSkill.type);
|
||||
break;
|
||||
case MobDlgType.PreView:
|
||||
this.showSkill = true;
|
||||
break;
|
||||
case MobDlgType.Spawn:
|
||||
default:
|
||||
this.showSkill = false;
|
||||
break;
|
||||
}
|
||||
this.skillTriggerHtml = `${MobSkillType[this.mob.combatSkill.type]} ${this.mob.combatSkill.skillRoll} `
|
||||
if (this.mob.skills && this.mob.skills.length > 0) {
|
||||
this.mob.skills.forEach(element => {
|
||||
switch (this.mode) {
|
||||
case MobDlgType.Activating:
|
||||
element.uiDisplay = [MobSkillType.Combat, MobSkillType.Attack].includes(element.type);
|
||||
break;
|
||||
case MobDlgType.BeenAttacked:
|
||||
element.uiDisplay = [MobSkillType.Combat, MobSkillType.Defense].includes(element.type);
|
||||
break;
|
||||
case MobDlgType.PreView:
|
||||
element.uiDisplay = true;
|
||||
break;
|
||||
case MobDlgType.Spawn:
|
||||
element.uiDisplay = false;
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this.showBlackDice = this.mob.type == MobType.Mob && (this.mode == MobDlgType.Activating || this.mode == MobDlgType.BeenAttacked) && this.mob.minionAmount > 0;;
|
||||
|
||||
Reference in New Issue
Block a user