ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

POWER

Browse Source
This commit is contained in:
ntr 2019-05-25 16:25:06 +10:00
parent 33f4cfa525
commit fac3defcf6
6 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/instance.constructs.jsx
View File

@ -215,7 +215,7 @@ function Construct(props) {
</div> </div>
<div className="stats"> <div className="stats">
<div className="damage-label label"> <div className="damage-label label">
Damage Power
</div> </div>
<div className="speed-label label"> <div className="speed-label label">
Speed Speed

6
client/src/test.game.js
View File

@ -19,9 +19,9 @@ function testGame(uuid) {
], ],
[ [
"Speed", "Speed",
"Damage", "Power",
"Life", "Life",
"Damage", "Power",
"Life", "Life",
"Life" "Life"
] ]
@ -282,7 +282,7 @@ function testGame(uuid) {
], ],
[ [
"Speed", "Speed",
"Damage", "Power",
"Speed", "Speed",
"Life", "Life",
"Speed", "Speed",

38
client/src/test.instance.js
View File

@ -22,9 +22,9 @@ function testInstance(uuid) {
"Block" "Block"
], ],
[ [
"Damage", "Power",
"Life", "Life",
"Damage", "Power",
"Speed" "Speed"
] ]
], ],
@ -308,7 +308,7 @@ function testInstance(uuid) {
"Attack" "Attack"
], ],
[ [
"Damage", "Power",
"Speed", "Speed",
"Life" "Life"
] ]
@ -886,7 +886,7 @@ function testInstance(uuid) {
], ],
[ [
"Speed", "Speed",
"Damage", "Power",
"Speed", "Speed",
"Speed" "Speed"
] ]
@ -1174,7 +1174,7 @@ function testInstance(uuid) {
"Debuff" "Debuff"
], ],
[ [
"Damage", "Power",
"Life", "Life",
"Speed", "Speed",
"Speed" "Speed"
@ -1466,7 +1466,7 @@ function testInstance(uuid) {
"Speed", "Speed",
"Speed", "Speed",
"Speed", "Speed",
"Damage" "Power"
] ]
], ],
"bound": [] "bound": []
@ -1754,7 +1754,7 @@ function testInstance(uuid) {
[ [
"Life", "Life",
"Speed", "Speed",
"Damage", "Power",
"Life" "Life"
] ]
], ],
@ -2044,7 +2044,7 @@ function testInstance(uuid) {
"Speed", "Speed",
"Life", "Life",
"Speed", "Speed",
"Damage" "Power"
] ]
], ],
"bound": [] "bound": []
@ -2622,7 +2622,7 @@ function testInstance(uuid) {
"Life", "Life",
"Speed", "Speed",
"Speed", "Speed",
"Damage" "Power"
] ]
], ],
"bound": [] "bound": []
@ -2908,10 +2908,10 @@ function testInstance(uuid) {
"Stun" "Stun"
], ],
[ [
"Damage", "Power",
"Damage", "Power",
"Speed", "Speed",
"Damage" "Power"
] ]
], ],
"bound": [] "bound": []
@ -3197,10 +3197,10 @@ function testInstance(uuid) {
"Stun" "Stun"
], ],
[ [
"Damage", "Power",
"Speed", "Speed",
"Damage", "Power",
"Damage" "Power"
] ]
], ],
"bound": [] "bound": []
@ -3486,9 +3486,9 @@ function testInstance(uuid) {
"Buff" "Buff"
], ],
[ [
"Damage", "Power",
"Speed", "Speed",
"Damage", "Power",
"Life" "Life"
] ]
], ],
@ -4348,9 +4348,9 @@ function testInstance(uuid) {
[ [
"Life", "Life",
"Speed", "Speed",
"Damage", "Power",
"Speed", "Speed",
"Damage", "Power",
"Life" "Life"
] ]
], ],

36
client/src/utils.jsx
View File

