From 716e25f0baece20805bd876a8a417983b67a1ec3 Mon Sep 17 00:00:00 2001 From: Chris Chen Date: Wed, 5 Nov 2025 15:21:42 -0800 Subject: [PATCH] WIP --- src/app/games/games-routing.module.ts | 2 + src/app/games/games.module.ts | 6 +- .../hero-dashboard.component.html | 14 +- .../hero-dashboard.component.ts | 33 ++-- .../massive-darkness2.model.ts | 16 +- .../md2-hero-profile-editor.component.html | 55 +++++++ .../md2-hero-profile-editor.component.scss | 25 +++ .../md2-hero-profile-editor.component.ts | 98 ++++++++++++ ...d2-hero-profile-maintenance.component.html | 57 +++++++ ...d2-hero-profile-maintenance.component.scss | 11 ++ .../md2-hero-profile-maintenance.component.ts | 143 ++++++++++++++++++ .../md2-hero-select.component.ts | 2 +- .../md2-html-editor.component.html | 14 +- .../md2-html-editor.component.scss | 3 + .../md2-icon/md2-icon.component.html | 2 +- .../md2-icon/md2-icon.component.ts | 19 +-- .../service/massive-darkness2.service.ts | 13 ++ src/app/services/MD2/md2-state.service.ts | 32 +++- src/assets/styles/md2.scss | 6 + src/assets/styles/site.scss | 4 + 20 files changed, 502 insertions(+), 53 deletions(-) create mode 100644 src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.html create mode 100644 src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.scss create mode 100644 src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.ts create mode 100644 src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.html create mode 100644 src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.scss create mode 100644 src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.ts diff --git a/src/app/games/games-routing.module.ts b/src/app/games/games-routing.module.ts index 9d5d1e6..faf34bd 100644 --- a/src/app/games/games-routing.module.ts +++ b/src/app/games/games-routing.module.ts @@ -6,6 +6,7 @@ import { GamesComponent } from './games.component'; import { HeroDashboardComponent } from './massive-darkness2/hero-dashboard/hero-dashboard.component'; import { MassiveDarkness2Component } from './massive-darkness2/massive-darkness2.component'; import { MD2MobInfoMaintenanceComponent } from './massive-darkness2/md2-mob-info-maintenance/md2-mob-info-maintenance.component'; +import { MD2HeroProfileMaintenanceComponent } from './massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component'; export class GameRoomMenuConfig { public static HostMenu: NbMenuItem[] = [ @@ -49,6 +50,7 @@ const routes: Routes = [ { path: 'MD2', component: MassiveDarkness2Component }, { path: 'MD2_Hero/:roomId', component: HeroDashboardComponent }, { path: 'MD2MobInfo', component: MD2MobInfoMaintenanceComponent }, + { path: 'MD2HeroProfile', component: MD2HeroProfileMaintenanceComponent }, ] }, diff --git a/src/app/games/games.module.ts b/src/app/games/games.module.ts index a938df8..2440fb3 100644 --- a/src/app/games/games.module.ts +++ b/src/app/games/games.module.ts @@ -50,6 +50,8 @@ import { MD2MobInfoEditorComponent } from './massive-darkness2/md2-mob-info-main import { MD2MobInfoDetailComponent } from './massive-darkness2/md2-mob-info-maintenance/md2-mob-info-detail/md2-mob-info-detail.component'; import { MD2MobSkillEditorComponent } from './massive-darkness2/md2-mob-info-maintenance/md2-mob-skill-editor/md2-mob-skill-editor.component'; import { MD2MobLevelEditorComponent } from './massive-darkness2/md2-mob-info-maintenance/md2-mob-level-editor/md2-mob-level-editor.component'; +import { MD2HeroProfileMaintenanceComponent } from './massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component'; +import { MD2HeroProfileEditorComponent } from './massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component'; @NgModule({ @@ -84,7 +86,9 @@ import { MD2MobLevelEditorComponent } from './massive-darkness2/md2-mob-info-mai MD2MobInfoEditorComponent, MD2MobInfoDetailComponent, MD2MobSkillEditorComponent, - MD2MobLevelEditorComponent + MD2MobLevelEditorComponent, + MD2HeroProfileMaintenanceComponent, + MD2HeroProfileEditorComponent ], imports: [ CommonModule, diff --git a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.html b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.html index 516753e..a04855b 100644 --- a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.html +++ b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.html @@ -10,7 +10,19 @@
- +
+
+ + +
+
+ +
+ +
+
+
+
diff --git a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts index cdf8b74..968e82b 100644 --- a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts +++ b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts @@ -11,8 +11,9 @@ import { ADButtonColor, ADButtons } from '../../../ui/alert-dlg/alert-dlg.model' import { ArrayUtils } from '../../../utilities/array-utils'; import { StringUtils } from '../../../utilities/string-utils'; import { DebounceTimer } from '../../../utilities/timer-utils'; -import { HeroClass, MD2HeroInfo, MD2Icon } from '../massive-darkness2.model'; +import { HeroClass, MD2HeroInfo, MD2HeroProfile, MD2Icon } from '../massive-darkness2.model'; import { MD2Base } from '../MD2Base'; +import { MD2HeroProfileService } from '../service/massive-darkness2.service'; @Component({ selector: 'ngx-hero-dashboard', @@ -55,16 +56,7 @@ export class HeroDashboardComponent extends MD2Base implements OnInit { new DropDownOption(HeroClass.Druid, 'Druid'), ]; heros = [] as MD2HeroInfo[]; - wizards: MD2HeroInfo[] = [ - new MD2HeroInfo({ name: 'Ajax', mpMaximum: 6, hpMaximum: 4, skillHtml: '', shadowSkillHtml: '' }), - new MD2HeroInfo({ name: 'Baldric', mpMaximum: 5, hpMaximum: 4, skillHtml: '', shadowSkillHtml: '' }), - new MD2HeroInfo({ name: 'Ego', mpMaximum: 5, hpMaximum: 6, skillHtml: '', shadowSkillHtml: '' }), - new MD2HeroInfo({ name: 'Elias', mpMaximum: 6, hpMaximum: 5, skillHtml: '', shadowSkillHtml: '' }), - new MD2HeroInfo({ name: 'Megan', mpMaximum: 5, hpMaximum: 5, skillHtml: '', shadowSkillHtml: '' }), - new MD2HeroInfo({ name: 'Moira', mpMaximum: 6, hpMaximum: 5, skillHtml: '', shadowSkillHtml: '' }), - new MD2HeroInfo({ name: 'Myriam', mpMaximum: 7, hpMaximum: 4, skillHtml: '', shadowSkillHtml: '' }), - new MD2HeroInfo({ name: 'Valdis', mpMaximum: 6, hpMaximum: 4, skillHtml: '', shadowSkillHtml: '' }) - ] + heroProfiles: MD2HeroProfile[] = []; public get hero() { return this.md2Service.playerHero; @@ -73,6 +65,7 @@ export class HeroDashboardComponent extends MD2Base implements OnInit { constructor( private gameRoomService: GameRoomService, public md2Service: MD2Service, + private heroProfileService: MD2HeroProfileService, protected stateService: StateService, protected route: ActivatedRoute, protected cdRef: ChangeDetectorRef, @@ -100,6 +93,7 @@ export class HeroDashboardComponent extends MD2Base implements OnInit { initHero() { this.gameRoomService.gameRoomId = this.roomId; if (!this.md2Service.heros.some(h => h.playerInfo.signalRClientId == this.stateService.loginUserService.userAccess.signalRSessionId)) { + this.msgBoxService.showInputbox('Select Hero Class', '', { dropDownOptions: this.classOptions, inputType: 'dropdown' }) .pipe(first()).subscribe(heroClass => { if (heroClass != null) { @@ -124,21 +118,24 @@ export class HeroDashboardComponent extends MD2Base implements OnInit { initClassHeroList(heroClass: HeroClass) { this.heros = []; this.className = HeroClass[heroClass]; - this.fileList(`Heros/${this.className}`).pipe(first()).subscribe(fileNames => { - for (let i = 0; i < fileNames.length; i++) { - const heroNames = fileNames[i].split('.')[0].split('-'); + this.heroProfileService.getAll().pipe(first()).subscribe(result => { + this.heroProfiles = result; + for (let i = 0; i < this.heroProfiles.length; i++) { + const heroProfile = this.heroProfiles[i]; this.heros.push(new MD2HeroInfo({ - name: heroNames[0].replace('/', ''), - mpMaximum: Number.parseInt(heroNames[1]), - hpMaximum: Number.parseInt(heroNames[2]), - imgUrl: this.imgUrl(`Heros/${this.className}/${fileNames[i]}`), + name: heroProfile.title, + mpMaximum: heroProfile.mana, + hpMaximum: heroProfile.hp, + skillHtml: heroProfile.skillHtml, + shadowSkillHtml: heroProfile.shadowSkillHtml, class: heroClass })) } this.heros = ArrayUtils.Shuffle(this.heros);//.sort((a, b) => StringUtils.compareSemVer(a.name, b.name)); this.showHeroList(heroClass, 0); }); + } showHeroList(heroClass: HeroClass, index: number) { let className = HeroClass[heroClass]; diff --git a/src/app/games/massive-darkness2/massive-darkness2.model.ts b/src/app/games/massive-darkness2/massive-darkness2.model.ts index 8adeb45..d0be321 100644 --- a/src/app/games/massive-darkness2/massive-darkness2.model.ts +++ b/src/app/games/massive-darkness2/massive-darkness2.model.ts @@ -83,6 +83,12 @@ export enum MD2Icon { TreasureToken_Rare, TreasureToken_Epic, TreasureToken_Legendary, + HP_Color, + Mana_Color, + CorruptToken, + TimeToken, + FireToken, + FrozenToken } export enum AttackTarget { @@ -374,7 +380,15 @@ export class MobInfo implements IDrawingItem { public actionSubject: Subject; public activateFunction?: (mob: MobInfo, msgBoxService: MsgBoxService, heros: MD2HeroInfo[]) => void; } - +export interface MD2HeroProfile { + id: string; + heroClass: HeroClass; + title: string; + hp: number; + mana: number; + skillHtml: string; + shadowSkillHtml: string; +} export class MD2HeroInfo { constructor( config: Partial = {} diff --git a/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.html b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.html new file mode 100644 index 0000000..8857045 --- /dev/null +++ b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.html @@ -0,0 +1,55 @@ +
+
+
+
+ + + + +
+
+ + + +
+
+ + + + +
+
+ + + + +
+
+ + +
+ + + +
+ +
+ + +
+ +
+
+ + + + + \ No newline at end of file diff --git a/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.scss b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.scss new file mode 100644 index 0000000..9956808 --- /dev/null +++ b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.scss @@ -0,0 +1,25 @@ +:host { + display: block; +} + +.k-form { + display: flex; + flex-direction: column; + gap: 1rem; +} + +.k-form-field { + display: flex; + flex-direction: column; + gap: 0.5rem; +} + +.k-label { + font-weight: 500; +} + +.k-form-error { + color: #f31700; + font-size: 0.875rem; +} + diff --git a/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.ts b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.ts new file mode 100644 index 0000000..47d90e0 --- /dev/null +++ b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-editor/md2-hero-profile-editor.component.ts @@ -0,0 +1,98 @@ +import { Component, Input, OnInit, ViewChild, ChangeDetectorRef } from '@angular/core'; +import { DialogRef, DialogContentBase } from '@progress/kendo-angular-dialog'; +import { NgForm } from '@angular/forms'; +import { first } from 'rxjs/operators'; +import { MD2HeroProfile, HeroClass } from '../../massive-darkness2.model'; +import { MD2HeroProfileService } from '../../service/massive-darkness2.service'; + +@Component({ + selector: 'ngx-md2-hero-profile-editor', + templateUrl: './md2-hero-profile-editor.component.html', + styleUrls: ['./md2-hero-profile-editor.component.scss'] +}) +export class MD2HeroProfileEditorComponent extends DialogContentBase implements OnInit { + @Input() public data: MD2HeroProfile; + @Input() public isAdding: boolean = false; + @ViewChild('form') form: NgForm; + + public model: MD2HeroProfile; + public processing: boolean = false; + public heroClasses: Array<{ value: HeroClass; text: string }> = []; + public selectedHeroClass: { value: HeroClass; text: string } | null = null; + + constructor( + public dialog: DialogRef, + private heroProfileService: MD2HeroProfileService, + private cdr: ChangeDetectorRef + ) { + super(dialog); + this.initializeEnums(); + } + + ngOnInit(): void { + this.initializeModel(); + } + + public initializeModel(): void { + const classValue = this.data?.heroClass !== undefined && this.data?.heroClass !== null ? this.data.heroClass : HeroClass.Berserker; + + this.model = { + id: this.data?.id || '', + heroClass: classValue, + title: this.data?.title || '', + hp: this.data?.hp || 0, + mana: this.data?.mana || 0, + skillHtml: this.data?.skillHtml || '', + shadowSkillHtml: this.data?.shadowSkillHtml || '' + }; + + // Set selected object for dropdown + this.selectedHeroClass = this.heroClasses.find(c => c.value === classValue) || this.heroClasses[0] || null; + + this.cdr.detectChanges(); + } + + private initializeEnums(): void { + // Initialize HeroClass options + Object.keys(HeroClass).filter(key => isNaN(Number(key))).forEach(key => { + this.heroClasses.push({ + value: HeroClass[key] as HeroClass, + text: key + }); + }); + } + + public close(): void { + this.dialog.close(); + } + + public save(): void { + if (this.model.title && !this.processing) { + this.processing = true; + + // Extract enum value from selected object + const heroProfile: MD2HeroProfile = { + ...this.model, + heroClass: this.selectedHeroClass?.value ?? HeroClass.Berserker + }; + + this.heroProfileService.createOrUpdate(heroProfile).pipe(first()).subscribe(result => { + this.processing = false; + this.dialog.close(result); + }, error => { + this.processing = false; + console.error('Error saving hero profile:', error); + }); + } + } + + public get isValid(): boolean { + if (!this.model) { + return false; + } + const titleValid = true;// this.model.title && this.model.title.trim().length > 0; + const classValid = this.selectedHeroClass !== null && this.selectedHeroClass !== undefined; + return titleValid && classValid; + } +} + diff --git a/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.html b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.html new file mode 100644 index 0000000..f21d1cc --- /dev/null +++ b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.html @@ -0,0 +1,57 @@ + + +

MD2 Hero Profile Maintenance

+ + + + + + + + + + + + + + + + {{ getHeroClassName(dataItem.heroClass) }} + + + {{ getHeroClassName(value) }} + + + + + + {{ dataItem.mana }} + {{ dataItem.hp }} + + + + + +
+
+ Shadow: +
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.scss b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.scss new file mode 100644 index 0000000..45ee398 --- /dev/null +++ b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.scss @@ -0,0 +1,11 @@ +:host { + display: block; +} + +.float-right { + float: right; +} + +kendo-grid { + height: 77vh; +} diff --git a/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.ts b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.ts new file mode 100644 index 0000000..398c41e --- /dev/null +++ b/src/app/games/massive-darkness2/md2-hero-profile-maintenance/md2-hero-profile-maintenance.component.ts @@ -0,0 +1,143 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { GridComponent, GridDataResult } from '@progress/kendo-angular-grid'; +import { State, process } from '@progress/kendo-data-query'; +import { first } from 'rxjs/operators'; +import { MD2HeroProfile, HeroClass, MD2Icon } from '../massive-darkness2.model'; +import { MD2HeroProfileService } from '../service/massive-darkness2.service'; +import { MD2HeroProfileEditorComponent } from './md2-hero-profile-editor/md2-hero-profile-editor.component'; +import { DialogService } from '@progress/kendo-angular-dialog'; +import { MsgBoxService } from '../../../services/msg-box.service'; + +@Component({ + selector: 'ngx-md2-hero-profile-maintenance', + templateUrl: './md2-hero-profile-maintenance.component.html', + styleUrls: ['./md2-hero-profile-maintenance.component.scss'] +}) +export class MD2HeroProfileMaintenanceComponent implements OnInit { + @ViewChild('grid') grid: GridComponent; + MD2Icon = MD2Icon; + public gridData: GridDataResult = { data: [], total: 0 }; + private allData: MD2HeroProfile[] = []; + private lastSelectedHeroClass: HeroClass; + public gridState: State = { + skip: 0, + take: 10, + sort: [{ + field: 'title', + dir: 'asc' + }], + filter: { + logic: 'and', + filters: [] + }, + group: [{ + field: 'heroClass', + dir: 'asc' + }] + }; + public isLoading: boolean = false; + + constructor( + private heroProfileService: MD2HeroProfileService, + private dialogService: DialogService, + private msgBoxService: MsgBoxService + ) { + } + + ngOnInit(): void { + this.loadData(); + } + + public loadData(): void { + this.isLoading = true; + this.heroProfileService.getAll().pipe(first()).subscribe(result => { + this.allData = result; + this.processGridData(); + this.isLoading = false; + }); + } + + public processGridData(): void { + // Normalize filter state to handle null/undefined/empty filters + let normalizedFilter: { logic: 'and' | 'or'; filters: any[] } = { logic: 'and', filters: [] }; + if (this.gridState.filter) { + const filters = this.gridState.filter.filters || []; + if (filters.length > 0) { + normalizedFilter = this.gridState.filter; + } + } + + const normalizedState: State = { + ...this.gridState, + filter: normalizedFilter + }; + + this.gridData = process(this.allData, normalizedState); + } + + public addHandler(): void { + const editorData = { heroClass: this.lastSelectedHeroClass || HeroClass.Berserker } as MD2HeroProfile; + const dialogRef = this.dialogService.open({ + title: 'Add New Hero Profile', + content: MD2HeroProfileEditorComponent, + width: '90vw', + height: 600 + }); + + const editor = dialogRef.content.instance; + editor.isAdding = true; + editor.data = editorData; + + // Force model re-initialization after data is set + setTimeout(() => { + editor.initializeModel(); + }, 0); + + dialogRef.result.subscribe((result: MD2HeroProfile) => { + if (result) { + this.lastSelectedHeroClass = result.heroClass; + this.loadData(); + } + }); + } + + public editHandler({ dataItem }: { dataItem: MD2HeroProfile }): void { + const dialogRef = this.dialogService.open({ + title: 'Edit Hero Profile', + content: MD2HeroProfileEditorComponent, + width: '90vw', + height: 600 + }); + + const editor = dialogRef.content.instance; + editor.isAdding = false; + editor.data = JSON.parse(JSON.stringify(dataItem)); + + // Force model re-initialization after data is set + setTimeout(() => { + editor.initializeModel(); + }, 0); + + dialogRef.result.subscribe(result => { + if (result) { + this.loadData(); + } + }); + } + + public removeHandler({ dataItem }: { dataItem: MD2HeroProfile }): void { + this.msgBoxService.showConfirmDeleteBox().pipe(first()).subscribe(answer => { + if (answer === true) { + this.isLoading = true; + this.heroProfileService.delete(dataItem.id).pipe(first()).subscribe(result => { + this.loadData(); + }); + } + }); + } + + public getHeroClassName(heroClass: HeroClass): string { + return HeroClass[heroClass] || ''; + } +} + diff --git a/src/app/games/massive-darkness2/md2-hero-select/md2-hero-select.component.ts b/src/app/games/massive-darkness2/md2-hero-select/md2-hero-select.component.ts index eece77f..cfa3139 100644 --- a/src/app/games/massive-darkness2/md2-hero-select/md2-hero-select.component.ts +++ b/src/app/games/massive-darkness2/md2-hero-select/md2-hero-select.component.ts @@ -27,7 +27,7 @@ export class MD2HeroSelectComponent implements ControlValueAccessor, Validator { readonly: boolean = false; isRequired: boolean = false; heroOptions: DropDownOption[]; - @Input() id?= ''; + @Input() id? = ''; @Input() name = ''; @Input() data: MD2HeroInfo; diff --git a/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.html b/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.html index 281dd7a..1abb483 100644 --- a/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.html +++ b/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.html @@ -1,6 +1,8 @@ + + @@ -8,10 +10,6 @@ - - - - @@ -30,21 +28,13 @@ - - - - - - - - \ No newline at end of file diff --git a/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.scss b/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.scss index e69de29..530cc4a 100644 --- a/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.scss +++ b/src/app/games/massive-darkness2/md2-html-editor/md2-html-editor.component.scss @@ -0,0 +1,3 @@ +:host ::ng-deep .k-editor-content .MD2Icon { + font-size: 30px; +} diff --git a/src/app/games/massive-darkness2/md2-icon/md2-icon.component.html b/src/app/games/massive-darkness2/md2-icon/md2-icon.component.html index 0dea6b4..a3fe574 100644 --- a/src/app/games/massive-darkness2/md2-icon/md2-icon.component.html +++ b/src/app/games/massive-darkness2/md2-icon/md2-icon.component.html @@ -1,5 +1,5 @@ @if(isImageIcon) { - + } @else { } \ No newline at end of file diff --git a/src/app/games/massive-darkness2/md2-icon/md2-icon.component.ts b/src/app/games/massive-darkness2/md2-icon/md2-icon.component.ts index a3a6c03..e607104 100644 --- a/src/app/games/massive-darkness2/md2-icon/md2-icon.component.ts +++ b/src/app/games/massive-darkness2/md2-icon/md2-icon.component.ts @@ -55,23 +55,8 @@ export class MD2IconComponent implements OnInit { this.iconHtml = this.md2StateService.iconHtml(icon); } else { this.isImageIcon = true; - switch (icon) { - case MD2Icon.TreasureToken: - this.imgUrl = this.md2StateService.treasureImage(TreasureType.Cover); - break; - case MD2Icon.TreasureToken_Common: - this.imgUrl = this.md2StateService.treasureImageHtml(TreasureType.Common); - break; - case MD2Icon.TreasureToken_Rare: - this.imgUrl = this.md2StateService.treasureImage(TreasureType.Rare); - break; - case MD2Icon.TreasureToken_Epic: - this.imgUrl = this.md2StateService.treasureImage(TreasureType.Epic); - break; - case MD2Icon.TreasureToken_Legendary: - this.imgUrl = this.md2StateService.treasureImage(TreasureType.Legendary); - break; - } + this.imgUrl = this.md2StateService.iconHtml(icon); + } } diff --git a/src/app/games/massive-darkness2/service/massive-darkness2.service.ts b/src/app/games/massive-darkness2/service/massive-darkness2.service.ts index cd3488c..efc3519 100644 --- a/src/app/games/massive-darkness2/service/massive-darkness2.service.ts +++ b/src/app/games/massive-darkness2/service/massive-darkness2.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { CrudService } from '../../../services/crudServices/crud.service'; import { MD2MobInfo, MD2MobLevelInfo, MD2MobSkill } from '../massive-darkness2.db.model'; import { HttpClient } from '@angular/common/http'; +import { MD2HeroProfile } from '../massive-darkness2.model'; @Injectable({ providedIn: 'root' @@ -34,4 +35,16 @@ export class MD2MobSkillService extends CrudService { super(http, (action: string = null) => { return `MD2MobSkill${(action ? `/${action}` : '')}` }); } +} + + +@Injectable({ + providedIn: 'root' +}) +export class MD2HeroProfileService extends CrudService { + + constructor(http: HttpClient) { + super(http, (action: string = null) => { return `MD2HeroProfile${(action ? `/${action}` : '')}` }); + } + } \ No newline at end of file diff --git a/src/app/services/MD2/md2-state.service.ts b/src/app/services/MD2/md2-state.service.ts index f270be9..2dddb4d 100644 --- a/src/app/services/MD2/md2-state.service.ts +++ b/src/app/services/MD2/md2-state.service.ts @@ -34,8 +34,38 @@ export class MD2StateService { } if (icon < MD2Icon.RedDice) { return `${String.fromCharCode(65 + icon)}` - } else { + } else if (icon < MD2Icon.TreasureToken) { return ``; + } else { + if (!cssClass) { + cssClass = 'g-height-25 mr-1'; + } + //image based icons + switch (icon) { + + case MD2Icon.HP_Color: + return this.imgHtml('HeartIcon.png', cssClass); + case MD2Icon.Mana_Color: + return this.imgHtml('ManaIcon.png', cssClass); + case MD2Icon.CorruptToken: + return this.imgHtml('Tokens/CorruptToken.png', cssClass); + case MD2Icon.TimeToken: + return this.imgHtml('Tokens/TimeToken.png', cssClass); + case MD2Icon.FireToken: + return this.imgHtml('Tokens/FireToken.png', cssClass); + case MD2Icon.FrozenToken: + return this.imgHtml('Tokens/FrozenToken.png', cssClass); + case MD2Icon.TreasureToken: + return this.imgHtml('TreasureToken/Cover.png', cssClass); + case MD2Icon.TreasureToken_Common: + return this.imgHtml('TreasureToken/Common.png', cssClass); + case MD2Icon.TreasureToken_Rare: + return this.imgHtml('TreasureToken/Rare.png', cssClass); + case MD2Icon.TreasureToken_Epic: + return this.imgHtml('TreasureToken/Epic.png', cssClass); + case MD2Icon.TreasureToken_Legendary: + return this.imgHtml('TreasureToken/Legendary.png', cssClass); + } } } diff --git a/src/assets/styles/md2.scss b/src/assets/styles/md2.scss index ab25e8e..c842a69 100644 --- a/src/assets/styles/md2.scss +++ b/src/assets/styles/md2.scss @@ -39,6 +39,12 @@ line-height: 50px; } } +.shadow-skill { + ::before { + font-family: "Massive Darkness 2", sans-serif !important; + content: "D"; + } +} .MD2Icon { font-family: "Massive Darkness 2", sans-serif !important; //font-size: 20px; diff --git a/src/assets/styles/site.scss b/src/assets/styles/site.scss index 95e5f28..18bf590 100644 --- a/src/assets/styles/site.scss +++ b/src/assets/styles/site.scss @@ -20,3 +20,7 @@ nb-card { max-width: 96vw; max-height: 96vh; } +p { + margin-top: 0; + margin-bottom: 0; +}