implement MC prios and trials no reserve
This commit is contained in:
@@ -289,12 +289,14 @@ export class RaidManager
|
|||||||
.select('*', 's.id as id')
|
.select('*', 's.id as id')
|
||||||
.join('raids as r', 's.raidid', '=', 'r.id')
|
.join('raids as r', 's.raidid', '=', 'r.id')
|
||||||
.join('characters as c', 's.characterid', '=', 'c.id')
|
.join('characters as c', 's.characterid', '=', 'c.id')
|
||||||
|
.join('users as u', 'u.id', '=' ,'c.userid')
|
||||||
.join(raidInDb.tier + 'tokens as t', 't.characterid', '=', 'c.id')
|
.join(raidInDb.tier + 'tokens as t', 't.characterid', '=', 'c.id')
|
||||||
.join('items as i', 'i.itemname', '=', 't.itemname')
|
.join('items as i', 'i.itemname', '=', 't.itemname')
|
||||||
.where({
|
.where({
|
||||||
'r.id': raid.id,
|
'r.id': raid.id,
|
||||||
})
|
})
|
||||||
.andWhere(function () {
|
.andWhere(function () {
|
||||||
|
this.whereNotIn('u.rank', ['Trial', 'Guest'])
|
||||||
this.whereNotNull('t.signupid')
|
this.whereNotNull('t.signupid')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
+19
-3
@@ -73,7 +73,7 @@ const testAccounts: protoAccount[] = [
|
|||||||
class: 'Druid',
|
class: 'Druid',
|
||||||
race: 'Night Elf',
|
race: 'Night Elf',
|
||||||
spec: 'Restoration',
|
spec: 'Restoration',
|
||||||
rank: 'Raider'
|
rank: 'Trial'
|
||||||
}, {
|
}, {
|
||||||
name: 'Dagger',
|
name: 'Dagger',
|
||||||
race: 'Dwarf',
|
race: 'Dwarf',
|
||||||
@@ -259,8 +259,24 @@ describe('Frontcraft', () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Promise.all([
|
Promise.all([
|
||||||
|
makePrio(
|
||||||
|
'Quick Strike Ring',
|
||||||
|
{ class: 'Warrior', specname: 'Fury' },
|
||||||
|
undefined, 2, "str-to-ap bias"
|
||||||
|
),
|
||||||
|
makePrio(
|
||||||
|
'Quick Strike Ring',
|
||||||
|
{ class: 'Druid', specname: 'Feral (DPS)' },
|
||||||
|
undefined, 2, "str-to-ap bias"
|
||||||
|
),
|
||||||
|
|
||||||
|
makePrio(
|
||||||
|
'Band of Accuria',
|
||||||
|
{ class: 'Warrior', specname: 'Protection' },
|
||||||
|
undefined, 2, "hit bias"
|
||||||
|
),
|
||||||
|
|
||||||
makePrio(
|
makePrio(
|
||||||
'Bracers of Arcane Accuracy',
|
'Bracers of Arcane Accuracy',
|
||||||
{ class: 'Warlock', specname: 'Demonology' },
|
{ class: 'Warlock', specname: 'Demonology' },
|
||||||
@@ -507,7 +523,7 @@ describe('Frontcraft', () => {
|
|||||||
makePrio(
|
makePrio(
|
||||||
'Cloak of Draconic Might',
|
'Cloak of Draconic Might',
|
||||||
{ class: 'Druid', specname: 'Feral (DPS)' },
|
{ class: 'Druid', specname: 'Feral (DPS)' },
|
||||||
undefined, 1, "str-to-ap bias"
|
undefined, 3, "str-to-ap + agi-to-ap bias"
|
||||||
),
|
),
|
||||||
]).then(() => {
|
]).then(() => {
|
||||||
const user = Object.values(users)[0]
|
const user = Object.values(users)[0]
|
||||||
|
|||||||
Reference in New Issue
Block a user