-
mnml is an abstract turn based strategy game
-
free to play
-
no email required
-
glhf
+
);
}
diff --git a/client/src/components/welcome.register.jsx b/client/src/components/welcome.register.jsx
index 7051a8ce..899c8ef6 100644
--- a/client/src/components/welcome.register.jsx
+++ b/client/src/components/welcome.register.jsx
@@ -12,8 +12,8 @@ const addState = connect(
ws
} = state;
- function submitRegister(name, password, code) {
- postData('/account/register', { name, password, code })
+ function submitRegister(name, password) {
+ postData('/account/register', { name, password })
.then(res => res.json())
.then(data => {
if (data.error) return errorToast(data.error);
@@ -34,12 +34,11 @@ function Register(args) {
submitRegister,
} = args;
- const { password, confirm, name, code } = this.state;
+ const { password, confirm, name } = this.state;
const registerSubmit = (event) => {
event.preventDefault();
- submitRegister(name, password, code);
- // this.setState({ name: '', password: '', confirm: '', code: ''});
+ submitRegister(name, password);
}
const registerConfirm = () =>
@@ -75,14 +74,6 @@ function Register(args) {
value={this.state.confirm}
onInput={linkState(this, 'confirm')}
/>
-
Access Code
-
ITEMS that are available to buy.VBOX is refilled every round.REFILL at the bottom to purchase a refill. ,
},
inventory: {
item: 'INVENTORY',
- description: 'Holds purchased ITEMS.\nClick to add ITEM to I-COMBINATOR.',
- },
- combiner: {
- item: 'I-COMBINATOR',
- description: 'Combines purchased ITEMS into more powerful variants. Hover over an ITEM to see recipes.',
+ description: holds ITEMS ITEMS carry over each round.
,
},
bits: {
item: 'BITS',
@@ -51,12 +49,12 @@ module.exports = {
description: 'Reclaim ITEMS for half the purchase cost of their combined ITEMS.\nClick to enable and click ITEM to reclaim.',
},
refine: {
- item: 'REFINE',
- description: 'Refine ITEMS currently in I-COMBINATOR into more powerful variants',
+ item: 'COMBINE',
+ description: combine the selected items.RECIPES .
,
},
refill: {
item: 'REFILL',
- description: 'Refill the VBOX with new ITEMS.',
+ description: 'Refill the VBOX with new items.',
},
equipSkills: {
item: 'QUICK ACCESS - SKILLS',
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 1c01bd53..f2e5d498 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -1,4 +1,5 @@
const eachSeries = require('async/eachSeries');
+const sample = require('lodash/sample');
const actions = require('./actions');
const { TIMES } = require('./constants');
@@ -187,6 +188,53 @@ function registerEvents(store) {
return store.dispatch(actions.setItemInfo(v));
}
+ function setDemo(d) {
+ const initial = {
+ players: d,
+ combiner: [],
+ items: ['Red', 'Red', 'Attack'],
+ equipped: false,
+ equipping: false,
+ };
+
+ const startDemo = () => {
+ console.log(initial);
+ store.dispatch(actions.setDemo(initial));
+ store.dispatch(actions.setAnimTarget(null));
+ setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0] }))), 2000);
+ setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0, 1] }))), 4000);
+ setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0, 1, 2] }))), 6000);
+ setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [], items: ['Strike', '', ''] }))), 8000);
+ setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0], items: ['Strike', '', ''], equipping: true }))), 10000);
+ setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [], items: ['', '', ''], equipped: true, equipping: false }))), 12000);
+ setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { items: ['', '', ''], equipped: true, equipping: false }))), 12000);
+
+ setTimeout(() => {
+ const { itemInfo } = store.getState();
+ return store.dispatch(actions.setAnimTarget({
+ skill: sample(itemInfo.items.filter(i => i.skill)).item,
+ constructId: d[1].constructs[0].id,
+ player: false,
+ direction: 0,
+ }));
+ }, 14000);
+
+ setTimeout(() => {
+ const { itemInfo } = store.getState();
+ return store.dispatch(actions.setAnimTarget({
+ skill: sample(itemInfo.items.filter(i => i.skill)).item,
+ constructId: d[1].constructs[1].id,
+ player: true,
+ direction: 0,
+ }));
+ }, 16000);
+
+ setTimeout(startDemo, 20000);
+ };
+
+ startDemo();
+ }
+
// events.on('SET_PLAYER', setInstance);
// events.on('SEND_SKILL', function skillActive(gameId, constructId, targetConstructId, skill) {
@@ -230,6 +278,7 @@ function registerEvents(store) {
setAccountInstances,
setActiveItem,
setActiveSkill,
+ setDemo,
setConstructList,
setNewConstruct,
setGame,
diff --git a/client/src/reducers.jsx b/client/src/reducers.jsx
index 496a5acc..cfc6dad5 100644
--- a/client/src/reducers.jsx
+++ b/client/src/reducers.jsx
@@ -23,6 +23,8 @@ module.exports = {
animTarget: createReducer(null, 'SET_ANIM_TARGET'),
animText: createReducer(null, 'SET_ANIM_TEXT'),
+ demo: createReducer(null, 'SET_DEMO'),
+
combiner: createReducer([], 'SET_COMBINER'),
constructs: createReducer([], 'SET_CONSTRUCTS'),
constructEditId: createReducer(null, 'SET_CONSTRUCT_EDIT_ID'),
diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index 4ac30163..a6a97162 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -206,6 +206,10 @@ function createSocket(events) {
events.setItemInfo(info);
}
+ function onDemo(v) {
+ events.setDemo(v);
+ }
+
let pongTimeout;
function onPong() {
events.setPing(Date.now() - ping);
@@ -231,6 +235,7 @@ function createSocket(events) {
InstanceState: onInstanceState,
ItemInfo: onItemInfo,
Pong: onPong,
+ Demo: onDemo,
QueueRequested: () => events.notify('pvp queue request received'),
QueueJoined: () => events.notify('you have joined the pvp queue'),
diff --git a/server/src/account.rs b/server/src/account.rs
index db90e6a6..5eaeafd4 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -288,15 +288,11 @@ pub fn set_subscribed(tx: &mut Transaction, id: Uuid, subscribed: bool) -> Resul
Ok(name)
}
-pub fn create(name: &String, password: &String, code: &String, tx: &mut Transaction) -> Result {
+pub fn create(name: &String, password: &String, tx: &mut Transaction) -> Result {
if password.len() < PASSWORD_MIN_LEN {
return Err(MnmlHttpError::PasswordUnacceptable);
}
- if code.to_lowercase() != "grep842" {
- return Err(MnmlHttpError::InvalidCode);
- }
-
if name.len() == 0 {
return Err(MnmlHttpError::AccountNameNotProvided);
}
diff --git a/server/src/http.rs b/server/src/http.rs
index c7475ee7..068234f3 100644
--- a/server/src/http.rs
+++ b/server/src/http.rs
@@ -52,8 +52,6 @@ pub enum MnmlHttpError {
PasswordUnacceptable,
#[fail(display="incorrect token. refresh or logout of existing sessions")]
TokenDoesNotMatch,
- #[fail(display="invalid code. https://discord.gg/YJJgurM")]
- InvalidCode,
}
impl From for MnmlHttpError {
@@ -129,7 +127,6 @@ impl From for IronError {
MnmlHttpError::PasswordUnacceptable => (m_err.compat(), status::BadRequest),
MnmlHttpError::PasswordNotMatch |
- MnmlHttpError::InvalidCode |
MnmlHttpError::TokenDoesNotMatch |
MnmlHttpError::Unauthorized => (m_err.compat(), status::Unauthorized),
@@ -211,7 +208,6 @@ fn token_res(token: String) -> Response {
struct RegisterBody {
name: String,
password: String,
- code: String,
}
fn register(req: &mut Request) -> IronResult {
@@ -224,7 +220,7 @@ fn register(req: &mut Request) -> IronResult {
let db = state.pool.get().or(Err(MnmlHttpError::DbError))?;
let mut tx = db.transaction().or(Err(MnmlHttpError::DbError))?;
- match account::create(¶ms.name, ¶ms.password, ¶ms.code, &mut tx) {
+ match account::create(¶ms.name, ¶ms.password, &mut tx) {
Ok(token) => {
tx.commit().or(Err(MnmlHttpError::ServerError))?;
Ok(token_res(token))
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 9abf3aca..489f6fe2 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -797,6 +797,25 @@ pub fn instance_game_finished(tx: &mut Transaction, game: &Game, instance_id: Uu
Ok(())
}
+pub fn demo() -> Result, Error> {
+ let bot = bot_player();
+
+ // generate bot imgs for the client to see
+ for c in bot.constructs.iter() {
+ img::molecular_write(c.img)?;
+ };
+
+ let bot2 = bot_player();
+
+ // generate bot imgs for the client to see
+ for c in bot2.constructs.iter() {
+ img::molecular_write(c.img)?;
+ };
+
+
+ Ok(vec![bot, bot2])
+}
+
#[cfg(test)]
mod tests {
use super::*;
diff --git a/server/src/mob.rs b/server/src/mob.rs
index 6bb6aaf1..2cab954b 100644
--- a/server/src/mob.rs
+++ b/server/src/mob.rs
@@ -27,3 +27,4 @@ pub fn bot_player() -> Player {
let constructs = instance_mobs(bot_id);
Player::new(bot_id, &name(), constructs).set_bot(true)
}
+
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index 09b9cdfd..4f73e17f 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -21,10 +21,12 @@ use account;
use construct::{Construct};
use events::{Event};
use game::{Game, game_state, game_skill, game_skill_clear, game_ready};
-use instance::{Instance, instance_state, instance_practice, instance_ready, instance_abandon};
+use instance::{Instance, instance_state, instance_practice, instance_ready, instance_abandon, demo};
use item::{Item, ItemInfoCtr, item_info};
use mtx;
use mail;
+
+use player::{Player};
use payments;
use mail::Email;
use pg::{Db};
@@ -41,6 +43,8 @@ pub enum RpcMessage {
AccountInstances(Vec),
AccountShop(mtx::Shop),
+ Demo(Vec),
+
ConstructSpawn(Construct),
GameState(Game),
ItemInfo(ItemInfoCtr),
@@ -271,6 +275,8 @@ impl Handler for Connection {
// tx should do nothing
tx.commit().unwrap();
+ } else {
+ self.ws.send(RpcMessage::Demo(demo().unwrap())).unwrap();
}
Ok(())