diff --git a/VERSION b/VERSION
index 69669de6..c56eaaaf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.12.2
\ No newline at end of file
+1.12.3
\ No newline at end of file
diff --git a/acp/package.json b/acp/package.json
index cb7abeda..c072126b 100644
--- a/acp/package.json
+++ b/acp/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-client",
- "version": "1.12.2",
+ "version": "1.12.3",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less
index 1746abea..e7bfac87 100644
--- a/client/assets/styles/game.less
+++ b/client/assets/styles/game.less
@@ -85,6 +85,10 @@
.effects {
align-self: flex-start;
}
+
+ &.highlight {
+ animation: highlight 1s infinite alternate;
+ }
}
.game-construct .name {
@@ -93,6 +97,15 @@
}
}
+@keyframes highlight {
+ from {
+ background: @black;
+ }
+ to {
+ background: @silver;
+ }
+}
+
.game-construct {
display: grid;
diff --git a/client/package.json b/client/package.json
index 977344f7..25380772 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-client",
- "version": "1.12.2",
+ "version": "1.12.3",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/client/src/components/game.construct.jsx b/client/src/components/game.construct.jsx
index a5c163c2..f3980794 100644
--- a/client/src/components/game.construct.jsx
+++ b/client/src/components/game.construct.jsx
@@ -15,6 +15,7 @@ const addState = connect(
ws,
game,
+ authenticated,
activeSkill,
animFocus,
resolution,
@@ -28,6 +29,8 @@ const addState = connect(
}
return {
+ game,
+ authenticated,
activeSkill,
animFocus,
resolution,
@@ -51,6 +54,8 @@ class GameConstruct extends preact.Component {
render() {
const {
// Changing state variables
+ authenticated,
+ game,
activeSkill,
animFocus,
resolution,
@@ -75,16 +80,18 @@ class GameConstruct extends preact.Component {
const unfocus = animFocus && !animFocus.includes(construct.id) ? 'unfocus' : '';
+ const targeted = game.stack.find(c => c.target === construct.id);
+ const highlight = !authenticated && !targeted && activeSkill ? 'highlight' : '';
+
const crypSkills = player
?
{range(0, 3).map(j => )}
: ;
-
return (
selectSkillTarget(construct.id)}
style={ activeSkill ? { cursor: 'pointer' } : {}}
- class={`game-construct ${ko} ${koEvent()} ${unfocus}`}>
+ class={`game-construct ${ko} ${koEvent()} ${unfocus} ${highlight}`}>
{crypSkills}
diff --git a/client/src/components/game.ctrl.btns.jsx b/client/src/components/game.ctrl.btns.jsx
index 9b898345..a374ae80 100644
--- a/client/src/components/game.ctrl.btns.jsx
+++ b/client/src/components/game.ctrl.btns.jsx
@@ -86,7 +86,9 @@ function GameCtrlBtns(args) {
quit();
}
- const readyBtn = ;
+ const noTargets = !authenticated && game.stack.length === 0;
+
+ const readyBtn = ;
const quitBtn = ;
return (
diff --git a/client/src/components/play.jsx b/client/src/components/play.jsx
index 1450a2df..2b32af8a 100644
--- a/client/src/components/play.jsx
+++ b/client/src/components/play.jsx
@@ -95,7 +95,7 @@ function Play(args) {
type="submit">
Invite
- Play against friend
+ Play against a friend
);
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 4f9ed720..7c9f9cf5 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mnml_core"
-version = "1.12.2"
+version = "1.12.3"
authors = ["ntr ", "mashy "]
[dependencies]
diff --git a/ops/package.json b/ops/package.json
index d1d30272..9b864f9a 100644
--- a/ops/package.json
+++ b/ops/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-ops",
- "version": "1.12.2",
+ "version": "1.12.3",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 76a849df..7abd8ee8 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mnml"
-version = "1.12.2"
+version = "1.12.3"
authors = ["ntr "]
[dependencies]
diff --git a/server/src/img.rs b/server/src/img.rs
index ef14b0ec..3708b067 100644
--- a/server/src/img.rs
+++ b/server/src/img.rs
@@ -105,7 +105,6 @@ pub fn shapes_write(id: Uuid) -> Result {
let shape_dist = WeightedIndex::new(shapes.iter().map(|v| v.1))?;
let n_shapes_items = [
- (1, 1),
(2, 2),
(3, 5),
(4, 10),
@@ -113,10 +112,10 @@ pub fn shapes_write(id: Uuid) -> Result {
];
let num_dist = WeightedIndex::new(n_shapes_items.iter().map(|v| v.1))?;
let n_shapes = num_dist.sample(&mut rng) as usize;
+ let h = rng.gen_range(0, 360);
write!(&mut svg, "