nitowa/frontcraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

visual polish and bugfixes. auto-refreshing

Browse Source
This commit is contained in:
peter
2020-02-09 02:50:06 +01:00
parent e828a29db6
commit 18f3b32e3c
20 changed files with 996 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+3 -3
View File
@@ -6130,9 +6130,9 @@
}
},
"rpclibrary": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.7.0.tgz",
"integrity": "sha512-HIL5YzFF53fACOWvI403hJZnGYoXLJGrGc0n1HYZH6rnnfEaBcogemZrCbyoOvnG204LH882e8VdpB+WBTEY/g==",
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.7.1.tgz",
"integrity": "sha512-Ibo3qfURnQgZAq0eA2o+L9+PWaloJ4PHZs4ak42LL9fRgdWZXn33HAtowV0K2HVckbvrBvFqj/+PWTrWWBSOeg==",
"requires": {
"bsock": "^0.1.9",
"http": "0.0.0",
package.json
+11 -10
View File
@@ -5,15 +5,16 @@
"scripts": {
"tsc": "tsc",
"launch": "node lib/src/backend/Launcher.js",
"start": "npm run build; npm run launch",
"start-backend": "npm run build-backend; node lib/src/backend/Launcher.js",
"build": "npm run build-backend; npm run build-frontend",
"test": "npm run clean && npm run build-backend && mocha lib/test/backendTest.js",
"build-backend": "tsc;",
"build-frontend": "mkdir dist; mkdir dist/static; npm run build-dashboard;",
"build-dashboard": "cd src/frontend; npm i && npm run build; cp -r dist/* ../../dist/static",
"clean": "rm -rf lib plugins conf widget .rpt2_cache *.js *.ts src/frontend/dist data",
"update-frontblock": "npm remove frontblock frontblock-generic; npm install frontblock-generic@latest frontblock@latest",
"start": "npm run build && npm run launch",
"start-backend": "npm run build-backend && npm run launch",
"test": "npm run backend && npm run build-backend && mocha lib/test/backendTest.js",
"build": "npm run build-backend && npm run build-frontend",
"build-backend": "npm run clean-backend && tsc",
"build-frontend": "npm run clean-frontend && (mkdir static || rm -rf static/*) && npm run build-dashboard",
"build-dashboard": "cd src/frontend && npm i && npm run build && cp -r dist/* ../../static",
"clean": "rm -rf data && npm run clean-backend && npm run clean-frontend",
"clean-backend": "rm -rf lib plugins config widget .rpt2_cache *.js *.ts",
"clean-frontend": "rm -rf src/frontend/dist static",
"webpack": "webpack --config src/backend/webpack.prod.js --progress --colors"
},
"repository": {
@@ -44,7 +45,7 @@
"path": "^0.12.7",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.0",
"rpclibrary": "^1.7.0",
"rpclibrary": "^1.7.1",
"simple-git": "^1.124.0",
"spawn-sync": "^2.0.0",
"sqlite3": "^4.1.1",
src/backend/Admin/Admin.ts
+8 -4
View File
@@ -20,6 +20,7 @@ import { FrontworkComponent } from '../Types/FrontworkComponent';
import { IAdmin } from './Interface';
import { Injector } from '../Injector/Injector';
import { Shoutbox } from '../Components/Shoutbox/Shoutbox';
import { PubSub } from '../Components/PubSub/PubSub';
const logger = getLogger("admin", 'debug')
@@ -32,7 +33,8 @@ const logger = getLogger("admin", 'debug')
RaidManager,
CharacterManager,
UserManager,
Shoutbox
Shoutbox,
PubSub
]
})
export class FrontworkAdmin
@@ -54,7 +56,7 @@ implements TableDefinitionExporter, IAdmin {
dbConf: {
client: 'sqlite3',
connection: {
filename: Path.join(__dirname, "data/frontworkAdmin.sqlite")
filename: Path.resolve(__dirname, '../../../..', "data/frontworkAdmin.sqlite")
},
useNullAsDefault: true,
}
@@ -96,7 +98,9 @@ implements TableDefinitionExporter, IAdmin {
getTableDefinitions(): TableDefiniton[]{
return [
...this.frontworkComponents
].flatMap(exporter => exporter.getTableDefinitions())
]
.filter(exp => exp.getTableDefinitions != null)
.flatMap(exp => exp.getTableDefinitions())
}
private startWebsocket(){
@@ -123,7 +127,7 @@ implements TableDefinitionExporter, IAdmin {
let port:number = this.config.getConfig().httpPort
this.express = express()
this.express.use('/', express.static('dist/static'))
this.express.use('/', express.static('static'))
/**
* get the compiled FrontendPlugins.js
src/backend/Components/Item/ItemManager.ts
+24 -3
View File
@@ -1,14 +1,16 @@
import { T1, T2, allItems, _Tiers, Tiers } from "../../Types/Items";
import { allItems, _Tiers, Tiers } from "../../Types/Items";
import { Inject, Injectable } from "../../Injector/ServiceDecorator";
import { ItemManagerFeatureIfc, ItemManagerIfc } from "./RPCInterface";
import { FrontworkComponent } from "../../Types/FrontworkComponent";
import { TableDefinitionExporter } from "../../Types/Interfaces";
import { TableDefiniton, Item, User, Character, SRToken, SRPriority, Spec, Signup } from "../../Types/Types";
import { TableDefiniton, Item, User, Character, SRToken, SRPriority, Spec, Signup, Raid } from "../../Types/Types";
import { IAdmin } from "../../Admin/Interface";
import { IItemManager } from "./Interface";
import { getLogger } from "log4js";
import { IUserManager } from "../User/Interface";
import { ICharacterManager } from "../Character/Interface";
import { IPubSub } from "../PubSub/Interface";
import { IRaidManager } from "../Raid/Interface";
const fetch = require('node-fetch')
const xml2js = require('xml2js');
@@ -28,6 +30,12 @@ implements FrontworkComponent<ItemManagerIfc, ItemManagerFeatureIfc>, TableDefin
@Inject(ICharacterManager)
private character: ICharacterManager
@Inject(IPubSub)
private pubsub: IPubSub<any>
@Inject(IRaidManager)
private raidManager: IRaidManager
exportRPCs = () => [
this.getItems,
this.getItem,
@@ -51,6 +59,16 @@ implements FrontworkComponent<ItemManagerIfc, ItemManagerFeatureIfc>, TableDefin
]
}]
notifyRaid = async (raid:Raid | {id:number}) => {
const data = await this.raidManager.getRaidData(<Raid>raid)
this.pubsub.publish(""+raid.id, data)
await this.notifyRaids()
}
notifyRaids = async () => {
this.pubsub.publish('raids', undefined)
}
wipeCurrencyAndItems = async () => {
await Promise.all([
this.userManager.wipeCurrency(),
@@ -146,7 +164,6 @@ implements FrontworkComponent<ItemManagerIfc, ItemManagerFeatureIfc>, TableDefin
if(streaks.length > 0){
const myStreak = streaks.find(token => token.itemname === itemname)
if(myStreak){
//getLogger('ItemManager').debug('update signupid and increment level')
await this.admin
.knex(item.tier+'tokens')
@@ -176,6 +193,8 @@ implements FrontworkComponent<ItemManagerIfc, ItemManagerFeatureIfc>, TableDefin
if(myStreak){
await tx.commit()
await this.notifyRaid({id: signup.raidid})
return await this.getToken(character, item)
}
}
@@ -205,6 +224,8 @@ implements FrontworkComponent<ItemManagerIfc, ItemManagerFeatureIfc>, TableDefin
})
}
await tx.commit()
await this.notifyRaid({id: signup.raidid})
return await this.getToken(character, item)
}
src/backend/Components/PubSub/Interface.ts
+7
View File
@@ -0,0 +1,7 @@
import { SubscriptionResponse } from "rpclibrary"
export class IPubSub<UpdateType>{
publish: (topic: string, p: UpdateType) => void
subscribe: (topic:string, callback: (p:UpdateType)=>any) => Promise<SubscriptionResponse>
unsubscribe: (uuid: string) => Promise<void>
}
src/backend/Components/PubSub/PubSub.ts
+53
View File
@@ -0,0 +1,53 @@
import { Injectable } from "../../Injector/ServiceDecorator";
import { SubscriptionResponse, makeSubResponse, RPCExporter } from "rpclibrary";
import { IPubSub } from "./Interface";
@Injectable(IPubSub)
export class PubSub<UpdateType = any>
implements RPCExporter{
name = "PubSub"
subs : {
[topic in string]: {
[uuid in string]: (p:UpdateType)=>any
}
}= {}
exportRPCs = () => [
this.unsubscribe,
{
name: 'subscribe',
hook: this.subscribe,
onClose: (subres, rpcName) => {
this.unsubscribe(subres.uuid)
}
}
]
publish = ( topic: string, msg: UpdateType ) => {
if(!this.subs[topic]) this.subs[topic] = {}
Object.entries(this.subs[topic]).forEach(([uuid, callback]:[string, Function]) => {
try{
callback(msg)
}catch(e){
delete this.subs[topic][uuid]
}
})
}
subscribe = async (topic:string, callback:(p:UpdateType)=>any) : Promise<SubscriptionResponse<{topic: string}>> => {
const resp = makeSubResponse({
topic: topic
})
if(!this.subs[topic]) this.subs[topic] = {}
this.subs[topic][resp.uuid] = callback
return resp
}
private unsubscribe = async (uuid: string) => {
Object.entries(this.subs).forEach(([topic, submap]) => {
delete submap[uuid]
if(Object.keys(submap).length === 0)
delete this.subs[topic]
})
}
}
src/backend/Components/PubSub/RPCInterface.ts
+8
View File
@@ -0,0 +1,8 @@
import { IPubSub } from "./Interface";
export type PubSubIfc<UpdateType = any> = {
PubSub:{
subscribe: IPubSub<UpdateType>['subscribe']
unsubscribe: IPubSub<UpdateType>['unsubscribe']
}
}
src/backend/Components/Raid/RaidManager.ts
+35 -7
View File
@@ -9,6 +9,7 @@ import { ICharacterManager } from "../Character/Interface";
import { _Tiers } from "../../Types/Items";
import { IItemManager } from "../Item/Interface";
import { ItemManager } from "../Item/ItemManager";
import { IPubSub } from "../PubSub/Interface";
@Injectable(IRaidManager)
export class RaidManager
@@ -27,6 +28,9 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
@Inject(ItemManager)
private itemManager: IItemManager
@Inject(IPubSub)
private pubsub: IPubSub<any>
exportRPCs = () => [
this.getRaids,
this.getRaidData,
@@ -90,11 +94,23 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
]
}
notifyRaid = async (raid:Raid | {id:number}) => {
const data = await this.getRaidData(<Raid>raid)
this.pubsub.publish(""+raid.id, data)
await this.notifyRaids()
}
notifyRaids = async () => {
this.pubsub.publish('raids', undefined)
}
createRaid = async (raid: Raid): Promise<Raid> => {
const ids: number[] = await this.admin
.knex('raids')
.insert(raid)
await this.notifyRaid({ id: ids[0] })
return await this.admin.knex('raids').where({ id: ids[0] }).first()
}
@@ -142,9 +158,11 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
await Promise.all([
...archived.participants.bench.map(giveCurrency),
...Object.values(archived.participants).map((group: any) => group.map(giveCurrency))
...Object.values(archived.participants).flat().flatMap((b:Signup & Character & Spec) => giveCurrency(b))
])
await this.notifyRaids()
return archived
}
@@ -161,11 +179,12 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
})
await Promise.all(
Object.values(raidData.participants).flat().flatMap((signup) => this.admin
Object.values(raidData.participants).flat().flatMap((p: (Signup & Character & Spec)) =>
this.admin
.knex(raid.tier + 'tokens')
//.transacting(tx)
.where({
characterid: signup.characterid,
characterid: p.characterid,
signupid: null
})
.del()
@@ -360,6 +379,8 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
}
//await tx.commit()
await this.notifyRaid(raid)
return await this.admin
.knex('signups')
.select('*')
@@ -389,22 +410,24 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
"si.characterid": character.id!,
}).first()
const tokens = await this.admin.knex(raid.tier+'tokens as t')
.where('t.signupid', signup.id)
const tokens = await this.itemManager.getTokens(character, [raid.tier], true)
//check if token has to be deleted
if (tokens) {
Promise.all(
tokens.map(async token => {
await this.userManager.incrementCurrency(user, raid.tier, 1)
const prio = await this.itemManager.calculatePriorities(token.itemname, character)
if (token.level <= prio + 1) {
await this.admin.knex(raid.tier+'tokens')
await this.admin
.knex(raid.tier + 'tokens')
.where({
characterid: character.id,
itemname: token.itemname
}).del()
} else {
await this.admin.knex(raid.tier+'tokens')
await this.admin
.knex(raid.tier + 'tokens')
.where({
characterid: character.id,
itemname: token.itemname
@@ -415,6 +438,7 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
}
})
)
}
await this.admin.knex('signups')
.where({
@@ -422,6 +446,8 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
characterid: character.id!,
})
.del()
await this.notifyRaid(raid)
}
setBenched = async (signup: Signup): Promise<void> => {
@@ -431,5 +457,7 @@ implements FrontworkComponent<RaidManagerIfc, RaidManagerFeatureIfc>, IRaidManag
characterid: signup.characterid
})
.update(signup)
await this.notifyRaid({ id: signup.raidid })
}
}
src/backend/Components/User/UserManager.ts
-2
View File
@@ -455,6 +455,4 @@ implements FrontworkComponent<UserManagerIfc, UserManagerFeatureIfc>, IUserManag
.where('id', '=', user.id)
.update(tier, value)
}
}
src/backend/Injector/ServiceDecorator.ts
+2 -1
View File
@@ -1,6 +1,7 @@
import { Injector } from "./Injector";
import { Type, GenericClassDecorator } from "./Util";
import { FrontworkComponent } from "../Types/FrontworkComponent";
import { RPCExporter } from "rpclibrary";
/**
* @returns {GenericClassDecorator<Type<any>>}
@@ -21,7 +22,7 @@ export const Injectable = (_interface?: Type<any>) : GenericClassDecorator<Type<
*/
export const RootComponent = (config : {
injectable : Type<any>
injects : Type<FrontworkComponent>[]
injects : Type<RPCExporter>[]
}) : GenericClassDecorator<Type<any>> => {
return (target: Type<any>) => {
Injector.rootModules = config.injects
src/backend/Types/Types.ts
+2
View File
@@ -7,6 +7,7 @@ import { ItemManagerFeatureIfc, ItemManagerIfc } from "../Components/Item/RPCInt
import { GuildManagerFeatureIfc, GuildManagerIfc } from "../Components/Guild/RPCInterface";
import { ShoutboxIfc } from "../Components/Shoutbox/RPCInterface";
import { Tiers } from "./Items";
import { PubSubIfc } from "../Components/PubSub/RPCInterface";
export type FrontcraftIfc = RaidManagerIfc
& UserManagerIfc
@@ -14,6 +15,7 @@ export type FrontcraftIfc = RaidManagerIfc
& ItemManagerIfc
& GuildManagerIfc
& ShoutboxIfc
& PubSubIfc
export type FrontcraftFeatureIfc = RaidManagerFeatureIfc
& UserManagerFeatureIfc
src/frontend/package-lock.json
Generated
+3 -3
View File
@@ -14269,9 +14269,9 @@
"integrity": "sha512-ZYzRkETgBrdEGzL5JSKimvjI2CX7ioyZCkX2BpcfyjqI+079W0wHAyj5W4rIZMcDSOHgLZtgz1IdDi/vU77KEQ=="
},
"rpclibrary": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.6.2.tgz",
"integrity": "sha512-lQTU4XkB9CSHz7YgtAcpVfyR5XrmTRX4P4eQjK6DDUjqKSFvJb5ChXjHnt1BcaNWbJ2VqmhCNVbcoyunJ2u7Rg==",
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.7.1.tgz",
"integrity": "sha512-Ibo3qfURnQgZAq0eA2o+L9+PWaloJ4PHZs4ak42LL9fRgdWZXn33HAtowV0K2HVckbvrBvFqj/+PWTrWWBSOeg==",
"requires": {
"bsock": "^0.1.9",
"http": "0.0.0",
src/frontend/package.json
+1 -1
View File
@@ -69,7 +69,7 @@
"normalize.css": "6.0.0",
"pace-js": "1.0.2",
"roboto-fontface": "0.8.0",
"rpclibrary": "^1.6.2",
"rpclibrary": "^1.7.1",
"rxjs": "6.5.2",
"rxjs-compat": "6.3.0",
"socicon": "3.0.5",
src/frontend/src/app/frontcraft/pages/raid/raid.component.html
+67 -108
View File
@@ -1,9 +1,12 @@
<nb-card class="col-12 col-xl-9">
<div class="row">
<div class="col-12 col-xl-6">
<nb-card [size]="giant">
<nb-card-body>
<nb-tabset>
<nb-tab tabTitle="Info">
<h1>
<img [src]="'../../../../assets/images/'+(raid.tier || 'null').toLowerCase()+'.png'" style="height: 100px" />
<img [src]="'../../../../assets/images/'+(raid.tier || 'null').toLowerCase()+'.png'"
style="height: 100px" />
{{raid.title}}
</h1>
<p>
@@ -16,117 +19,77 @@
<div *ngIf="isSignedup">
<p>
You are signed as: {{mySignup.charactername}} ({{mySignup.race}} {{mySignup.specname}} {{mySignup.class}})<br />
You are signed as: {{mySignup.charactername}} ({{mySignup.race}}
{{mySignup.specname}}
{{mySignup.class}})<br />
Status: {{mySignup.status}}
</p>
<button
(click)="setLate(true)"
*ngIf="mySignup.status !== 'Late'"
nbButton
outline
status="warning"
size="medium">
<button (click)="setLate(true)" *ngIf="mySignup.status !== 'Late'" nbButton outline
status="warning" size="medium">
<nb-icon icon="clock-outline"></nb-icon> Late
</button>
<button
(click)="setLate(false)"
*ngIf="mySignup.status === 'Late'"
nbButton
outline
status="success"
size="medium">
<button (click)="setLate(false)" *ngIf="mySignup.status === 'Late'" nbButton outline
status="success" size="medium">
<nb-icon icon="checkmark-outline"></nb-icon> On Time
</button>
<button
(click)="unsign()"
nbButton
outline
status="danger"
size="medium">
<button (click)="unsign()" nbButton outline status="danger" size="medium">
<nb-icon icon="close"></nb-icon>unsign
</button>
</div>
<div *ngIf="!isSignedup">
<button
(click)="signup()"
nbButton
outline
status="success"
size="medium">
<button (click)="signup()" nbButton outline status="success" size="medium">
<nb-icon icon="person-done-outline"></nb-icon> sign up
</button>
</div>
</div>
</nb-tab>
<nb-tab tabTitle="Signups"
[badgeText]="raid.signupcount"
badgePosition="top right"
<nb-tab tabTitle="Signups" [badgeText]="raid.signupcount" badgePosition="top right"
[badgeStatus]="raid.signupcount<40?'warning':'success'">
<div class="row">
<nb-card
class="col-12 col-md-6"
*ngIf="raid.tanks.length > 0">
<nb-card class="col-12 col-md-6" *ngIf="raid.tanks.length > 0">
<nb-card-header>Tanks ({{raid.tanks.length}})</nb-card-header>
<nb-card-body>
<div *ngFor="let participant of raid.tanks">
<button
(click)="setBench(participant)"
*ngIf="manageRaid"
nbButton
outline
status="warning"
size="tiny">
<button (click)="setBench(participant)" *ngIf="manageRaid" nbButton outline
status="warning" size="tiny">
B
</button>
<button
(click)="adminUnsign(participant)"
*ngIf="manageRaid"
nbButton
outline
status="danger"
size="tiny">
<button (click)="adminUnsign(participant)" *ngIf="manageRaid" nbButton outline
status="danger" size="tiny">
X
</button>
<a [ngStyle]="{'color': participant.color}" style="text-transform: capitalize;"
[routerLink]="'/frontcraft/character/'+participant.charactername">
<img style="width:20px; height:20px" [src]="'../../../../assets/images/'+participant.race.toLowerCase()+'_xs.gif'" />
<img style="width:20px; height:20px" [src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
<img style="width:20px; height:20px"
[src]="'../../../../assets/images/'+participant.race.toLowerCase()+'_xs.gif'" />
<img style="width:20px; height:20px"
[src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
{{ participant.charactername }}
</a>
</div>
</nb-card-body>
</nb-card>
<nb-card
class="col-12 col-md-6"
*ngIf="raid.tanks.length > 0">
<nb-card class="col-12 col-md-6" *ngIf="raid.tanks.length > 0">
<nb-card-header>Healers ({{raid.healers.length}})</nb-card-header>
<nb-card-body>
<div *ngFor="let participant of raid.healers">
<button
(click)="setBench(participant)"
*ngIf="manageRaid"
nbButton
outline
status="warning"
size="tiny">
<button (click)="setBench(participant)" *ngIf="manageRaid" nbButton outline
status="warning" size="tiny">
B
</button>
<button
(click)="adminUnsign(participant)"
*ngIf="manageRaid"
nbButton
outline
status="danger"
size="tiny">
<button (click)="adminUnsign(participant)" *ngIf="manageRaid" nbButton outline
status="danger" size="tiny">
X
</button>
<a [ngStyle]="{'color': participant.color}" style="text-transform: capitalize;"
[routerLink]="'/frontcraft/character/'+participant.charactername">
<img style="width:20px; height:20px" [src]="'../../../../assets/images/'+participant.race.toLowerCase()+'_xs.gif'" />
<img style="width:20px; height:20px" [src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
<img style="width:20px; height:20px"
[src]="'../../../../assets/images/'+participant.race.toLowerCase()+'_xs.gif'" />
<img style="width:20px; height:20px"
[src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
{{ participant.charactername }}
</a>
</div>
@@ -134,34 +97,25 @@
</nb-card>
<ng-container *ngFor="let group of raid.participants | keyvalue">
<nb-card
class="col-12 col-md-6 col-xl-4"
*ngIf="group.value.length > 0">
<nb-card class="col-12 col-md-6 col-xl-4" *ngIf="group.value.length > 0">
<nb-card-header>{{group.key}} ({{group.value.length}})</nb-card-header>
<nb-card-body>
<div *ngFor="let participant of group.value">
<button
(click)="setBench(participant)"
*ngIf="manageRaid"
nbButton
outline
status="warning"
size="tiny">
<button (click)="setBench(participant)" *ngIf="manageRaid" nbButton outline
status="warning" size="tiny">
B
</button>
<button
(click)="adminUnsign(participant)"
*ngIf="manageRaid"
nbButton
outline
status="danger"
size="tiny">
<button (click)="adminUnsign(participant)" *ngIf="manageRaid" nbButton
outline status="danger" size="tiny">
X
</button>
<a [ngStyle]="{'color': participant.color}" style="text-transform: capitalize;"
<a [ngStyle]="{'color': participant.color}"
style="text-transform: capitalize;"
[routerLink]="'/frontcraft/character/'+participant.charactername">
<img style="width:20px; height:20px" [src]="'../../../../assets/images/'+participant.race.toLowerCase()+'_xs.gif'" />
<img style="width:20px; height:20px" [src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
<img style="width:20px; height:20px"
[src]="'../../../../assets/images/'+participant.race.toLowerCase()+'_xs.gif'" />
<img style="width:20px; height:20px"
[src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
{{ participant.charactername }}
</a>
</div>
@@ -170,17 +124,27 @@
</ng-container>
</div>
</nb-tab>
<nb-tab tabTitle="Items" *ngIf="isSignedup && isTier">
<shop [tier]="raid.tier" (onSelect)="itemSelect($event)"></shop>
<nb-tab tabTitle="Admin" *ngIf="manageRaid">
<button (click)="startRaid(raid)" nbButton outline status="success" size="medium">
start
</button>
</nb-tab>
<nb-tab tabTitle="Reserves" *ngIf="isTier">
<input type="text" nbInput [(ngModel)]="search" (change)="changeSearch()" placeholder="Search" fullWidth="true">
</nb-tabset>
</nb-card-body>
</nb-card>
</div>
<div class="col-12 col-xl-6">
<nb-card *ngIf="isTier">
<nb-card-body>
<nb-tabset>
<nb-tab tabTitle="Reserves">
<input type="text" nbInput [(ngModel)]="search" (change)="changeSearch()" placeholder="Search"
fullWidth="true">
<nb-list>
<nb-list-item *ngFor="let item of displayedtokens | keyvalue">
<a [ngStyle]="{'color':item.value[0].quality=='Epic'?'#a335ee':'#ff8000'}"
target="_blank"
[href]="item.value[0].url">
target="_blank" [href]="item.value[0].url">
<img style="min-width: 25px; width: 2.25vw; max-width: 50px"
[src]="'https://wow.zamimg.com/images/wow/icons/large/'+item.value[0].iconname+'.jpg'" />
&nbsp;
@@ -189,7 +153,8 @@
<div class="row">
<div *ngFor="let token of item.value" class="col-12 col-md-6 col-xl-4">
[ {{token.level}} ]
<span style="text-transform: capitalize;" [ngStyle]="{'color':token.level>=10?'#ff8000':token.level>=8?'#a335ee':token.level>=6?'#0070dd':token.level>=4?'#1eff00':token.level>=2?'#ffffff':'#9d9d9d'}">
<span style="text-transform: capitalize;"
[ngStyle]="{'color':token.level>=10?'#ff8000':token.level>=8?'#a335ee':token.level>=6?'#0070dd':token.level>=4?'#1eff00':token.level>=2?'#ffffff':'#9d9d9d'}">
{{token.charactername}}
</span><br />
</div>
@@ -197,17 +162,11 @@
</nb-list-item>
</nb-list>
</nb-tab>
<nb-tab tabTitle="Admin" *ngIf="manageRaid">
<button
(click)="startRaid(raid)"
nbButton
outline
status="success"
size="medium">
start
</button>
<nb-tab tabTitle="Items" *ngIf="isSignedup">
<shop [tier]="raid.tier" (onSelect)="itemSelect($event)"></shop>
</nb-tab>
</nb-tabset>
</nb-card-body>
</nb-card>
</div>
</div>
src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
+29 -11
View File
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { ActivatedRoute, Router, NavigationStart } from '@angular/router';
import { ApiService as ApiService } from '../../services/login-api';
import { RaidData, Raid, Signup, Character, Spec, Item, SRToken } from '../../../../../../backend/Types/Types';
import { NbWindowService, NbToastrService, NbDialogService } from '@nebular/theme';
@@ -12,7 +12,7 @@ import { allItems } from '../../../../../../backend/Types/Items';
selector: 'raid',
templateUrl: './raid.component.html',
})
export class FrontcraftRaidComponent implements OnInit{
export class FrontcraftRaidComponent implements OnInit, OnDestroy{
canSignup = false
isSignedup = false
@@ -41,6 +41,7 @@ export class FrontcraftRaidComponent implements OnInit{
tokens = {}
displayedtokens = {}
search = ""
uuid
constructor(
private api: ApiService,
@@ -50,6 +51,16 @@ export class FrontcraftRaidComponent implements OnInit{
private toast: NbToastrService
){
window['r'] = this
router.events.subscribe(event => {
if (event instanceof NavigationStart) {
this.ngOnDestroy()
}
})
}
ngOnDestroy = () => {
if(this.uuid)
this.api.get('PubSub').unsubscribe(this.uuid)
}
async ngOnInit(){
@@ -60,9 +71,16 @@ export class FrontcraftRaidComponent implements OnInit{
if(signupFeature){
this.canSignup = true
}
this.refresh()
await this.refresh()
const res = await this.api.get('PubSub').subscribe(""+this.raid.id!, (data: RaidData) => {
this.display(data)
})
this.uuid = res.uuid
}
itemSelect = async(item) => {
this.dialogService.open(FrontcraftBuyTokenComponent, {
context: {
@@ -71,7 +89,7 @@ export class FrontcraftRaidComponent implements OnInit{
tier: this.raid.tier,
characterName: this.mySignup.charactername
}
}).onClose.subscribe(() => this.refresh())
})
}
signup = async () => {
@@ -84,9 +102,7 @@ export class FrontcraftRaidComponent implements OnInit{
context: {
raid: this.raid,
}
}).onClose.subscribe(()=>{
this.refresh()
});
})
}
async archiveRaid(raid:Raid){
@@ -110,7 +126,6 @@ export class FrontcraftRaidComponent implements OnInit{
id: this.mySignup.characterid,
}, this.raid)
this.toast.show('Success', 'Unsigned', { status: 'success' })
this.refresh()
}
setLate = async (value:boolean) => {
@@ -123,7 +138,6 @@ export class FrontcraftRaidComponent implements OnInit{
id: this.mySignup.characterid,
}, this.raid, value)
this.toast.show('Signup', 'Success', { status: 'success' })
this.refresh()
}
adminUnsign = async() => {
@@ -133,7 +147,6 @@ export class FrontcraftRaidComponent implements OnInit{
...this.mySignup,
id: this.mySignup.characterid,
}, this.raid)
this.refresh()
}
refresh = async () => {
@@ -143,6 +156,11 @@ export class FrontcraftRaidComponent implements OnInit{
const raiddata = await raidManager.getRaidData(<any>{
id: param
})
this.display(raiddata)
}
display = async (raiddata:RaidData) => {
this.isTier = allItems[raiddata.tier] != null
this.raid = raiddata
src/frontend/src/app/frontcraft/pages/raids/raids.component.html
+16 -9
View File
@@ -16,24 +16,31 @@
class="raidlist"
style="cursor: pointer;">
<div class="row">
<div class="col-2">
<img [src]="'../../../../assets/images/'+(raid.tier || 'null').toLowerCase()+'.png'" style="height: 75px" />
</div>
<img [src]="'../../../../assets/images/'+(raid.tier || 'null').toLowerCase()+'.png'"
style="object-fit: contain"
class="col-1 col-s-3" />
<div class="col-2 vcenter">
<div class="col-11 col-s-9" >
<div class="row">
<div class="col-12" style="padding-top: 5px">
<h4>
{{raid.title}}
</h4>
</div>
<div class="col-2 vcenter">
</div>
<div class="row" style="padding-top: 5px; padding-bottom: 5px; color:darkgray">
<div class="col-6 col-md-3">
<nb-icon icon="checkmark-circle"></nb-icon> {{raid.signupcount}} / {{raid.size}}<br>
</div>
<div class="col-2 vcenter">
<div class="col-6 col-md-3">
<nb-icon icon="clock-outline"></nb-icon> {{raid.start | date : 'HH:mm'}}
</div>
<div class="col-4 vcenter">
<nb-icon icon="calendar-outline"></nb-icon> {{raid.start | date : 'EEEE MMMM d'}}
<div class="col-12 col-md-6">
<nb-icon icon="calendar-outline"></nb-icon> {{raid.start | date : 'EEE MMM d'}}
</div>
</div>
</div>
</div>
</nb-list-item>
src/frontend/src/app/frontcraft/pages/raids/raids.component.scss
+10 -3
View File
@@ -10,7 +10,14 @@
background-color: #293259;
}
.vcenter {
height: 75px;
padding-top: 30px;
.raid {
height: 75px
}
.row {
margin: -0.5rem;
}
h4 {
font-weight: normal
}
src/frontend/src/app/frontcraft/pages/raids/raids.component.ts
+23 -7
View File
@@ -1,30 +1,48 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { ApiService } from '../../services/login-api';
import { NbWindowService, NbDialogService } from '@nebular/theme';
import { FrontcraftCreateRaidsComponent } from './createraid.compontent';
import { Router, NavigationStart } from '@angular/router';
@Component({
selector: 'raids',
templateUrl: 'raids.component.html',
styleUrls: ['raids.component.scss'],
})
export class FrontcraftRaidsComponent implements OnInit{
export class FrontcraftRaidsComponent implements OnInit, OnDestroy{
manageRaid
raids = []
oldraids = []
pageSize = 10;
uuid
constructor(
private api: ApiService,
private router: Router,
private dialogService: NbDialogService
) {
this.manageRaid = this.api.get('manageRaid')
router.events.subscribe(event => {
if (event instanceof NavigationStart) {
this.ngOnDestroy()
}
})
}
ngOnInit(): void {
ngOnDestroy = () => {
console.log("boom");
if(this.uuid)
this.api.get('PubSub').unsubscribe(this.uuid)
}
async ngOnInit() {
const res = await this.api.get('PubSub').subscribe("raids", () => {
this.refresh()
})
this.uuid = res.uuid
this.refresh()
}
@@ -46,9 +64,7 @@ export class FrontcraftRaidsComponent implements OnInit{
context: {
templates: this.oldraids
}
}).onClose.subscribe(()=>{
this.refresh()
});
})
}
}
src/frontend/src/app/frontcraft/pages/rules/rules.component.html
+58 -7
View File
@@ -2,18 +2,69 @@
<nb-card-body>
<nb-tabset>
<nb-tab tabTitle="Info">
Smart text here
<h3>How it works</h3>
<ul>
<li>
Everyone starts out with 1 soft reserve right per raid tier (you can see them in your user profile)
</li>
<li>
The tiers are: MC+Ony, BWL, ZG, AQ20, AQ40, Naxx
</li>
<li>
You gain 1 reserve right for a raid you attend. 2 if you were benched. Rights are granted on raid start.
</li>
<li>
When you sign up to a raid you can spend your reserve rights
</li>
<li>
Every week you can re-reserve the same item to build a streak on it
</li>
<!--
<li>
Steaks are color coded. If this means anything will be decided by guild culture:
<span style="color: #ff8000">[+ 10]</span>
<span style="color: #a335ee">[9. 8]</span>
<span style="color: #0070dd">[7, 6]</span>
<span style="color: #1eff00">[5, 4]</span>
<span style="color: #ffffff">[3, 2]</span>
<span style="color: #9d9d9d">[1]</span>
</li>
-->
</ul>
<br />
<h3>Specifics about streaks</h3>
<ul>
<li>
Some classes and races get an initial boost to specific reserves. The list is on the second tab.
</li>
<li>
Switching the selected item destroys previous streaks. (Streaks must be continued without switchup)
</li>
<li>
If you have more than 1 softreserve you can reserve multiple different items. You may only continue one streak the following raid.
</li>
<li>
If you have more than 1 softreserve you can reserve the same item several times to increase its streak.
</li>
<li>
The softreserve counter, Reserves, and Streaks are tiers-specific and only count within their tier.
</li>
<li>
Canceling the signup refunds active reserves and continued streaks. Destroyed streaks cannot be recovered.
</li>
</ul>
</nb-tab>
<nb-tab tabTitle="priorities">
<nb-list>
<nb-list-item *ngFor="let item of rules | keyvalue">
<wowhead [item]="item.value[0]"></wowhead><br>
<span *ngFor="let rule of item.value" [nbPopover]="templateRef" nbPopoverTrigger="hover">
<ng-template #templateRef>
<span style="color:white">{{rule.description}}</span>
</ng-template>
<span *ngIf="rule.modifier>0">+</span>{{rule.modifier}} {{rule.race}} <span [ngStyle]="{'color':rule.color}">{{rule.specname}} {{rule.class}}</span> <br />
</span>
<div class="row" *ngFor="let rule of item.value">
<div class="col-4">
<span *ngIf="rule.modifier>0">+</span>{{rule.modifier}} {{rule.race}} <span [ngStyle]="{'color':rule.color}">{{rule.specname}} {{rule.class}}</span>
</div>
<div class="col-8" style="color:white"> ({{rule.description}})</div>
<br />
</div>
</nb-list-item>
</nb-list>
</nb-tab>
test/backendTest.ts
+153 -92
View File
@@ -1,6 +1,6 @@
import { Injector } from "../src/backend/Injector/Injector";
import { FrontworkAdmin } from "../src/backend/Admin/Admin";
import { T1 } from "../src/backend/Types/Items";
import { T1, T2, Tiers } from "../src/backend/Types/Items";
import { RPCSocket } from "rpclibrary";
import { FrontcraftIfc, Auth, User, FrontcraftFeatureIfc, Raid, Character, Rank, Class, Race, SRPriority, Spec, Signup } from "../src/backend/Types/Types";
@@ -39,13 +39,20 @@ const adminsOnly = {
}
const defaultPermissions = [
{ rpcname: 'signup', ...trialsAndUp
},{ rpcname: 'reset', ...adminsOnly
},{ rpcname: 'modifyPermissions', ...adminsOnly
},{ rpcname: 'manageGuild', ...adminsOnly
},{ rpcname: 'managePriorities', ...adminsOnly
},{ rpcname: 'softreserveCurrency', ...adminsOnly
},{ rpcname: 'manageRaid', ...adminsOnly
{
rpcname: 'signup', ...trialsAndUp
}, {
rpcname: 'reset', ...adminsOnly
}, {
rpcname: 'modifyPermissions', ...adminsOnly
}, {
rpcname: 'manageGuild', ...adminsOnly
}, {
rpcname: 'managePriorities', ...adminsOnly
}, {
rpcname: 'softreserveCurrency', ...adminsOnly
}, {
rpcname: 'manageRaid', ...adminsOnly
}]
const testAccounts: protoAccount[] = [
@@ -193,16 +200,16 @@ describe('Frontcraft', () => {
it('create raids', (done) => {
let insertRaid = <Raid>{
description: "Test raid 1",
title: 'MC',
title: 'BWL :D',
start: Date.now().toString(),
tier: 'MC'
tier: 'BWL'
}
adminClient.manageRaid.createRaid(insertRaid).then(() => {
client.RaidManager.getRaids().then((r) => {
if (r[0].title === insertRaid.title
&& r[0].description === insertRaid.description
&& r[0].tier === "MC"){
&& r[0].tier === "BWL") {
raids.push(r[0])
done()
}
@@ -288,27 +295,22 @@ describe('Frontcraft', () => {
makePrio(
'Maladath, Runed Blade of the Black Flight',
undefined,
"Human", -2, "(1) Non-Human"
),
makePrio(
'Maladath, Runed Blade of the Black Flight',
{class:'Rogue', specname:'Subtlety'},
undefined, 2, "...Rogues (weapon skill bias)"
"Human", -2, "[1] Non-Human"
),
makePrio(
'Maladath, Runed Blade of the Black Flight',
{ class: 'Rogue', specname: 'Combat' },
undefined, 2, "...Rogues (weapon skill bias)"
),
makePrio(
'Maladath, Runed Blade of the Black Flight',
{class:'Rogue', specname:'Assassination'},
undefined, 2, "...Rogues (weapon skill bias)"
undefined, 2, "Weapon skill bias"
),
makePrio(
'Maladath, Runed Blade of the Black Flight',
{ class: 'Warrior', specname: 'Fury' },
'Human', 4, "+2 Fury Warrior (weapon skill bias), +2 to offset (1)"
'Human', 4, "+2 Fury Warrior (weapon skill bias), +2 to offset [1]"
),
makePrio(
'Maladath, Runed Blade of the Black Flight',
{ class: 'Warrior', specname: 'Protection' },
'Human', 5, "+3 Prot Warrior, +2 to offset [1]"
),
makePrio(
@@ -358,6 +360,45 @@ describe('Frontcraft', () => {
undefined, 1, "hit bias"
),
makePrio(
'Chromatic Boots',
{ class: 'Warrior', specname: 'Protection' },
undefined, 2, "hit bias"
),
makePrio(
'Crul\'shorukh, Edge of Chaos',
undefined,
"Human", -2, "Non-human"
),
makePrio(
'Crul\'shorukh, Edge of Chaos',
{ class: 'Warrior', specname: 'Protection' },
undefined, 2, "nice dps bias"
),
makePrio(
'Crul\'shorukh, Edge of Chaos',
{ class: 'Warrior', specname: 'Fury' },
undefined, 2, "nice dps bias"
),
makePrio(
'Drake Talon Pauldrons',
{ class: 'Warrior', specname:'Protection'},
undefined, 2, 'dodge + stats-to-threat bias'
),
makePrio(
'Helm of Endless Rage',
{ class: 'Warrior', specname:'Protection'},
undefined, 2, 'stats-to-threat bias'
),
makePrio(
'Drake Fang Talisman',
{ class: 'Warrior', specname: 'Protection' },
undefined, 5, "hit bias"
),
makePrio(
'Drake Fang Talisman',
{ class: 'Rogue', specname: 'Assassination' },
@@ -392,7 +433,7 @@ describe('Frontcraft', () => {
makePrio(
'Circle of Applied Force',
{ class: 'Druid', specname: 'Feral (DPS)' },
undefined, 2, "str-to-ap bias"
undefined, 3, "str-to-ap bias + agi-to-ap bias"
),
makePrio(
@@ -466,42 +507,23 @@ describe('Frontcraft', () => {
makePrio(
'Cloak of Draconic Might',
{ class: 'Druid', specname: 'Feral (DPS)' },
undefined, 2, "str-to-ap bias"
undefined, 1, "str-to-ap bias"
),
])
]).then(() => {
const user = Object.values(users)[0]
adminClient.managePriorities.setPriority(T1[0], {
race: user.character.race,
specid: user.character.specid,
modifier: 1,
description:'AAA'
}).then(() => {
adminClient.managePriorities.setPriority(T1[0], {
race: user.character.race,
specid: undefined,
modifier: 2,
description:'BBB'
}).then(()=>{
adminClient.managePriorities.setPriority(T1[0], {
race: undefined,
specid: user.character.specid,
modifier: 3,
description:'CCC'
}).then(()=>{
client.ItemManager.calculatePriorities(T1[0], user.character).then(sum => {
if(sum === 6)
client.ItemManager.calculatePriorities("Maladath, Runed Blade of the Black Flight", user.character).then(sum => {
if (sum === 3)
done()
else
console.log("Expected prio on maladath to be 4, but was:", sum, user.character);
})
})
})
})
})
it('buy token', (done) => {
Promise.all(Object.values(users).map(async (user) => {
const itemname = T1[0]//T1[Math.floor(T1.length*Math.random())]
const itemname = "Maladath, Runed Blade of the Black Flight" //T1[Math.floor(T1.length*Math.random())]
const modifier = await client.ItemManager.calculatePriorities(itemname, user.character)
const token = await client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, user.signup!)
@@ -516,7 +538,7 @@ describe('Frontcraft', () => {
it('not buy token without currency', (done) => {
const user = Object.values(users)[0]
const itemname = T1[0]
const itemname = "Maladath, Runed Blade of the Black Flight"
client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, user.signup!).then(token => {
if (!token)
done()
@@ -528,22 +550,21 @@ describe('Frontcraft', () => {
it('upgrade token', (done) => {
const user = Object.values(users)[0]
const itemname = T1[0]
adminClient.softreserveCurrency.incrementCurrency(user.account, raids[0].tier, 2).then(async ()=>{
const item = await client.ItemManager.getItem(itemname)
const itemname = "Maladath, Runed Blade of the Black Flight"
client.ItemManager.getItem(itemname).then(async item => {
await adminClient.softreserveCurrency.incrementCurrency(user.account, item.tier, 2)
const before = await client.ItemManager.getToken(user.character, item)
if(!before || before.level !== 7) {
console.log("expected level to be 7", before);
if (!before || before.level !== 4) {
console.log("expected level to be 4", before ? before.level : '?');
return
}
await client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, user.signup!)
const after = await client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, user.signup!)
if(!after || after.level !== 9) {
console.log("expected level to be 9", after);
if (!after || after.level !== 6) {
console.log("expected level after to be 6", after ? after.level : '?');
return
}
done()
@@ -557,7 +578,7 @@ describe('Frontcraft', () => {
.buyToken(
user.auth.token.value,
user.character.charactername,
T1[Math.floor(T1.length*Math.random())],
T2[Math.floor(T2.length * Math.random())],
user.signup!
)
})).then(_ => {
@@ -579,7 +600,7 @@ describe('Frontcraft', () => {
const dbRaids = await client.RaidManager.getRaids()
if (dbRaids.length === 0) {
await client.UserManager.getUser(testAccounts[0].name).then(dbUser => {
if(dbUser && dbUser.MC === 1){
if (dbUser && dbUser.BWL === 1) {
adminClient.signup.getSignups(raids[0]).then(signups => {
if (signups.length === 0) {
done()
@@ -601,7 +622,7 @@ describe('Frontcraft', () => {
adminClient.reset.wipeCurrencyAndItems().then(() => {
client.UserManager.getUser(testAccounts[0].name).then(user => {
if (user && user.MC === 1) {
client.ItemManager.getTokens(users[testAccounts[0].name.toLowerCase()].character, ['MC']).then(tokens => {
client.ItemManager.getTokens(users[testAccounts[0].name.toLowerCase()].character, ['BWL']).then(tokens => {
if (tokens!.length === 0) {
done()
} else {
@@ -630,51 +651,91 @@ describe('Frontcraft', () => {
const createRaid = adminClient.manageRaid.createRaid
const sign = async (raid: Raid, late = false) => await adminClient.signup.sign(user.auth.token.value, user.character, raid, late)
const buyToken = async (signup: Signup, itemname: string) => await client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, signup)
const getCurrency = async (tier: Tiers) => {
const dbUser = await client.UserManager.getUser(user.account.username)
return dbUser[tier]
}
createRaid(Raid(0, 'MC')).then(async (MC0:Raid) => {
const T1_0 = await client.ItemManager.getItem(T1[0])
createRaid(Raid(0, 'BWL')).then(async (BWL0: Raid) => {
const T2_0 = await client.ItemManager.getItem(T2[0])
//const BWL0 = await createRaid(Raid(0, 'BWL'))
const signupMC0 = await sign(MC0)
let token = await buyToken(signupMC0, T1[0])
if(!token){
console.log(MC0, signupMC0)
done("No token created")
const signupBWL0 = await sign(BWL0)
let BWL = await getCurrency(BWL0.tier)
let token = await buyToken(signupBWL0, T2[0])
const BWLAfter = await getCurrency(BWL0.tier)
if (!token
|| BWL - BWLAfter != 1) {
console.log("Bad Token status", BWL0, signupBWL0, BWL, BWLAfter)
done(new Error("Bad Token status 0"))
return
}
let reserves = await client.ItemManager.getTokens(user.character, [MC0.tier], true)
let streaks = await client.ItemManager.getTokens(user.character, [MC0.tier], false)
let reserves = await client.ItemManager.getTokens(user.character, [BWL0.tier], true)
let streaks = await client.ItemManager.getTokens(user.character, [BWL0.tier], false)
if (reserves!.length != 1
|| streaks!.length != 0
|| reserves![0].itemname !== T1_0.itemname
|| reserves![0].level !== 7){
console.log(reserves, streaks);
done("Bad token status")
|| reserves![0].itemname !== T2_0.itemname
|| reserves![0].level !== 1) {
console.log("Bad Token status 1", reserves, streaks);
done(new Error("Bad Token status"))
return
}
await adminClient.manageRaid.startRaid(MC0)
reserves = await client.ItemManager.getTokens(user.character, [MC0.tier], true)
streaks = await client.ItemManager.getTokens(user.character, [MC0.tier], false)
await adminClient.manageRaid.startRaid(BWL0)
reserves = await client.ItemManager.getTokens(user.character, [BWL0.tier], true)
streaks = await client.ItemManager.getTokens(user.character, [BWL0.tier], false)
if (reserves!.length != 0
|| streaks!.length != 1
|| streaks![0].itemname !== T1[0]
|| streaks![0].level !== 7){
console.log(reserves, streaks);
done("Bad token status")
|| streaks![0].itemname !== T2[0]
|| streaks![0].level !== 1) {
console.log("Bad Token status", reserves, streaks);
done(new Error("Bad Token status 2"))
return
}
const MC1 = await createRaid(Raid(1, 'MC'))
const signupMC1 = await sign(MC1)
token = await buyToken(signupMC1, T1[1])
reserves = await client.ItemManager.getTokens(user.character, [MC1.tier], true)
streaks = await client.ItemManager.getTokens(user.character, [MC1.tier], false)
const BWL1 = await createRaid(Raid(1, 'BWL'))
let signupBWL1 = await sign(BWL1)
BWL = await getCurrency(BWL1.tier)
await adminClient.manageRaid.adminUnsign(user.character, BWL1)
let afterUnsign = await getCurrency(BWL1.tier)
if (BWL !== afterUnsign) {
console.log("Expected currency to be equal", BWL, afterUnsign)
done(new Error("Expected currency to be equal"))
return
}
signupBWL1 = await sign(BWL1)
BWL = await getCurrency(BWL1.tier)
await buyToken(signupBWL1, T2[1])
await adminClient.manageRaid.adminUnsign(user.character, BWL1)
afterUnsign = await getCurrency(BWL1.tier)
if (BWL !== afterUnsign) {
console.log("Expected currency to be equal", BWL, afterUnsign)
done(new Error("Expected currency to be equal"))
return
}
signupBWL1 = await sign(BWL1)
await buyToken(signupBWL1, T2[1])
reserves = await client.ItemManager.getTokens(user.character, [BWL1.tier], true)
streaks = await client.ItemManager.getTokens(user.character, [BWL1.tier], false)
if (reserves!.length != 1
|| streaks!.length != 0
|| reserves![0].itemname !== T1[1]
|| reserves![0].itemname !== T2[1]
|| reserves![0].level !== 1) {
console.log(reserves, streaks);
done("Bad token status")
console.log("Bad Token status", reserves, streaks);
done(new Error("Bad Token status 3"))
return
}
BWL = await getCurrency(BWL1.tier)
const data = await adminClient.manageRaid.startRaid(BWL1)
const afterStart = await getCurrency(BWL1.tier)
if (BWL != 0 || afterStart != 1) {
console.log("Wrong currency values", BWL, afterStart)
done(new Error("Wrong currency values"))
return
}