ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.3.2'

Browse Source
This commit is contained in:
ntr 2019-09-08 14:51:04 +10:00
commit cc2606248d
16 changed files with 96 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
README.md
View File

@ -1,33 +1,12 @@
# Constructs ("creeps")
# mnml
mnml is a turn-based 1v1 strategy game in an abstract setting.
players craft a team of 3 constructs combining a deep pool of skills, effects and specialisations to mindgame & outplay their opponents in a rapid series of duels.
featuring complex interactions arising from simple rules, simultaneous turns to increase the pace, and a unique speed mechanic mnml is a tactical game in a genre of its own.
it is completely free to play and requires no installation.
## Combat
skill phase:
1.1 -> block (sp 10) -> on self
1.2 -> attack (sp 5) -> on player 2
2.1 -> hex (sp 3) -> on player 1
2.2 -> attack (sp 5) -> on player 1
target phase:
player 2 targets 1.2 on 2.2
player 1 targets 2.1 on 1.1
player 1 targets 2.2 on 1.1
resolve phase:
1.1 <- block
1.1 <- attack (no effect because of block)
2.2 <- attack (normal resolve)
1.1 <- hexed (no skills for the rest of this turn and next)
## Damage Chart
| Red | Magic | Modifiers |
| ------ | ------ | ------ |
| damage | damage | speed |
| evasion | resistance | cooldowns |
| reduction | absorption? | durations |
minimal studios is ntr & mashy: 2 mates with a friendship forged in the fires of warcraft 3 dota.
we have both bailed out of the big city life and have dedicated ourselves to growing farm fresh, organic, ethical gaming produce in the rolling hills of brisbane and leaves of melbourne.
completely self funded, we're just here to make games that feel good & play it clean.
## Construct Alignments

2
VERSION
View File

@ -1 +1 @@
1.3.0
1.3.2

8
WORKLOG.md
View File

@ -17,16 +17,14 @@
* bot game grind
* stress test
* msg pane
* game invites
* change score to enum
* pct based translates for combat animation
* make our own toasts / msg pane
* send account_instances on players update
* pct based translates for combat animation
* add speed to descriptions
* clear skill (if currently targetted)
* only login / logout / register http
## SOON
*SERVER*
* modules

2
acp/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.3.0",
"version": "1.3.2",
"description": "",
"main": "index.js",
"scripts": {

25
client/assets/styles/account.less
View File

@ -1,18 +1,19 @@
@import 'colours.less';
.account {
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-gap: 0 1em;
div {
padding-right: 2em;
}
button {
width: 100%;
display: block;
// height: 3em;
width: 75%;
}
input {
width: 75%;
width: 100%;
height: 3em;
display: block;
}
@ -31,19 +32,7 @@
}
.list {
letter-spacing: 0.25em;
text-transform: uppercase;
figure {
width: 75%;
display: flex;
flex-flow: column;
margin-bottom: 1em;
button {
width: 100%;
}
}
grid-template-columns: 1fr;
}
}

40
client/assets/styles/menu.less
View File

@ -61,7 +61,25 @@
}
}
.inventory {
.options {
grid-area: hdr;
button {
width: 25%;
border-top: 0;
border: 1px solid #222;
&:not(:last-child) {
border-right: 0;
}
&:last-child {
float: right;
}
}
}
}
section {
display: grid;
grid-template-columns: 1fr 1fr;
@ -84,26 +102,10 @@
}
figure {
letter-spacing: 0.25em;
text-transform: uppercase;
font-size: 125%;
display: flex;
flex-flow: column;
}
}
.options {
grid-area: hdr;
button {
width: 25%;
border-top: 0;
border: 1px solid #222;
&:not(:last-child) {
border-right: 0;
}
&:last-child {
float: right;
}
}
}
}

