Merge tag '1.14.1' into develop

1.14.1

VERSION

@@ -1 +1 @@
-1.13.0
+1.14.1

acp/package.json

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

client/assets/styles/controls.less

@@ -27,7 +27,7 @@ aside {
             flex-flow: column;;
         }
 
-        grid-template-rows: min-content 3fr 3fr 1fr;
+        grid-template-rows: min-content 1fr 1fr min-content;
         grid-gap: 0.5em 0;
     }
 
@@ -132,7 +132,7 @@ aside {
 
     .ready {
         flex: 1;
-        font-size: 200%;
+        font-size: 2.5em;
     }
 
     .quit {

client/package.json

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

client/src/components/account.box.jsx

@@ -59,8 +59,13 @@ class AccountAvatar extends Component {
     }
 
     componentDidMount() {
+        const startIdle = () => {
             this.idle = idleAnimation(this.props.account.id);
-        return this.animations.push(this.idle);
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

client/src/components/anims/idle.jsx

@@ -1,8 +1,9 @@
 const anime = require('animejs').default;
 
 function idle(id) {
-    const duration = anime.random(2000, 18000);
+    const duration = anime.random(2000, 8000);
     const target = document.getElementById(id);
+
     return anime({
         targets: target,
         translateX: () => anime.random(-20, 20),
@@ -10,8 +11,7 @@ function idle(id) {
         rotate: () => anime.random(-15, 15),
         duration,
         direction: 'alternate',
-        easing: 'linear',
+        easing: 'easeInOutSine',
-        loop: true,
     });
 }
 

client/src/components/construct.jsx

@@ -48,8 +48,13 @@ class ConstructAvatar extends Component {
     }
 
     componentDidMount() {
+        const startIdle = () => {
             this.idle = idleAnimation(this.props.construct.id);
-        return this.animations.push(this.idle);
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

client/src/components/front.page.jsx

@@ -22,7 +22,7 @@ const addState = connect(
         }
 
         return {
-            promptRegister: tutorial === 99, // see events
+            promptRegister: !tutorial, // see events
             account,
             sendInstancePractice,
         };

client/src/components/game.ctrl.btns.jsx

@@ -98,7 +98,7 @@ function GameCtrlBtns(args) {
     return (
         <div class="game-ctrl-btns">
             <button disabled={!account.subscribed} onClick={() => setChatShow(!chatShow)}>Chat</button>
-            <button disabled={animating} onClick={sendGameSkillClear}>Clear</button>
+            <button disabled={finished || animating} onClick={sendGameSkillClear}>Clear</button>
             {finished ? quitBtn : readyBtn}
         </div>
     );

client/src/components/mnni.jsx

@@ -34,8 +34,13 @@ class MnniAvatatr extends Component {
     }
 
     componentDidMount() {
+        const startIdle = () => {
             this.idle = idleAnimation('mnni');
-        return this.animations.push(this.idle);
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

client/src/components/player.box.jsx

@@ -37,8 +37,13 @@ class Img extends Component {
     }
 
     componentDidMount() {
+        const startIdle = () => {
             this.idle = idleAnimation(this.props.id);
-        return this.animations.push(this.idle);
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

client/src/events.jsx

@@ -166,9 +166,12 @@ function registerEvents(store) {
     function setInvite(code) {
         if (!code) return store.dispatch(actions.setInvite(null));
         const link = `${document.location.origin}#join=${code}`;
+
+        if (navigator.clipboard) {
             navigator.clipboard.writeText(link).then(() => {
-            notify('Your invite code was copied to the clipboard.');
+                notify('Invite link copied to clipboard.');
             }, () => {});
+        }
 
         return store.dispatch(actions.setInvite(code));
     }

client/src/socket.jsx

@@ -349,6 +349,7 @@ function createSocket(events) {
         sendItemInfo();
 
         events.urlHashChange();
+        events.setPvp(false);
 
         return true;
     }

client/src/tutorial.utils.jsx

@@ -97,6 +97,7 @@ function tutorialVbox(player, store, tutorial) {
     if (stage === 7) {
         if (vbox.bits < 25)  {
             stage += 1;
+            setTimeout(() => store.dispatch(actions.setTutorial(null)), 4000);
         } else {
             vbox.store.Colours = {};
             vbox.store.Skills = {};

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mnml_core"
-version = "1.13.0"
+version = "1.14.1"
 authors = ["ntr <ntr@smokestack.io>", "mashy <mashy@mnml.gg>"]
 
 [dependencies]

core/src/effect.rs

@@ -121,13 +121,7 @@ impl Effect {
     }
 
     pub fn disables_skill(&self, skill: Skill) -> bool {
-        if skill.is_tick() {
+        if !skill.can_be_disabled() {
-            return false;
-        }
-
-        // electrocute always goes off baybee
-        // even if you are stunned particularly
-        if [Skill::Electrocute, Skill::ElectrocutePlus, Skill::ElectrocutePlusPlus].contains(&skill) {
             return false;
         }
 

core/src/game.rs

@@ -804,7 +804,7 @@ impl Game {
         }
     }
 
-    fn finish(mut self) -> Game {
+    pub fn finish(mut self) -> Game {
         self.phase = Phase::Finished;
         // self.log.push(format!("Game finished."));
 
@@ -835,7 +835,7 @@ impl Game {
             return self;
         }
 
-        info!("upkeep game: {:} vs {:}", self.players[0].name, self.players[1].name);
+        info!("upkeep {:?} {:} vs {:}", self.id, self.players[0].name, self.players[1].name);
 
         for player in self.players.iter_mut() {
             if !player.ready {
@@ -2335,13 +2335,23 @@ mod tests {
             },
             _ => false,
         }));
+    }
 
-/*        assert!(match game.players[1].constructs[0].effects[0].meta {
+    #[test]
-            Some(EffectMeta::AddedDamage(d)) => d,
+    fn absorb_silence_test() {
-            _ => 0
+        let mut game = create_2v2_test_game();
-            // 320 base blue power and 125 base blue life
+        let player_id = game.players[0].id;
-        } == 320.pct(Skill::Blast.multiplier()) - 125);*/
+        let target_player_id = game.players[1].id;
 
+        let source = game.players[0].constructs[0].id;
+        let target = game.players[1].constructs[0].id;
+
+        game.new_resolve(Cast::new(target, player_id, target, Skill::Absorb));
+        assert!(game.construct_by_id(target).unwrap().affected(Effect::Absorb));
+
+        game.new_resolve(Cast::new(source, target_player_id, target, Skill::Silence));
+        assert!(game.construct_by_id(target).unwrap().affected(Effect::Silence));
+        assert!(game.construct_by_id(target).unwrap().affected(Effect::Absorption));
     }
 
     #[test]

core/src/skill.rs

@@ -834,6 +834,22 @@ impl Skill {
         }
     }
 
+    pub fn can_be_disabled(self) -> bool {
+        match self {
+            Skill::ElectrocuteTick |
+            Skill::DecayTick |
+            Skill::SiphonTick |
+            Skill::TriageTick |
+            Skill::Electrocute |
+            Skill::ElectrocutePlus |
+            Skill::ElectrocutePlusPlus |
+            Skill::Absorption |
+            Skill::AbsorptionPlus |
+            Skill::AbsorptionPlusPlus => false,
+            _ => true,
+        }
+    }
+
     pub fn additional_skill(&self, effect: Effect) -> Option<Skill> {
         match effect {
             Effect::Haste => match self {

ops/package.json

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

server/Cargo.toml

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

server/src/warden.rs

@@ -13,6 +13,7 @@ use pg::{
     PgPool,
 
     games_need_upkeep,
+    game_get,
     game_update,
     game_write,
     game_delete,
@@ -157,6 +158,12 @@ fn fetch_instances(mut tx: Transaction) -> Result<Transaction, Error> {
     }
 
     for mut instance in instances_idle(&mut tx)? {
+        if let Some(game_id) = instance.current_game_id() {
+            let mut game = game_get(&mut tx, game_id)?;
+            game = game.finish();
+            game_update(&mut tx, &game)?;
+        }
+
         instance.finish();
         instance_update(&mut tx, instance)?;
     }

studios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-studios",
-  "version": "1.13.0",
+  "version": "1.14.1",
   "description": "",
   "main": "index.js",
   "scripts": {