diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index 6e86b3ee..7c72e07c 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -215,7 +215,7 @@ function Construct(props) {
- Damage
+ Power
Speed
diff --git a/client/src/test.game.js b/client/src/test.game.js
index a6ddc397..a19f2182 100644
--- a/client/src/test.game.js
+++ b/client/src/test.game.js
@@ -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",
diff --git a/client/src/test.instance.js b/client/src/test.instance.js
index 58a088e1..3c857ed9 100644
--- a/client/src/test.instance.js
+++ b/client/src/test.instance.js
@@ -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"
]
],
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index 9407e47a..a044b2bf 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -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'];
diff --git a/ops/migrations/20180916221309_constructs_table.js b/ops/migrations/20180916221309_constructs_table.js
index 4f43203e..740f51d2 100755
--- a/ops/migrations/20180916221309_constructs_table.js
+++ b/ops/migrations/20180916221309_constructs_table.js
@@ -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')
diff --git a/server/src/account.rs b/server/src/account.rs
index 0fe7655b..765efe11 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -178,7 +178,8 @@ pub fn account_constructs(tx: &mut Transaction, account: &Account) -> Result