{vboxElement()}
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 0cc1e4a0..0d9c88fa 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -12,6 +12,13 @@ const { tutorialVbox } = require('./tutorial.utils');
function registerEvents(store) {
function notify(msg) {
+ if (window.Notification && window.Notification.permission === 'granted') {
+ const n = new Notification('MNML', {
+ body: msg,
+ tag: 'MNML',
+ });
+ }
+
return infoToast(msg);
}
@@ -127,9 +134,13 @@ function registerEvents(store) {
}
function setAccount(account) {
- if (account) {
+ if (account && process.env.NODE_ENV !== 'development') {
LogRocket.init('yh0dy3/mnml');
LogRocket.identify(account.id, account);
+
+ if (window.Notification) {
+ window.Notification.requestPermission();
+ }
}
store.dispatch(actions.setAccount(account));
@@ -179,6 +190,7 @@ function registerEvents(store) {
store.dispatch(actions.setItemEquip(null));
store.dispatch(actions.setItemUnequip([]));
store.dispatch(actions.setVboxHighlight([]));
+ store.dispatch(actions.setVboxSelected([]));
}
function setAccountInstances(v) {
@@ -212,7 +224,9 @@ function registerEvents(store) {
if (v.phase === 'Finished') {
ws.sendAccountInstances();
}
- if (localStorage.getItem('tutorial-complete')) {
+
+ // instance.mobile.less hides info at @media 1000
+ if (localStorage.getItem('tutorial-complete') || window.innerWidth <= 1100) {
store.dispatch(actions.setTutorial(null));
} else if (v.time_control === 'Practice' && v.rounds.length === 1 && tutorial) {
tutorialVbox(player, store, tutorial);
diff --git a/client/src/reducers.jsx b/client/src/reducers.jsx
index d2d06f43..96d8001c 100644
--- a/client/src/reducers.jsx
+++ b/client/src/reducers.jsx
@@ -45,8 +45,6 @@ module.exports = {
itemUnequip: createReducer([], 'SET_ITEM_UNEQUIP'),
mtxActive: createReducer(null, 'SET_MTX_ACTIVE'),
nav: createReducer(null, 'SET_NAV'),
- navInstance: createReducer(0, 'SET_NAV_INSTANCE'),
- showNav: createReducer(null, 'SET_SHOW_NAV'),
ping: createReducer(null, 'SET_PING'),
player: createReducer(null, 'SET_PLAYER'),
reclaiming: createReducer(false, 'SET_RECLAIMING'),
diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index 85d81154..fbc6b296 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -82,6 +82,11 @@ function createSocket(events) {
events.clearInstance();
}
+ function sendVboxAcceptEquip(instanceId, group, index, constructId) {
+ send(['VboxAcceptEquip', { instance_id: instanceId, group, index, construct_id: constructId }]);
+ events.clearInstance();
+ }
+
function sendVboxApply(instanceId, constructId, index) {
send(['VboxApply', { instance_id: instanceId, construct_id: constructId, index }]);
events.clearInstance();
@@ -92,6 +97,11 @@ function createSocket(events) {
events.clearInstance();
}
+ function sendVboxUnequipApply(instanceId, constructId, target, targetConstructId) {
+ send(['VboxUnequipApply', { instance_id: instanceId, construct_id: constructId, target, target_construct_id: targetConstructId }]);
+ events.clearInstance();
+ }
+
function sendVboxDiscard(instanceId) {
send(['VboxDiscard', { instance_id: instanceId }]);
events.clearInstance();
@@ -99,7 +109,7 @@ function createSocket(events) {
function sendVboxCombine(instanceId, indices) {
send(['VboxCombine', { instance_id: instanceId, indices }]);
- events.clearCombiner();
+ events.clearInstance();
}
function sendVboxReclaim(instanceId, index) {
@@ -264,13 +274,14 @@ function createSocket(events) {
Pong: onPong,
Demo: onDemo,
- QueueRequested: () => events.notify('pvp queue request received'),
- QueueJoined: () => events.notify('you have joined the pvp queue'),
- InviteRequested: () => events.notify('pvp invite request received'),
+ QueueRequested: () => events.notify('PVP queue request received.'),
+ QueueJoined: () => events.notify('You have joined the PVP queue.'),
+ QueueFound: () => events.notify('Your PVP game has started.'),
+ InviteRequested: () => events.notify('PVP invite request received.'),
Invite: code => events.setInvite(code),
InstanceChat: chat => events.setInstanceChat(chat),
ChatWheel: wheel => events.setChatWheel(wheel),
- Joining: () => events.notify('searching for instance...'),
+ // Joining: () => events.notify('Searching for instance...'),
Processing: () => true,
Error: errHandler,
@@ -307,8 +318,11 @@ function createSocket(events) {
return handlers[msgType](params);
}
+ let attempts = 1;
+
// Connection opened
function onOpen() {
+ attempts = 0;
toast.info({
message: 'connected',
position: 'topRight',
@@ -327,12 +341,21 @@ function createSocket(events) {
}
function onClose(event) {
+ attempts *= 2;
+ if (attempts > 10) {
+ toast.warning({
+ message: 'unable to connect, refreshing...',
+ position: 'topRight',
+ });
+ setTimeout(() => window.location.reload(true), 2000);
+ }
+
console.error('WebSocket closed', event);
toast.warning({
message: 'disconnected',
position: 'topRight',
});
- return setTimeout(connect, 5000);
+ return setTimeout(connect, attempts * 1000);
}
function connect() {
@@ -381,11 +404,13 @@ function createSocket(events) {
sendInstanceChat,
sendVboxAccept,
+ sendVboxAcceptEquip,
sendVboxApply,
sendVboxReclaim,
sendVboxCombine,
sendVboxDiscard,
sendVboxUnequip,
+ sendVboxUnequipApply,
sendItemInfo,
diff --git a/client/src/tutorial.utils.jsx b/client/src/tutorial.utils.jsx
index 1cdf0dfb..53268161 100644
--- a/client/src/tutorial.utils.jsx
+++ b/client/src/tutorial.utils.jsx
@@ -1,11 +1,10 @@
const preact = require('preact');
const actions = require('./actions');
-function tutorialConstructDisplay(player, instance, tutorial, navInstance, i) {
+function tutorialConstructDisplay(player, instance, tutorial, i) {
if (instance.time_control === 'Practice' && instance.rounds.length === 1 && tutorial && tutorial < 6) {
if (tutorial <= 2 || (tutorial > 2 && i > 0)) {
- const mobileVisible = navInstance === i + 1;
- const classes = `instance-construct ${mobileVisible ? 'visible' : ''}`;
+ const classes = `instance-construct`;
return (
);
}
}
@@ -200,13 +199,16 @@ function tutorialStage(tutorial, ws, clearTutorial, instance) {
}
if (tutorial === 8) {
+ if (window.innerWidth < 1000) {
+ return exit();
+ }
+
return (
Tutorial
You've completed the tutorial! Try to create more skill and spec combinations.
You can unequip skills and specs back into the inventory by double clicking.
Reclaim can be used to refund the cost of items in your inventory.
-
Click the EXIT TUTORIAL button to replace this section with more information.
);
}
@@ -214,10 +216,11 @@ function tutorialStage(tutorial, ws, clearTutorial, instance) {
};
const classes = tutorial === 8 ? 'focus' : '';
+ const text = tutorial === 8 ? 'Continue' : 'Close Tutorial'
const exitTutorial =
;
+ onMouseDown={exit}> {text} ;
return (
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index ec49e659..8cbbc11a 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -264,7 +264,7 @@ function effectInfo(i) {
}
switch (i.effect) {
- case 'Amplify': return `Increases construct RedPower and BluePower by ${i.meta[1] - 100}%`;
+ case 'Amplify': return `Increases construct RedPower BluePower GreenPower by ${i.meta[1] - 100}%`;
case 'Banish': return 'Banished construct cannot cast or take damage';
case 'Block': return `Reduces construct red damage and blue damage taken by ${100 - i.meta[1]}%`;
case 'Buff': return `Increases construct RedPower BluePower SpeedStat by ${i.meta[1] - 100}%`;
diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
index 82567688..0fca6361 100644
--- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
+++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
@@ -15,6 +15,12 @@ map $http_upgrade $connection_upgrade {
server {
server_name mnml.gg;
+ gzip on;
+ gzip_vary on;
+ gzip_proxied any;
+ gzip_comp_level 6;
+ gzip_types text/plain text/css text/xml application/json application/javascript application/xml+rss application/atom+xml image/svg+xml;
+
location / {
root /var/lib/mnml/public/current;
index index.html;
diff --git a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
index bed6a99e..2e75cf1e 100644
--- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
+++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
@@ -15,8 +15,14 @@ map $http_upgrade $connection_upgrade {
server {
server_name sixtysix.pro;
- auth_basic "who dis";
- auth_basic_user_file /etc/mnml/htpasswd.users;
+ gzip on;
+ gzip_vary on;
+ gzip_proxied any;
+ gzip_comp_level 6;
+ gzip_types text/plain text/css text/xml application/json application/javascript application/xml+rss application/atom+xml image/svg+xml;
+
+ # auth_basic "who dis";
+ # auth_basic_user_file /etc/mnml/htpasswd.users;
location / {
root /var/lib/mnml/public/current;
diff --git a/ops/fetch.molecules.js b/ops/fetch.molecules.js
deleted file mode 100644
index 5b9b7ba2..00000000
--- a/ops/fetch.molecules.js
+++ /dev/null
@@ -1,82 +0,0 @@
-const fs = require('fs');
-const renderer = require('sdftosvg');
-
-const SVG_OPTS = {
- backgroundColor: 'none',
-}
-
-function convert(i) {
- const output = `./../client/assets/molecules/${i}.svg`;
-
- return new Promise((resolve, reject) => {
- fs.readFile(`./molecules/mol${i}`, 'utf8', function rfCb(err, sdf) {
- if (err) return reject(err);
- // write svg
- renderer.renderSdfToSvg(sdf, SVG_OPTS, function(err, svg) {
- if (err) return reject(err);
- fs.writeFile(output, svg, function written(err) {
- if (err) reject(err);
- resolve();
- });
- });
- })
- });
-}
-
-async function loop() {
- for (var i = 10000; i >= 0; i--) {
- try {
- await convert(i);
- console.log('finished record', i);
- } catch (e) {
- console.error('record error', i, e);
- }
- }
-}
-
-loop();
-
-// const request = require('request');
-// const fs = require('fs');
-// const renderer = require('sdftosvg');
-
-// const SVG_OPTS = {
-// backgroundColor: 'none',
-// }
-
-// function fetch(i) {
-// return new Promise((resolve, reject) => {
-// const url = `https://pubchem.ncbi.nlm.nih.gov/rest/pug/compound/CID/${i}/record/SDF/?record_type=2d&response_type=save&response_basename=Structure2D_CID_2519`;
-// const output = `./../client/assets/molecules/${i}.svg`;
-
-// request(url, function cb(err, res, body) {
-// if (err) reject(err);
-
-// // write file
-// fs.writeFile(`./molecules/Structure2D_CID_${i}.sdf`, body, function written(err) {
-// if (err) reject(err);
-// });
-
-// // write svg
-// renderer.renderSdfToSvg(body, SVG_OPTS, function(err, svg) {
-// if (err) reject(err);
-// fs.writeFile(output, svg, function written(err) {
-// if (err) reject(err);
-// resolve();
-// });
-// });
-// });
-// });
-// }
-
-// async function loop() {
-// for (var i = 10000; i >= 0; i--) {
-// try {
-// await fetch(i);
-// console.log('finished record', i);
-// } catch (e) {
-// console.error(e);
-// }
-// }
-// }
-
diff --git a/ops/fix.molecule.holes.js b/ops/fix.molecule.holes.js
deleted file mode 100644
index f3c07006..00000000
--- a/ops/fix.molecule.holes.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const fs = require('fs');
-
-for (let i = 10000; i >= 0; i--) {
- fs.access(`./../client/assets/molecules/${i}.svg`, (err) => {
- if (err) {
- fs.copyFileSync(`./../client/assets/molecules/726.svg`, `./../client/assets/molecules/${i}.svg`);
- console.log('defaulted', i);
- }
- return true;
- })
-}
-
diff --git a/ops/migrations/20191031203812_remove-molecular.js b/ops/migrations/20191031203812_remove-molecular.js
new file mode 100644
index 00000000..194db918
--- /dev/null
+++ b/ops/migrations/20191031203812_remove-molecular.js
@@ -0,0 +1,10 @@
+const uuidv4 = require('uuid/v4');
+
+// give everybody the shapes mtx
+exports.up = async knex => {
+ await knex.raw(`
+ DELETE from mtx
+ WHERE variant = 'Molecular';
+ `);
+};
+exports.down = async () => {};
\ No newline at end of file
diff --git a/ops/molecules.js b/ops/molecules.js
deleted file mode 100644
index 39c7d1b5..00000000
--- a/ops/molecules.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const renderer = require('sdftosvg');
-const uuidv4 = require('uuid/v4');
-const fs = require('fs');
-
-function convert(f) {
- const uuid = uuidv4();
- const input = `./molecules/${f}`;
- const output = `./../client/assets/molecules/${uuid}.svg`;
- fs.readFile(input, 'utf8', (err, sdf) => {
- renderer.renderSdfToSvg(sdf, {}, function(err, svg) {
- if (err) console.error(input, err);
- fs.writeFile(output, svg, 'utf8', err => {
- if (err) console.error(err);
- });
- });
- });
-}
-
diff --git a/ops/package.json b/ops/package.json
index 876bd4cf..3c4ae105 100755
--- a/ops/package.json
+++ b/ops/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-ops",
- "version": "1.7.1",
+ "version": "1.8.0",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 40e26480..a29783c7 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mnml"
-version = "1.7.1"
+version = "1.8.0"
authors = ["ntr
"]
[dependencies]
diff --git a/server/src/account.rs b/server/src/account.rs
index 22224568..8e8a1b6f 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -67,13 +67,13 @@ pub fn select(db: &Db, id: Uuid) -> Result {
pub fn chat_wheel(_db: &Db, _id: Uuid) -> Result, Error> {
return Ok(vec![
- "gl".to_string(),
- "hf".to_string(),
"gg".to_string(),
- "thx".to_string(),
- "nice".to_string(),
+ "glhf".to_string(),
"hmm".to_string(),
"ok".to_string(),
+ "rekt".to_string(),
+ "thx".to_string(),
+ "nice".to_string(),
"...".to_string(),
])
}
diff --git a/server/src/construct.rs b/server/src/construct.rs
index 325e6d5e..55a971f1 100644
--- a/server/src/construct.rs
+++ b/server/src/construct.rs
@@ -220,11 +220,11 @@ impl Construct {
account: id,
img: Uuid::new_v4(),
red_power: ConstructStat { base: 320, value: 320, max: 320, stat: Stat::RedPower },
- red_life: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::RedLife },
+ red_life: ConstructStat { base: 125, value: 125, max: 125, stat: Stat::RedLife },
blue_power: ConstructStat { base: 320, value: 320, max: 320, stat: Stat::BluePower },
- blue_life: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::BlueLife },
+ blue_life: ConstructStat { base: 125, value: 125, max: 125, stat: Stat::BlueLife },
green_power: ConstructStat { base: 300, value: 300, max: 300, stat: Stat::GreenPower },
- green_life: ConstructStat { base: 950, value: 950, max: 950, stat: Stat::GreenLife },
+ green_life: ConstructStat { base: 800, value: 800, max: 800, stat: Stat::GreenLife },
speed: ConstructStat { base: 100, value: 100, max: 100, stat: Stat::Speed },
// evasion: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::Evasion },
skills: vec![],
diff --git a/server/src/effect.rs b/server/src/effect.rs
index c2c77392..9e3076bc 100644
--- a/server/src/effect.rs
+++ b/server/src/effect.rs
@@ -105,7 +105,7 @@ impl Effect {
Effect::Absorption => vec![Stat::RedPower, Stat::BluePower],
- Effect::Amplify => vec![Stat::RedPower, Stat::BluePower],
+ Effect::Amplify => vec![Stat::GreenPower, Stat::RedPower, Stat::BluePower],
Effect::Curse => vec![Stat::RedDamageTaken, Stat::BlueDamageTaken],
Effect::Hybrid => vec![Stat::GreenPower],
diff --git a/server/src/game.rs b/server/src/game.rs
index 12a175b4..e484c286 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -1229,7 +1229,7 @@ mod tests {
assert!(game.player_by_id(x_player.id).unwrap().constructs[0].is_stunned() == false);
// riposte
assert_eq!(game.player_by_id(y_player.id).unwrap().constructs[0].green_life(), (
- y_construct.green_life() - x_construct.red_power().pct(Skill::CounterAttack.multiplier())));
+ y_construct.green_life() + y_construct.red_life() - x_construct.red_power().pct(Skill::CounterAttack.multiplier())));
}
#[test]
diff --git a/server/src/img.rs b/server/src/img.rs
index c10d8e57..705d86cd 100644
--- a/server/src/img.rs
+++ b/server/src/img.rs
@@ -1,5 +1,4 @@
use std::f64;
-use std::fs::copy;
use std::fs::File;
use std::io::prelude::*;
use std::char::from_u32;
@@ -9,25 +8,7 @@ use rand::prelude::*;
use rand::distributions::{Normal, WeightedIndex};
use failure::Error;
-use failure::err_msg;
-
-pub fn molecular_write(id: Uuid) -> Result {
- let mut rng = thread_rng();
-
- for _i in 0..100 {
- let mol: u32 = rng.gen_range(0, 10000);
- let src = format!("/var/lib/mnml/data/molecules/{}.svg", mol);
- let dest = format!("/var/lib/mnml/public/imgs/{}.svg", id);
- debug!("molecule src={:?}", src);
- debug!("molecule dest={:?}", dest);
- if let Ok(_bytes) = copy(&src, &dest) {
- info!("new molecule img generated src={:?} dest={:?}", src, dest);
- return Ok(id);
- }
- }
-
- return Err(err_msg("too many missing molecules. wrong directory?"))
-}
+// use failure::err_msg;
pub fn invader_write(id: Uuid) -> Result {
let mut rng = thread_rng();
@@ -257,6 +238,118 @@ fn _hieroglyph() -> String {
return s;
}
+
+pub fn smile(id: Uuid) -> Result {
+ let mut rng = thread_rng();
+ let mut svg = Vec::new();
+
+ // distribution for lightness
+ // bellcurve around 75%
+ let l_dist = Normal::new(50.0, 10.0);
+ let s_dist = Normal::new(50.0, 20.0);
+
+ // let stroke_width = rng.gen_range(1, 3);
+ let stroke_width = 3;
+
+ let h = rng.gen_range(0, 360);
+ let s = s_dist.sample(&mut rng) as usize;
+ let l = l_dist.sample(&mut rng) as usize;
+ let eye_colour = format!("hsl({:}, {:}%, {:}%)", h, s, l);
+
+ let h = rng.gen_range(0, 360);
+ let s = s_dist.sample(&mut rng) as usize;
+ let l = l_dist.sample(&mut rng) as usize;
+ let mouth_colour = format!("hsl({:}, {:}%, {:}%)", h, s, l);
+
+ // basic layout is 200x200 box w/ 100 padding
+ // 2:1 for each x,y
+
+ // left eye is at 0,0
+ // 50W 25H
+ let eyes_left = [
+ ("M0,0 L25,25 L50,0", 1), // v
+ ("M0,25 L25,0 L50,25", 1), // ^
+ ("M0,0 L50,0", 1), // -
+ ("M0,25 L50,25", 1), // _
+ ("M0,0 L50,25 M50,0 L0,25", 1), // x
+ ("M0,0 L50,12.5 L0,25", 1), // >
+ ("M50,0 L0,12.5 L50,25", 1), // <
+ ("M0,0 L0,25 L50,25", 1), // L
+ ("M50,0 L50,25 L0,25", 1), // J
+ ("M0,0 L50,0 M50,6.25 L50,12.5 M50,18.75 L50,25", 1), // ;
+ ("M12.5,0 L37.5,0 L37.5,25 L12.5,25 L12.5,0", 1), // o
+ ];
+ let eye_left_dist = WeightedIndex::new(eyes_left.iter().map(|v| v.1))?;
+
+ // right eye is 150,0
+ // 50W 25H
+ let eyes_right = [
+ ("M150,0 L175,25 L200,0", 1), // v
+ ("M150,25 L175,0 L200,25", 1), // ^
+ ("M150,0 L200,0", 1), // -
+ ("M150,25 L200,25", 1), // _
+ ("M150,0 L200,25 M200,0 L150,25", 1), // x
+ ("M150,0 L200,12.5 L150,25", 1), // >
+ ("M200,0 L150,12.5 L200,25", 1), // <
+ ("M150,0 L150,25 L200,25", 1), // L
+ ("M200,0 L200,25 L150,25", 1), // J
+ ("M150,0 L200,0 M150,6.25 L150,12.5 M150,18.75 L150,25", 1), // ;
+ ("M162.5,0 L187.5,0 L187.5,25 L162.5,25 L162.5,0", 1), // o
+ ];
+ let eye_right_dist= WeightedIndex::new(eyes_right.iter().map(|v| v.1))?;
+
+ // mouth is 50,75
+ // 100W 25H
+ let mouths = [
+ ("M50,100 L150,100", 1), // _
+ ("M50,75 L150,75 L125,100 L75,100 L50,75", 1), // D
+ ("M50,75 L75,100 L100,75 L125,100 L150,75", 1), // w
+ ("M50,75 L75,75 L75,87.5 M75,75 L125,75 L125,87.5 M125,75 L150,75", 1), // vamp
+ ("M50,75 L150,75 M50,75 L50,87.5 M75,75 L75,87.5 M100,75 L100,87.5 M125,75 L125,87.5 M150,75 L150,87.5", 1), // mm
+ ("M75,75 L125,75 L125,100 L75,100 L75,75", 1), // o
+ ("M50,75 L150,100 M150,75 L50,100", 1), // x
+ ("M50,75 L150,75 L150,100 L125,100 L125,75", 1), // p
+ ("M50,75 L150,75 M50,75 L50,100 L75,100 L75,75", 1), // d
+ // ("M50,75 L50,100 L150,100 L150,75", 1), // u
+ ("M50,100 L50,75 L150,75 L150,100", 1), // n
+ ("M50,75 L50,100 L150,75 L150,100", 1), // Z
+ ("M50,87.5 L100,75 L150,87.5 L100,100 L50,87.5", 1), // Z
+ ];
+ let mouth_dist = WeightedIndex::new(mouths.iter().map(|v| v.1))?;
+
+ write!(&mut svg, "")?;
+
+ // let dest = format!("/var/lib/mnml/face.svg");
+ let dest = format!("/var/lib/mnml/public/imgs/{}.svg", id);
+
+ let mut file = File::create(dest)?;
+ file.write_all(&svg)?;
+
+ Ok(id)
+}
+
+
pub fn exists(id: Uuid) -> bool {
std::path::Path::new(&format!("/var/lib/mnml/public/imgs/{}.svg", id)).exists()
}
@@ -264,7 +357,6 @@ pub fn exists(id: Uuid) -> bool {
#[cfg(test)]
mod tests {
use super::*;
-
// #[test]
// fn invader_img_test() {
// for i in 0..100 {
@@ -283,107 +375,9 @@ mod tests {
// shapes_write(Uuid::new_v4()).unwrap();
// }
// }
+
+ #[test]
+ fn smile_test() {
+ smile(Uuid::new_v4()).unwrap();
+ }
}
-
-
-
-// function createColor() {
-// //saturation is the whole color spectrum
-// var h = Math.floor(rand() * 360);
-// //saturation goes from 40 to 100, it avoids greyish colors
-// var s = ((rand() * 60) + 40) + '%';
-// //lightness can be anything from 0 to 100, but probabilities are a bell curve around 75%
-// var l = ((rand()+rand()+rand()+rand()) * 25) + '%';
-
-// var color = 'hsl(' + h + ',' + s + ',' + l + ')';
-// return color;
-// }
-
-// function createImageData(size) {
-// var width = size; // Only support square icons for now
-// var height = size;
-
-// var dataWidth = Math.ceil(width / 2);
-// var mirrorWidth = width - dataWidth;
-
-// var data = [];
-// for(var y = 0; y < height; y++) {
-// var row = [];
-// for(var x = 0; x < dataWidth; x++) {
-// // this makes foreground and background color to have a 43% (1/2.3) probability
-// // spot color has 13% chance
-// row[x] = Math.floor(rand()*2.3);
-// }
-// var r = row.slice(0, mirrorWidth);
-// r.reverse();
-// row = row.concat(r);
-
-// for(var i = 0; i < row.length; i++) {
-// data.push(row[i]);
-// }
-// }
-
-// return data;
-// }
-
-// function buildOpts(opts) {
-// var newOpts = {};
-
-// newOpts.seed = opts.seed || Math.floor((Math.random()*Math.pow(10,16))).toString(16);
-
-// seedrand(newOpts.seed);
-
-// newOpts.size = opts.size || 8;
-// newOpts.scale = opts.scale || 4;
-// newOpts.color = opts.color || createColor();
-// newOpts.bgcolor = opts.bgcolor || createColor();
-// newOpts.spotcolor = opts.spotcolor || createColor();
-
-// return newOpts;
-// }
-// ],
-// - _ => vec![
-// - (ItemAction::RerollStamina, 1),
-// - (ItemAction::RerollPhysDamage, 1),
-// - (ItemAction::RerollSpellDamage, 1),
-// - (ItemAction::RerollSpeed, 1),
-// - (ItemAction::RerollArmour, 1),
-// - (ItemAction::RerollSpellShield, 1),
-// - (ItemAction::RerollEvasion, 1),
-// - ],
-// + // _ => vec![
-// + // (ItemAction::RerollStamina, 1),
-// + // (ItemAction::RerollPhysDamage, 1),
-// + // (ItemAction::RerollSpellDamage, 1),
-// + // (ItemAction::RerollSpeed, 1),
-// + // (ItemAction::RerollArmour, 1),
-// + // (ItemAction::RerollSpellShield, 1),
-// + // (ItemAction::RerollEvasion, 1),
-// + // ],
-// }
-// }
-
-// -pub fn item_drop(tx: &mut Transaction, account_id: Uuid, mode: GameMode) -> Result {
-// +pub fn item_drop(tx: &mut Transaction, account_id: Uuid, mode: GameMode) -> Result<(), Error> {
-// let mut rng = thread_rng();
-
-// - let actions = mode_drops(mode);
-// + let log_normal = LogNormal::new(1.0, 1.0);
-// + let num_drops = log_normal.sample(&mut rng).floor() as usize;
-// +
-// + println!("{:?} drops", num_drops);
-
-// - let dist = WeightedIndex::new(actions.iter().map(|item| item.1)).unwrap();
-// - let kind = actions[dist.sample(&mut rng)].0;
-// - let item = Item::new(kind, account_id);
-// + for _i in 0..num_drops {
-// + let actions = mode_drops(mode);
-
-// - println!("{:?} dropped {:?}", account_id, item);
-// + let dist = WeightedIndex::new(actions.iter().map(|item| item.1)).unwrap();
-// + let kind = actions[dist.sample(&mut rng)].0;
-// + let item = Item::new(kind, account_id);
-
-// - return item_create(item, tx, account_id);
-// + println!("{:?} dropped {:?}", account_id, item);
-// + item_create(item, tx, account_id)?;V
\ No newline at end of file
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 2e65b9d6..5dc79652 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -473,10 +473,10 @@ impl Instance {
Ok(self)
}
- pub fn vbox_accept(mut self, account: Uuid, group: usize, index: usize) -> Result {
+ pub fn vbox_accept(mut self, account: Uuid, group: usize, index: usize, construct_id: Option) -> Result {
self.vbox_action_allowed(account)?;
self.account_player(account)?
- .vbox_accept(group, index)?;
+ .vbox_accept(group, index, construct_id)?;
Ok(self)
}
@@ -501,10 +501,10 @@ impl Instance {
Ok(self)
}
- pub fn vbox_unequip(mut self, account: Uuid, target: Item, construct_id: Uuid) -> Result {
+ pub fn vbox_unequip(mut self, account: Uuid, target: Item, construct_id: Uuid, target_construct_id: Option) -> Result {
self.vbox_action_allowed(account)?;
self.account_player(account)?
- .vbox_unequip(target, construct_id)?;
+ .vbox_unequip(target, construct_id, target_construct_id)?;
Ok(self)
}
}
diff --git a/server/src/item.rs b/server/src/item.rs
index 52b3bb8b..1f1405a2 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -620,70 +620,70 @@ impl Item {
// Lifes Upgrades
Item::LifeGG |
Item::LifeGGPlus |
- Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}.
+ Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::LifeRR |
Item::LifeRRPlus |
- Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}.
+ Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
- Item::LifeBB |
- Item::LifeBBPlus |
- Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}.
+ Item::LifeBB |
+ Item::LifeBBPlus |
+ Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::LifeRG |
Item::LifeRGPlus |
- Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}.
+ Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::LifeGB |
Item::LifeGBPlus |
- Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}.
+ Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::LifeRB |
Item::LifeRBPlus |
- Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}.
+ Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
// Power Upgrades
- Item::PowerRR |
- Item::PowerRRPlus |
- Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%.
+ Item::PowerRR |
+ Item::PowerRRPlus |
+ Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::PowerBB |
Item::PowerBBPlus |
- Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%.
+ Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::PowerGG |
Item::PowerGGPlus |
- Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%.
+ Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::PowerRG |
Item::PowerRGPlus |
- Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%.
+ Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::PowerGB |
Item::PowerGBPlus |
- Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%.
+ Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
Item::PowerRB |
Item::PowerRBPlus |
- Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%.
+ Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
@@ -705,21 +705,21 @@ impl Item {
Item::SpeedGGPlusPlus |
Item::SpeedRGPlusPlus |
Item::SpeedGBPlusPlus |
- Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%.
+ Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%.
If your team meets total colour thresholds the spec provides additional bonuses.",
self.into_spec().unwrap().values().base()),
// Skills <- need to move effect mulltipliers into skills
Item::Amplify|
Item::AmplifyPlus |
- Item::AmplifyPlusPlus => format!("Increase RedPower and BluePower by {:?}%. Lasts {:?}T.",
+ Item::AmplifyPlusPlus => format!("Increase RedPower BluePower GreenPower by {:?}%. Lasts {:?}T.",
self.into_skill().unwrap().effect()[0].get_multiplier() - 100,
self.into_skill().unwrap().effect()[0].get_duration()),
Item::Banish|
Item::BanishPlus |
Item::BanishPlusPlus => format!("Banish target for {:?}T.
- Deal blue damage and red damage equal to {:?}% target red and blue life.
+ Deal {:?}% target RedLife and BlueLife as red and blue damage respectively.
Banished constructs are immune to all skills and effects.",
self.into_skill().unwrap().effect()[0].get_duration(),
self.into_skill().unwrap().multiplier()),
@@ -773,11 +773,12 @@ impl Item {
Item::Absorb|
Item::AbsorbPlus |
Item::AbsorbPlusPlus => format!(
- "Gain Absorb for {:?}T. When attacked with Absorb you gain Absorption.
- Absorption increases RedPower and BluePower based on Damage taken.
- Absorption lasts {:?}T.",
+ "Gain Absorb for {:?}T. Taking damage replaces Absorb with Absorption.
+ Absorption increases RedPower and BluePower based on damage taken.
+ Absorption lasts {:?}T. Recharges BlueLife based on {:?}% BluePower.",
self.into_skill().unwrap().effect()[0].get_duration(),
- self.into_skill().unwrap().effect()[0].get_skill().unwrap().effect()[0].get_duration()),
+ self.into_skill().unwrap().effect()[0].get_skill().unwrap().effect()[0].get_duration(),
+ self.into_skill().unwrap().multiplier()),
Item::Haste|
Item::HastePlus |
@@ -796,7 +797,7 @@ impl Item {
Item::Hybrid|
Item::HybridPlus |
Item::HybridPlusPlus => format!(
- "Hybrid increases GreenPower by {:?}%.
+ "Hybrid increases GreenPower by {:?}%.
Blue based Attack skills will blast again dealing {:?}% GreenPower as blue damage.
Lasts {:?}T.",
self.into_skill().unwrap().effect()[0].get_multiplier() - 100,
@@ -823,7 +824,7 @@ impl Item {
Item::Purge|
Item::PurgePlus |
Item::PurgePlusPlus => format!(
- "Remove buffs from target construct.
+ "Remove buffs from target construct.
Applies purge disabling target green skills for {:?}T.",
self.into_skill().unwrap().effect()[0].get_duration()),
@@ -836,7 +837,7 @@ impl Item {
Item::Reflect|
Item::ReflectPlus |
Item::ReflectPlusPlus => format!(
- "Reflect incoming blue skills to source. Lasts {:?}T.
+ "Reflect incoming blue skills to source. Lasts {:?}T.
Recharges target BlueLife based on {:?}% BluePower.",
self.into_skill().unwrap().effect()[0].get_duration(),
self.into_skill().unwrap().multiplier()),
@@ -943,6 +944,11 @@ impl Item {
}
}
+ // !!!!!!
+ // IF YOU CHANGE A COMBO
+ // BE SURE TO EDIT BUTTONS.JSX TOO
+ // !!!!!!
+
fn combo(&self) -> Vec- {
match self {
Item::Intercept => vec![Item::Buff, Item::Red, Item::Red],
diff --git a/server/src/mtx.rs b/server/src/mtx.rs
index 239e1fe7..b47daa5f 100644
--- a/server/src/mtx.rs
+++ b/server/src/mtx.rs
@@ -20,8 +20,8 @@ pub const FREE_MTX: [MtxVariant; 2] = [
];
pub const SHOP_LISTINGS: [Listing; 2] = [
- Listing { variant: MtxVariant::Molecular, credits: 10 },
Listing { variant: MtxVariant::Invader, credits: 10 },
+ Listing { variant: MtxVariant::Smile, credits: 10 },
];
const NEW_IMAGE_COST: i64 = 1;
@@ -43,9 +43,9 @@ pub struct Listing {
#[derive(Debug,Copy,Clone,PartialEq,Serialize,Deserialize)]
pub enum MtxVariant {
Rename,
- Molecular,
Invader,
Shapes,
+ Smile,
}
impl MtxVariant {
@@ -61,8 +61,8 @@ impl TryFrom for MtxVariant {
fn try_from(v: String) -> Result {
match v.as_ref() {
"Rename" => Ok(MtxVariant::Rename),
- "Molecular" => Ok(MtxVariant::Molecular),
"Invader" => Ok(MtxVariant::Invader),
+ "Smile" => Ok(MtxVariant::Smile),
"Shapes" => Ok(MtxVariant::Shapes),
_ => Err(format_err!("mtx variant not found variant={:?}", v)),
}
@@ -81,7 +81,6 @@ impl Mtx {
match variant {
_ => Mtx { id: Uuid::new_v4(), account, variant },
// MtxVariant::Invader => Mtx { id: Uuid::new_v4(), account, variant: self },
- // MtxVariant::Molecular => Mtx { id: Uuid::new_v4(), account, variant: self },
}
}
@@ -158,8 +157,8 @@ pub fn apply(tx: &mut Transaction, account: &Account, variant: MtxVariant, const
match mtx.variant {
MtxVariant::Invader => img::invader_write(construct.img)?,
- MtxVariant::Molecular => img::molecular_write(construct.img)?,
MtxVariant::Shapes => img::shapes_write(construct.img)?,
+ MtxVariant::Smile => img::smile(construct.img)?,
_ => construct.img,
};
@@ -179,8 +178,8 @@ pub fn account_apply(tx: &mut Transaction, account: &Account, variant: MtxVarian
match mtx.variant {
MtxVariant::Invader => img::invader_write(account.img)?,
- MtxVariant::Molecular => img::molecular_write(account.img)?,
MtxVariant::Shapes => img::shapes_write(account.img)?,
+ MtxVariant::Smile => img::smile(account.img)?,
_ => account.img,
};
diff --git a/server/src/player.rs b/server/src/player.rs
index 994d7f4c..0e0baf56 100644
--- a/server/src/player.rs
+++ b/server/src/player.rs
@@ -256,8 +256,12 @@ impl Player {
Ok(self)
}
- pub fn vbox_accept(&mut self, group: usize, index: usize) -> Result<&mut Player, Error> {
- self.vbox.accept(group, index)?;
+ pub fn vbox_accept(&mut self, group: usize, index: usize, construct_id: Option) -> Result<&mut Player, Error> {
+ self.vbox.accept(group, index, construct_id)?;
+ if construct_id.is_some() {
+ let equip_index = self.vbox.bound.len() - 1;
+ self.vbox_apply(equip_index, construct_id.expect("no construct"))?;
+ }
Ok(self)
}
@@ -320,8 +324,8 @@ impl Player {
Ok(self)
}
- pub fn vbox_unequip(&mut self, target: Item, construct_id: Uuid) -> Result<&mut Player, Error> {
- if self.vbox.bound.len() >= 9 {
+ pub fn vbox_unequip(&mut self, target: Item, construct_id: Uuid, target_construct_id: Option) -> Result<&mut Player, Error> {
+ if self.vbox.bound.len() >= 9 && !target_construct_id.is_some() {
return Err(err_msg("too many items bound"));
}
@@ -354,7 +358,12 @@ impl Player {
}
self.vbox.bound.push(target);
- self.vbox.bound.sort_unstable();
+
+ if target_construct_id.is_some() {
+ let equip_index = self.vbox.bound.len() - 1;
+ self.vbox_apply(equip_index, target_construct_id.expect("no construct"))?;
+ }
+ // self.vbox.bound.sort_unstable();
Ok(self)
}
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index 54602215..e0db439a 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -1,6 +1,5 @@
use std::time::{Instant};
-use std::thread::{spawn, sleep};
-use std::time;
+use std::thread::{spawn};
use std::str;
@@ -65,6 +64,7 @@ pub enum RpcMessage {
QueueRequested(()),
QueueJoined(()),
QueueCancelled(()),
+ QueueFound(()),
InviteRequested(()),
Invite(String),
@@ -112,10 +112,12 @@ pub enum RpcRequest {
InstanceChat { instance_id: Uuid, index: usize },
VboxAccept { instance_id: Uuid, group: usize, index: usize },
+ VboxAcceptEquip { instance_id: Uuid, group: usize, index: usize, construct_id: Uuid },
VboxDiscard { instance_id: Uuid },
VboxCombine { instance_id: Uuid, indices: Vec },
VboxApply { instance_id: Uuid, construct_id: Uuid, index: usize },
VboxUnequip { instance_id: Uuid, construct_id: Uuid, target: Item },
+ VboxUnequipApply { instance_id: Uuid, construct_id: Uuid, target: Item, target_construct_id: Uuid },
VboxReclaim { instance_id: Uuid, index: usize },
}
@@ -234,7 +236,10 @@ impl Connection {
Ok(instance_abandon(&mut tx, account, instance_id)?),
RpcRequest::VboxAccept { instance_id, group, index } =>
- Ok(RpcMessage::InstanceState(vbox_accept(&mut tx, account, instance_id, group, index)?)),
+ Ok(RpcMessage::InstanceState(vbox_accept(&mut tx, account, instance_id, group, index, None)?)),
+
+ RpcRequest::VboxAcceptEquip { instance_id, group, index, construct_id } =>
+ Ok(RpcMessage::InstanceState(vbox_accept(&mut tx, account, instance_id, group, index, Some(construct_id))?)),
RpcRequest::VboxApply { instance_id, construct_id, index } =>
Ok(RpcMessage::InstanceState(vbox_apply(&mut tx, account, instance_id, construct_id, index)?)),
@@ -249,7 +254,10 @@ impl Connection {
Ok(RpcMessage::InstanceState(vbox_reclaim(&mut tx, account, instance_id, index)?)),
RpcRequest::VboxUnequip { instance_id, construct_id, target } =>
- Ok(RpcMessage::InstanceState(vbox_unequip(&mut tx, account, instance_id, construct_id, target)?)),
+ Ok(RpcMessage::InstanceState(vbox_unequip(&mut tx, account, instance_id, construct_id, target, None)?)),
+
+ RpcRequest::VboxUnequipApply { instance_id, construct_id, target, target_construct_id } =>
+ Ok(RpcMessage::InstanceState(vbox_unequip(&mut tx, account, instance_id, construct_id, target, Some(target_construct_id))?)),
RpcRequest::MtxConstructSpawn {} =>
Ok(RpcMessage::ConstructSpawn(mtx::new_construct(&mut tx, account)?)),
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 5884198a..855f8954 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -89,10 +89,15 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
if source.affected(Effect::Haste) {
match skill {
- Skill::Attack |
- Skill::Slay|
- Skill::Chaos|
- Skill::Strike=> {
+ Skill::Slay |
+ Skill::SlayPlus |
+ Skill::SlayPlusPlus |
+ Skill::Chaos |
+ Skill::ChaosPlus |
+ Skill::ChaosPlusPlus |
+ Skill::Strike |
+ Skill::StrikePlus |
+ Skill::StrikePlusPlus => {
let amount = source.speed().pct(Skill::HasteStrike.multiplier());
target.deal_red_damage(Skill::HasteStrike, amount)
.into_iter()
@@ -105,8 +110,14 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
if source.affected(Effect::Hybrid) {
match skill {
Skill::Blast|
- Skill::Chaos|
- Skill::Siphon=> {
+ Skill::BlastPlus |
+ Skill::BlastPlusPlus |
+ Skill::Chaos |
+ Skill::ChaosPlus |
+ Skill::ChaosPlusPlus |
+ Skill::Siphon |
+ Skill::SiphonPlus |
+ Skill::SiphonPlusPlus => {
let amount = source.green_power().pct(Skill::HybridBlast.multiplier());
target.deal_blue_damage(Skill::HybridBlast, amount)
.into_iter()
@@ -293,7 +304,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
let mut target = game.construct_by_id(target.id).unwrap().clone();
match event {
- Event::Damage { amount, skill, mitigation: _, colour: c } => {
+ Event::Damage { amount, skill, mitigation, colour: c } => {
if target.affected(Effect::Electric) && !skill.is_tick() {
let ConstructEffect { effect: _, duration: _, meta, tick: _ } = target.effects.iter()
.find(|e| e.effect == Effect::Electric).unwrap().clone();
@@ -320,7 +331,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
.find(|e| e.effect == Effect::Absorb).unwrap().clone();
match meta {
Some(EffectMeta::Skill(s)) => {
- resolutions = absorption(&mut source, &mut target, resolutions, skill, amount, s);
+ resolutions = absorption(&mut source, &mut target, resolutions, skill, amount + mitigation, s);
},
_ => panic!("no absorb skill"),
};
@@ -833,6 +844,10 @@ impl Skill {
Skill::HybridBlast => 50,
Skill::HasteStrike => 60,
+
+ Skill::Absorb=> 95,
+ Skill::AbsorbPlus => 120,
+ Skill::AbsorbPlusPlus => 155,
Skill::Intercept=> 80,
Skill::InterceptPlus => 110,
@@ -911,11 +926,11 @@ impl Skill {
Skill::HastePlusPlus => vec![ConstructEffect {effect: Effect::Haste, duration: 5,
meta: Some(EffectMeta::Multiplier(225)), tick: None }],
- Skill::Absorb => vec![ConstructEffect {effect: Effect::Absorb, duration: 2,
+ Skill::Absorb => vec![ConstructEffect {effect: Effect::Absorb, duration: 1,
meta: Some(EffectMeta::Skill(Skill::Absorption)), tick: None}],
- Skill::AbsorbPlus => vec![ConstructEffect {effect: Effect::Absorb, duration: 3,
+ Skill::AbsorbPlus => vec![ConstructEffect {effect: Effect::Absorb, duration: 1,
meta: Some(EffectMeta::Skill(Skill::AbsorptionPlus)), tick: None}],
- Skill::AbsorbPlusPlus => vec![ConstructEffect {effect: Effect::Absorb, duration: 4,
+ Skill::AbsorbPlusPlus => vec![ConstructEffect {effect: Effect::Absorb, duration: 1,
meta: Some(EffectMeta::Skill(Skill::AbsorptionPlusPlus)), tick: None}],
Skill::Absorption => vec![ConstructEffect {effect: Effect::Absorption, duration: 3, meta: None, tick: None}],
@@ -993,9 +1008,9 @@ impl Skill {
meta: Some(EffectMeta::Skill(Skill::BashPlusPlus)), tick: None}],
Skill::Stun => vec![ConstructEffect {effect: Effect::Stun, duration: 2, meta: None, tick: None}],
- Skill::Intercept => vec![ConstructEffect {effect: Effect::Intercept, duration: 2, meta: None, tick: None}],
- Skill::InterceptPlus => vec![ConstructEffect {effect: Effect::Intercept, duration: 3, meta: None, tick: None}],
- Skill::InterceptPlusPlus => vec![ConstructEffect {effect: Effect::Intercept, duration: 4, meta: None, tick: None}],
+ Skill::Intercept => vec![ConstructEffect {effect: Effect::Intercept, duration: 1, meta: None, tick: None}],
+ Skill::InterceptPlus => vec![ConstructEffect {effect: Effect::Intercept, duration: 1, meta: None, tick: None}],
+ Skill::InterceptPlusPlus => vec![ConstructEffect {effect: Effect::Intercept, duration: 1, meta: None, tick: None}],
Skill::Triage => vec![ConstructEffect {effect: Effect::Triage, duration: 2,
meta: Some(EffectMeta::Skill(Skill::TriageTick)), tick: None}],
@@ -1062,9 +1077,11 @@ impl Skill {
Skill::Invert=> Some(2),
Skill::InvertPlus => Some(2),
Skill::InvertPlusPlus => Some(2),
- Skill::Decay=> Some(1), // dot
- Skill::DecayPlus => Some(1),
- Skill::DecayPlusPlus => Some(1),
+
+ Skill::Decay=> None, // dot
+ Skill::DecayPlus => None,
+ Skill::DecayPlusPlus => None,
+
Skill::Siphon|
Skill::SiphonPlus |
Skill::SiphonPlusPlus => None,
@@ -1091,7 +1108,7 @@ impl Skill {
Skill::Banish |
Skill::BanishPlus |
- Skill::BanishPlusPlus => Some(2),
+ Skill::BanishPlusPlus => Some(1),
Skill::Haste=> Some(1),
Skill::HastePlus => Some(1),
@@ -1121,9 +1138,9 @@ impl Skill {
Skill::SustainPlus |
Skill::SustainPlusPlus => Some(1),
- Skill::Intercept=> Some(2),
- Skill::InterceptPlus => Some(2),
- Skill::InterceptPlusPlus => Some(2),
+ Skill::Intercept=> Some(1),
+ Skill::InterceptPlus => Some(1),
+ Skill::InterceptPlusPlus => Some(1),
Skill::Electrify |
Skill::ElectrifyPlus |
@@ -1394,7 +1411,7 @@ fn sustain(source: &mut Construct, target: &mut Construct, mut results: Resoluti
}
_ => {
warn!("no recharge event found {:?}", e);
- return results;
+ EventStages::NoStages
}
};
@@ -1416,7 +1433,7 @@ fn intercept(source: &mut Construct, target: &mut Construct, mut results: Resolu
}
_ => {
warn!("no recharge event found {:?}", e);
- return results;
+ EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));
@@ -1675,6 +1692,19 @@ fn ruin(source: &mut Construct, target: &mut Construct, mut results: Resolutions
fn absorb(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions {
results.push(Resolution::new(source, target).event(target.add_effect(skill, skill.effect()[0])));
+ let blue_amount = source.blue_power().pct(skill.multiplier());
+ let e = target.recharge(skill, 0, blue_amount);
+ let stages = match e {
+ Event::Recharge { red, blue, skill: _ } => {
+ if red > 0 || blue > 0 { EventStages::PostOnly }
+ else { EventStages::NoStages }
+ }
+ _ => {
+ warn!("no recharge event found {:?}", e);
+ EventStages::NoStages
+ }
+ };
+ results.push(Resolution::new(source, target).event(e).stages(stages));
return results;;
}
@@ -1721,7 +1751,7 @@ fn reflect(source: &mut Construct, target: &mut Construct, mut results: Resoluti
}
_ => {
warn!("no recharge event found {:?}", e);
- return results;
+ EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));
@@ -1739,7 +1769,7 @@ fn recharge(source: &mut Construct, target: &mut Construct, mut results: Resolut
}
_ => {
warn!("no recharge event found {:?}", e);
- return results;
+ EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));
@@ -1794,13 +1824,19 @@ fn link(source: &mut Construct, target: &mut Construct, mut results: Resolutions
None => 0
};
- target.deal_blue_damage(skill, swap)
- .into_iter()
- .for_each(|e| results.push(Resolution::new(source, target).event(e)));
-
- source.deal_green_damage(skill, swap)
- .into_iter()
- .for_each(|e| results.push(Resolution::new(source, source).event(e).stages(EventStages::PostOnly)));
+ let link_events = target.deal_blue_damage(skill, swap);
+ for e in link_events {
+ match e {
+ Event::Damage { amount, mitigation: _, colour: _, skill: _ } => {
+ results.push(Resolution::new(source, target).event(e));
+ let heal = source.deal_green_damage(skill, amount);
+ for h in heal {
+ results.push(Resolution::new(source, source).event(h).stages(EventStages::PostOnly));
+ };
+ },
+ _ => results.push(Resolution::new(source, target).event(e)),
+ }
+ }
results.push(Resolution::new(source, source)
.event(source.add_effect(skill, skill.effect()[0])).stages(EventStages::PostOnly));
@@ -2076,6 +2112,7 @@ mod tests {
x.blue_power.force(256);
x.green_power.force(220);
x.green_life.force(1024);
+ y.blue_life.force(0);
x.green_life.reduce(512);
let mut results = resolve(Skill::Siphon, &mut x, &mut y, vec![]);
diff --git a/server/src/vbox.rs b/server/src/vbox.rs
index 162f48de..3488b14d 100644
--- a/server/src/vbox.rs
+++ b/server/src/vbox.rs
@@ -99,8 +99,8 @@ impl Vbox {
self
}
- pub fn accept(&mut self, i: usize, j: usize) -> Result<&mut Vbox, Error> {
- if self.bound.len() >= 9 {
+ pub fn accept(&mut self, i: usize, j: usize, construct_id: Option) -> Result<&mut Vbox, Error> {
+ if self.bound.len() >= 9 && !construct_id.is_some() {
return Err(err_msg("too many items bound"));
}
@@ -130,7 +130,7 @@ impl Vbox {
pub fn bot_accept(&mut self, i: usize) -> Result<&mut Vbox, Error> {
let buy_index = self.free[i].iter().position(|item| item.is_some());
- self.accept(i, buy_index.expect("no valid buys"))
+ self.accept(i, buy_index.expect("no valid buys"), None)
}
pub fn reclaim(&mut self, i: usize) -> Result<&mut Vbox, Error> {
@@ -181,9 +181,9 @@ pub fn vbox_discard(tx: &mut Transaction, account: &Account, instance_id: Uuid)
return instance_update(tx, instance);
}
-pub fn vbox_accept(tx: &mut Transaction, account: &Account, instance_id: Uuid, group: usize, index: usize) -> Result {
+pub fn vbox_accept(tx: &mut Transaction, account: &Account, instance_id: Uuid, group: usize, index: usize, construct_id: Option) -> Result {
let instance = instance_get(tx, instance_id)?
- .vbox_accept(account.id, group, index)?;
+ .vbox_accept(account.id, group, index, construct_id)?;
return instance_update(tx, instance);
}
@@ -205,9 +205,9 @@ pub fn vbox_apply(tx: &mut Transaction, account: &Account, instance_id: Uuid, co
return instance_update(tx, instance);
}
-pub fn vbox_unequip(tx: &mut Transaction, account: &Account, instance_id: Uuid, construct_id: Uuid, target: Item) -> Result {
+pub fn vbox_unequip(tx: &mut Transaction, account: &Account, instance_id: Uuid, construct_id: Uuid, target: Item, target_construct_id: Option) -> Result {
let instance = instance_get(tx, instance_id)?
- .vbox_unequip(account.id, target, construct_id)?;
+ .vbox_unequip(account.id, target, construct_id, target_construct_id)?;
return instance_update(tx, instance);
}
diff --git a/server/src/warden.rs b/server/src/warden.rs
index 38779346..ff4b2760 100644
--- a/server/src/warden.rs
+++ b/server/src/warden.rs
@@ -112,6 +112,10 @@ impl Warden {
pair.0.tx.send(msg.clone())?;
pair.1.tx.send(msg)?;
+ // send msgs for browser notifications
+ pair.0.tx.send(RpcMessage::QueueFound(()))?;
+ pair.1.tx.send(RpcMessage::QueueFound(()))?;
+
Ok(())
}
}