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 className="stats">
<div className="damage-label label">
Damage
Power
</div>
<div className="speed-label label">
Speed

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

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

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

@ -22,9 +22,9 @@ function testInstance(uuid) {
"Block"
],
[
"Damage",
"Power",
"Life",
"Damage",
"Power",
"Speed"
]
],
@ -308,7 +308,7 @@ function testInstance(uuid) {
"Attack"
],
[
"Damage",
"Power",
"Speed",
"Life"
]
@ -886,7 +886,7 @@ function testInstance(uuid) {
],
[
"Speed",
"Damage",
"Power",
"Speed",
"Speed"
]
@ -1174,7 +1174,7 @@ function testInstance(uuid) {
"Debuff"
],
[
"Damage",
"Power",
"Life",
"Speed",
"Speed"
@ -1466,7 +1466,7 @@ function testInstance(uuid) {
"Speed",
"Speed",
"Speed",
"Damage"
"Power"
]
],
"bound": []
@ -1754,7 +1754,7 @@ function testInstance(uuid) {
[
"Life",
"Speed",
"Damage",
"Power",
"Life"
]
],
@ -2044,7 +2044,7 @@ function testInstance(uuid) {
"Speed",
"Life",
"Speed",
"Damage"
"Power"
]
],
"bound": []
@ -2622,7 +2622,7 @@ function testInstance(uuid) {
"Life",
"Speed",
"Speed",
"Damage"
"Power"
]
],
"bound": []
@ -2908,10 +2908,10 @@ function testInstance(uuid) {
"Stun"
],
[
"Damage",
"Damage",
"Power",
"Power",
"Speed",
"Damage"
"Power"
]
],
"bound": []
@ -3197,10 +3197,10 @@ function testInstance(uuid) {
"Stun"
],
[
"Damage",
"Power",
"Speed",
"Damage",
"Damage"
"Power",
"Power"
]
],
"bound": []
@ -3486,9 +3486,9 @@ function testInstance(uuid) {
"Buff"
],
[
"Damage",
"Power",
"Speed",
"Damage",
"Power",
"Life"
]
],
@ -4348,9 +4348,9 @@ function testInstance(uuid) {
[
"Life",
"Speed",
"Damage",
"Power",
"Speed",
"Damage",
"Power",
"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 STATS = {
redDamage: {
stat: 'red_damage',
redPower: {
stat: 'red_power',
colour: 'red',
svg: shapes.circle,
},
greenDamage: {
stat: 'green_damage',
greenPower: {
stat: 'green_power',
colour: 'green',
svg: shapes.circle,
},
blueDamage: {
stat: 'blue_damage',
bluePower: {
stat: 'blue_power',
colour: 'blue',
svg: shapes.circle,
},
@ -193,45 +193,45 @@ const SPECS = {
svg: shapes.square
},
Damage: {
Power: {
colour: 'white',
caption: 'Damage',
caption: 'Power',
thresholds: [],
svg: shapes.circle
},
RedDamageI: {
RedPowerI: {
colour: 'red',
caption: 'DamageI',
caption: 'PowerI',
thresholds: [5, 10, 20],
svg: shapes.circle
},
BlueDamageI: {
BluePowerI: {
colour: 'blue',
caption: 'DamageI',
caption: 'PowerI',
thresholds: [5, 10, 20],
svg: shapes.circle
},
GreenDamageI: {
GreenPowerI: {
colour: 'green',
caption: 'DamageI',
caption: 'PowerI',
thresholds: [5, 10, 20],
svg: shapes.circle,
},
GRDI: {
colour: 'yellow',
caption: 'DamageI',
caption: 'PowerI',
thresholds: [2, 5, 10],
svg: shapes.circle
},
GBDI: {
colour: 'cyan',
caption: 'DamageI',
caption: 'PowerI',
thresholds: [2, 5, 10],
svg: shapes.circle,
},
RBDI: {
colour: 'purple',
caption: 'DamageI',
caption: 'PowerI',
thresholds: [2, 5, 10],
svg: shapes.circle,
},
@ -445,7 +445,7 @@ function getCombatSequence(event) {
&& (['Ruin', 'Taunt', 'Strangling', 'Parry'].includes(event[1].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 === 'Silence'
|| event[1].skill === 'Snare')) return ['POST_SKILL'];

1
ops/migrations/20180916221309_constructs_table.js
View File

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