@ -113,18 +113,18 @@ function instanceConstruct(name, id) {
const NULL_UUID = '00000000-0000-0000-0000-000000000000'; const NULL_UUID = '00000000-0000-0000-0000-000000000000';
const STATS = { const STATS = {
redDamage: { redPower: {
stat: 'red_damage', stat: 'red_power',
colour: 'red', colour: 'red',
svg: shapes.circle, svg: shapes.circle,
}, },
greenDamage: { greenPower: {
stat: 'green_damage', stat: 'green_power',
colour: 'green', colour: 'green',
svg: shapes.circle, svg: shapes.circle,
}, },
blueDamage: { bluePower: {
stat: 'blue_damage', stat: 'blue_power',
colour: 'blue', colour: 'blue',
svg: shapes.circle, svg: shapes.circle,
}, },
@ -193,45 +193,45 @@ const SPECS = {
svg: shapes.square svg: shapes.square
}, },
Damage: { Power: {
colour: 'white', colour: 'white',
caption: 'Damage', caption: 'Power',
thresholds: [], thresholds: [],
svg: shapes.circle svg: shapes.circle
}, },
RedDamageI: { RedPowerI: {
colour: 'red', colour: 'red',
caption: 'DamageI', caption: 'PowerI',
thresholds: [5, 10, 20], thresholds: [5, 10, 20],
svg: shapes.circle svg: shapes.circle
}, },
BlueDamageI: { BluePowerI: {
colour: 'blue', colour: 'blue',
caption: 'DamageI', caption: 'PowerI',
thresholds: [5, 10, 20], thresholds: [5, 10, 20],
svg: shapes.circle svg: shapes.circle
}, },
GreenDamageI: { GreenPowerI: {
colour: 'green', colour: 'green',
caption: 'DamageI', caption: 'PowerI',
thresholds: [5, 10, 20], thresholds: [5, 10, 20],
svg: shapes.circle, svg: shapes.circle,
}, },
GRDI: { GRDI: {
colour: 'yellow', colour: 'yellow',
caption: 'DamageI', caption: 'PowerI',
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
svg: shapes.circle svg: shapes.circle
}, },
GBDI: { GBDI: {
colour: 'cyan', colour: 'cyan',
caption: 'DamageI', caption: 'PowerI',
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
svg: shapes.circle, svg: shapes.circle,
}, },
RBDI: { RBDI: {
colour: 'purple', colour: 'purple',
caption: 'DamageI', caption: 'PowerI',
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
svg: shapes.circle, svg: shapes.circle,
}, },
@ -445,7 +445,7 @@ function getCombatSequence(event) {
&& (['Ruin', 'Taunt', 'Strangling', 'Parry'].includes(event[1].skill) && (['Ruin', 'Taunt', 'Strangling', 'Parry'].includes(event[1].skill)
|| (event[1].skill === 'Decay' && event[1].effect === 'Wither'))) return ['POST_SKILL']; || (event[1].skill === 'Decay' && event[1].effect === 'Wither'))) return ['POST_SKILL'];
if (['Damage'].includes(event[0]) if (['Power'].includes(event[0])
&& ((event[1].skill === 'Chaos' && event[1].colour === 'Red') && ((event[1].skill === 'Chaos' && event[1].colour === 'Red')
|| event[1].skill === 'Silence' || event[1].skill === 'Silence'
|| event[1].skill === 'Snare')) return ['POST_SKILL']; || event[1].skill === 'Snare')) return ['POST_SKILL'];

1
ops/migrations/20180916221309_constructs_table.js
View File

@ -1,6 +1,7 @@
exports.up = async knex => { exports.up = async knex => {
return knex.schema.createTable('constructs', table => { return knex.schema.createTable('constructs', table => {
table.uuid('id').primary(); table.uuid('id').primary();
table.timestamps(true, true);
table.uuid('account').notNullable() table.uuid('account').notNullable()
table.foreign('account') table.foreign('account')
.references('id') .references('id')

3
server/src/account.rs
View File

@ -178,7 +178,8 @@ pub fn account_constructs(tx: &mut Transaction, account: &Account) -> Result<Vec
// catch any errors // catch any errors
if constructs.is_err() { if constructs.is_err() {
return Err(err_msg("could not deserialize a construct")); warn!("{:?}", constructs);
return Err(err_msg("could not deserialise a construct"));
} }
let mut constructs = constructs.unwrap(); let mut constructs = constructs.unwrap();