2
client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.3.0",
"version": "1.3.2",
"description": "",
"main": "index.js",
"scripts": {

2
client/src/components/account.top.jsx
View File

@ -206,14 +206,12 @@ class AccountStatus extends Component {
</button>
</div>
<div>
<div class="list">
<figure>
<figcaption>spawn new construct</figcaption>
<button onClick={() => sendConstructSpawn()} type="submit">
¤50
</button>
</figure>
</div>
<button onClick={() => logout()}>Logout</button>
<button><a href={`mailto:humans@mnml.gg?subject=Account%20Support:%20${account.name}`}>✉ support</a></button>
</div>

1
client/src/components/info.component.jsx
View File

@ -21,6 +21,7 @@ function InfoComponent(args) {
return (
<div>
<h2>VBOX phase</h2>
<p>in this phase you strengthen and specialise your constructs by equipping items to them.</p>
<p>double clicking items in the <b>VBOX</b> will purchase and move them to your <b>INVENTORY</b>.</p>
<p>
hover over an item to see its effects and combinations.<br />

4
client/src/components/play.jsx
View File

@ -89,7 +89,7 @@ function Play(args) {
return (
<div class="inventory top">
<section class="top">
<div class="news">
<h1>mnml v{VERSION}</h1>
<p>use the buttons on the right to join an instance.</p>
@ -122,7 +122,7 @@ function Play(args) {
{shop.available.map(availableMtx)}
</div>
</div>
</div>
</section>
);
}

4
client/src/components/shop.jsx
View File

@ -25,7 +25,7 @@ function Shop(args) {
} = args;
return (
<div class="inventory top">
<section class="top">
<div class="news">
<h1>support the game</h1>
<p>
@ -51,7 +51,7 @@ function Shop(args) {
<StripeBtns account={account} />
</Elements>
</div>
</div>
</section>
);
}

4
client/src/constants.jsx
View File

@ -36,7 +36,7 @@ module.exports = {
},
bits: {
item: 'BITS',
description: 'The VBOX currency.\nColours: 1b\nSkills: 2b\nSpecs: 3b\nWin: +12b\nLose: +9b',
description: 'The VBOX currency.\nColours: 1b\nSkills: 2b\nSpecs: 3b\nAt the beginning of a round you receive 12 + 6 * round_number bits.',
},
ready: {
item: 'READY',
@ -56,7 +56,7 @@ module.exports = {
},
refill: {
item: 'REFILL',
description: 'Refill the VBOX with new ITEMS.\nCosts 5b.',
description: 'Refill the VBOX with new ITEMS.',
},
equipSkills: {
item: 'QUICK ACCESS - SKILLS',

2
ops/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-ops",
"version": "1.3.0",
"version": "1.3.2",
"description": "",
"main": "index.js",
"scripts": {

2
server/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "mnml"
version = "1.3.0"
version = "1.3.2"
authors = ["ntr <ntr@smokestack.io>"]
[dependencies]

26
server/src/http.rs
View File

@ -40,12 +40,12 @@ pub enum MnmlHttpError {
BadRequest,
#[fail(display="not found")]
NotFound,
#[fail(display="account name taken or invalid")]
AccountNameNotProvided,
#[fail(display="account name not provided")]
AccountNotFound,
AccountNameNotProvided,
#[fail(display="account name unavailable")]
AccountNameUnavailable,
#[fail(display="account not found")]
AccountNameTaken,
AccountNotFound,
#[fail(display="password does not match")]
PasswordNotMatch,
#[fail(display="password unacceptable. must be > 11 characters")]
@ -66,7 +66,21 @@ impl From<bcrypt::BcryptError> for MnmlHttpError {
impl From<postgres::Error> for MnmlHttpError {
fn from(err: postgres::Error) -> Self {
warn!("{:?}", err);
MnmlHttpError::DbError
match err.as_db() {
Some(db) => {
let constraint = match db.constraint {
Some(ref c) => c,
None => return MnmlHttpError::DbError,
};
match constraint.as_ref() {
"accounts_name_unique" => MnmlHttpError::AccountNameUnavailable,
_ => MnmlHttpError::DbError,
}
},
_ => MnmlHttpError::DbError,
}
}
}
@ -109,7 +123,7 @@ impl From<MnmlHttpError> for IronError {
MnmlHttpError::DbError => (m_err.compat(), status::InternalServerError),
MnmlHttpError::AccountNameNotProvided |
MnmlHttpError::AccountNameTaken |
MnmlHttpError::AccountNameUnavailable |
MnmlHttpError::AccountNotFound |
MnmlHttpError::BadRequest |
MnmlHttpError::PasswordUnacceptable => (m_err.compat(), status::BadRequest),

10
server/src/payments.rs
View File

@ -164,9 +164,15 @@ impl StripeData {
Ok(self)
},
StripeData::Purchase { account, customer: _, amount, checkout: _ } => {
let credits = amount
let credits = match amount {
500 => 50,
1000 => 110,
2000 => 250,
5000 => 660,
_ => amount
.checked_div(CREDITS_COST_CENTS)
.expect("credits cost 0");
.expect("credits cost 0"),
};
account::credit(tx, *account, credits)?;