Join our Discord server to find opponents and talk to the devs.
diff --git a/client/src/components/reshape.jsx b/client/src/components/reshape.jsx
index 835f4a8e..2bfb4b11 100644
--- a/client/src/components/reshape.jsx
+++ b/client/src/components/reshape.jsx
@@ -89,6 +89,7 @@ function Reshape(args) {
return (
setMtxActive(null)}>
+
Customise your Constructs
Use credits to modify your construct names and appearance.
@@ -106,19 +107,19 @@ function Reshape(args) {
¤ {account.balance}
- {subscription}
-
setNav('shop')}
- class="yellow-btn"
- role="link">
- Get Credits
-
-
-
-
+ {subscription}
+
+ setNav('shop')}
+ class="yellow-btn"
+ role="link">
+ Get Credits
+
+
{shop.owned.map(useMtx)}
{shop.available.map(availableMtx)}
+
);
diff --git a/client/src/components/shop.jsx b/client/src/components/shop.jsx
index 7e23bc60..ca7121c8 100644
--- a/client/src/components/shop.jsx
+++ b/client/src/components/shop.jsx
@@ -27,7 +27,7 @@ function Shop(args) {
return (
-
Support the game
+
Support MNML
Credits are in game currency used to change your team appearance:
diff --git a/client/src/components/vbox.info.jsx b/client/src/components/vbox.info.jsx
index d2eddbec..126780be 100644
--- a/client/src/components/vbox.info.jsx
+++ b/client/src/components/vbox.info.jsx
@@ -5,8 +5,8 @@ const { tutorialStage } = require('../tutorial.utils');
const { genItemInfo } = require('./vbox.utils');
const addState = connect(
- ({ info, player, tutorial, vboxInfo, itemInfo, instance, comboPreview }) => ({
- info, player, tutorial, vboxInfo, itemInfo, instance, comboPreview,
+ ({ info, player, tutorial, vboxInfo, itemInfo, instance, comboPreview, authenticated }) => ({
+ info, player, tutorial, vboxInfo, itemInfo, instance, comboPreview, authenticated
}));
@@ -35,12 +35,13 @@ class Info extends preact.Component {
itemInfo,
instance,
comboPreview,
+ authenticated,
} = props;
// dispaly priority
// tutorial -> comboPreview -> vboxInfo -> info
if (tutorial) {
- const tutorialStageInfo = tutorialStage(tutorial, clearTutorial, instance);
+ const tutorialStageInfo = tutorialStage(authenticated, tutorial, clearTutorial, instance);
if (tutorialStageInfo) return tutorialStageInfo;
}
if (comboPreview) return genItemInfo(comboPreview, itemInfo, player);
diff --git a/client/src/events.jsx b/client/src/events.jsx
index e5d3a92b..ce566608 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -116,7 +116,6 @@ function registerEvents(store) {
}
store.dispatch(actions.setAccount(account));
- store.dispatch(actions.setTutorial(null));
store.dispatch(actions.setAuthenticated(true));
}
@@ -181,7 +180,7 @@ function registerEvents(store) {
setPvp(false);
const player = v.players.find(p => p.id === account.id);
store.dispatch(actions.setPlayer(player));
-
+
if (tutorial) tutorialVbox(player, store, tutorial);
if (v.phase === 'Finished') {
@@ -189,7 +188,6 @@ function registerEvents(store) {
}
}
-
return store.dispatch(actions.setInstance(v));
}
diff --git a/client/src/tutorial.utils.jsx b/client/src/tutorial.utils.jsx
index e8bc0578..410b7cf7 100644
--- a/client/src/tutorial.utils.jsx
+++ b/client/src/tutorial.utils.jsx
@@ -106,7 +106,7 @@ function tutorialVbox(player, store, tutorial) {
store.dispatch(actions.setTutorial(stage));
}
-function tutorialStage(tutorial, clearTutorial, instance) {
+function tutorialStage(authenticated, tutorial, clearTutorial, instance) {
if (!(instance.time_control === 'Practice' && instance.rounds.length === 1)) return false;
const exit = () => clearTutorial();
@@ -118,6 +118,7 @@ function tutorialStage(tutorial, clearTutorial, instance) {
Welcome to MNML
This is the VBOX Phase where you customise your team.
Buy the two colours from the store to continue.
+ PRO TIP: While selecting an item in the shop, click the stash to buy it.
Combining Items
You start the game with the Attack base skill item.
Create powerful combinations by combining colours with base items.
- Select all three items to combine .
+ Select all three items to combine .
GLHF
@@ -209,6 +209,7 @@ function tutorialStage(tutorial, clearTutorial, instance) {
);
}
+
return false;
};
@@ -219,11 +220,18 @@ function tutorialStage(tutorial, clearTutorial, instance) {
onMouseDown={exit}> Continue
: null;
+ const skipTutorial = authenticated && !exitTutorial ?
+ e.stopPropagation()}
+ onMouseDown={exit}> Skip Tutorial
+ : null;
+
return (
{tutorialText()}
{exitTutorial}
+ {skipTutorial}
);
}
diff --git a/core/Cargo.toml b/core/Cargo.toml
index febac315..4f9ed720 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mnml_core"
-version = "1.12.1"
+version = "1.12.2"
authors = ["ntr ", "mashy "]
[dependencies]
diff --git a/core/src/construct.rs b/core/src/construct.rs
index 16b13c63..16572a8b 100644
--- a/core/src/construct.rs
+++ b/core/src/construct.rs
@@ -911,7 +911,7 @@ impl Construct {
construct: self.id,
amount: healing,
overhealing,
- colour: Colour::Red,
+ colour: Colour::Blue,
display: EventConstruct::new(self),
});
}
@@ -933,7 +933,7 @@ impl Construct {
construct: self.id,
amount: blue_damage_amount,
mitigation: blue_mitigation,
- colour: Colour::Red,
+ colour: Colour::Blue,
display: EventConstruct::new(self),
});
}
diff --git a/core/src/skill.rs b/core/src/skill.rs
index f26729a5..765b6930 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -2082,7 +2082,7 @@ impl Purify {
fn purify(cast: Cast, game: &mut Game, values: Purify) {
let gp = game.value(Value::Stat { construct: cast.source, stat: Stat::GreenPower });
- let rms = game.value(Value::Removals { construct: cast.target });
+ let rms = game.value(Value::Effects { construct: cast.target });
let amount = gp.pct(values.green_heal_base().saturating_mul(rms));
game.action(cast,
diff --git a/ops/package.json b/ops/package.json
index 01e81dc9..d1d30272 100644
--- a/ops/package.json
+++ b/ops/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-ops",
- "version": "1.12.1",
+ "version": "1.12.2",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index a89622ea..76a849df 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mnml"
-version = "1.12.1"
+version = "1.12.2"
authors = ["ntr "]
[dependencies]
diff --git a/server/src/account.rs b/server/src/account.rs
index 110f1ce5..14812bcc 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -530,3 +530,24 @@ pub fn img_check(account: &Account) -> Result {
}
}
+pub fn _tutorial(tx: &mut Transaction, account: &Account) -> Result, Error> {
+ let query = "
+ SELECT count(id)
+ FROM players
+ WHERE account = $1;
+ ";
+
+ let result = tx
+ .query(query, &[&account.id])?;
+
+ let row = result.iter().next()
+ .ok_or(format_err!("unable to fetch joined games account={:?}", account))?;
+
+ let count: i64 = row.get(0);
+
+ if count == 0 {
+ return Ok(Some(instance_practice(tx, account)?));
+ }
+
+ return Ok(None);
+}
\ No newline at end of file
diff --git a/server/src/http.rs b/server/src/http.rs
index 34b3b994..bb0d443d 100644
--- a/server/src/http.rs
+++ b/server/src/http.rs
@@ -25,7 +25,7 @@ use payments::{stripe};
pub const TOKEN_HEADER: &str = "x-auth-token";
pub const AUTH_CLEAR: &str =
- "x-auth-token=; HttpOnly; SameSite=Strict; Path=/; Max-Age=-1;";
+ "x-auth-token=; HttpOnly; SameSite=None; Path=/; Max-Age=-1;";
#[derive(Clone, Copy, Fail, Debug, Serialize, Deserialize)]
pub enum MnmlHttpError {
@@ -191,7 +191,7 @@ impl AfterMiddleware for ErrorHandler {
fn token_res(token: String) -> Response {
let v = Cookie::build(TOKEN_HEADER, token)
.http_only(true)
- .same_site(SameSite::Strict)
+ .same_site(SameSite::None)
.path("/")
.max_age(Duration::weeks(1)) // 1 week aligns with db set
.finish();
@@ -354,7 +354,7 @@ fn recover(req: &mut Request) -> IronResult {
let v = Cookie::build(TOKEN_HEADER, token)
.http_only(true)
- .same_site(SameSite::Strict)
+ .same_site(SameSite::None)
.path("/")
.max_age(Duration::weeks(1)) // 1 week aligns with db set
.finish();
diff --git a/server/src/mail.rs b/server/src/mail.rs
index 8f3b351f..0322d31c 100644
--- a/server/src/mail.rs
+++ b/server/src/mail.rs
@@ -232,6 +232,12 @@ pub fn set(tx: &mut Transaction, account: Uuid, email: &String) -> Result<(Uuid,
RETURNING id;
";
+ let select_query = "
+ SELECT *
+ FROM emails
+ WHERE account = $1;
+ ";
+
let update_query = "
UPDATE emails
SET email = $1, confirm_token = $2, confirmed = false, recover_token = $3
@@ -239,18 +245,11 @@ pub fn set(tx: &mut Transaction, account: Uuid, email: &String) -> Result<(Uuid,
RETURNING id;
";
- let result = match tx.query(insert_query, &[&id, &account, &email, &confirm_token, &recover_token]) {
- Ok(r) => r,
- // email update probably
- Err(_) => {
- match tx.query(update_query, &[&email, &confirm_token, &recover_token, &account]) {
- Ok(r) => r,
- Err(e) => {
- warn!("{:?}", e);
- return Err(err_msg("no email set"));
- },
- }
- }
+ let existing = tx.query(select_query, &[&id])?;
+
+ let result = match existing.iter().next() {
+ Some(_) => tx.query(insert_query, &[&id, &account, &email, &confirm_token, &recover_token])?,
+ None => tx.query(update_query, &[&email, &confirm_token, &recover_token, &account])?,
};
match result.iter().next() {
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index 2eca2452..39710fe1 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -128,6 +128,7 @@ pub enum RpcRequest {
pub trait User {
fn receive(&mut self, data: Vec, stripe: &StripeClient) -> Result;
fn connected(&mut self) -> Result<(), Error>;
+ fn disconnected(&self) -> Result<(), Error>;
fn send(&mut self, msg: RpcMessage) -> Result<(), Error>;
}
@@ -170,8 +171,8 @@ impl Handler for Connection {
}
fn on_close(&mut self, _: CloseCode, _: &str) {
- info!("websocket disconnected id={:?}", self.id);
self.events.send(Event::Disconnect(self.id)).unwrap();
+ self.user.disconnected().unwrap();
}
fn on_request(&mut self, req: &Request) -> ws::Result {
@@ -198,7 +199,10 @@ impl Handler for Connection {
if cookie.name() == TOKEN_HEADER {
let db = self.pool.get().unwrap();
match account::from_token(&db, &cookie.value().to_string()) {
- Ok(a) => self.user = Box::new(Authenticated::new(a, self.ws.clone(), self.events.clone(), self.pool.clone())),
+ Ok(a) => {
+ self.id = a.id;
+ self.user = Box::new(Authenticated::new(a, self.ws.clone(), self.events.clone(), self.pool.clone()));
+ },
Err(_) => return unauth(),
}
}
diff --git a/server/src/user_anonymous.rs b/server/src/user_anonymous.rs
index be39a052..fe1d9045 100644
--- a/server/src/user_anonymous.rs
+++ b/server/src/user_anonymous.rs
@@ -74,6 +74,10 @@ impl User for Anonymous {
Ok(())
}
+ fn disconnected(&self) -> Result<(), Error> {
+ Ok(())
+ }
+
fn receive(&mut self, data: Vec, _stripe: &StripeClient) -> Result {
match from_slice::(&data) {
Ok(v) => {
diff --git a/server/src/user_authenticated.rs b/server/src/user_authenticated.rs
index 6949fe0c..eb617178 100644
--- a/server/src/user_authenticated.rs
+++ b/server/src/user_authenticated.rs
@@ -128,12 +128,21 @@ impl User for Authenticated {
let wheel = account::chat_wheel(&db, a.id)?;
self.ws.send(RpcMessage::ChatWheel(wheel))?;
+ // if let Some(instance) = account::tutorial(&mut tx, &a)? {
+ // self.ws.send(RpcMessage::InstanceState(instance))?;
+ // }
+
// tx should do nothing
tx.commit()?;
Ok(())
}
+ fn disconnected(&self) -> Result<(), Error> {
+ info!("user disconnected account={:?}", self.account);
+ Ok(())
+ }
+
fn receive(&mut self, data: Vec, stripe: &StripeClient) -> Result {
// cast the msg to this type to receive method name
let begin = Instant::now();
diff --git a/studios/package.json b/studios/package.json
index 08c5353e..93382d32 100644
--- a/studios/package.json
+++ b/studios/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-studios",
- "version": "1.12.1",
+ "version": "1.12.2",
"description": "",
"main": "index.js",
"scripts": {