diff --git a/client/lib/fizzy-text.js b/client/lib/fizzy-text.js index 4afcb75f..bee34d8e 100644 --- a/client/lib/fizzy-text.js +++ b/client/lib/fizzy-text.js @@ -7,7 +7,7 @@ function fizzyText(message) { // Notice they're all defined with "this". That makes them public. // Otherwise, gui-dat can't see them. - this.growthSpeed = 0.4; // how fast do particles change size? + this.growthSpeed = 0.8; // how fast do particles change size? this.minSize = 1; this.maxSize = 4; // how big can they get? this.noiseStrength = 10; // how turbulent is the flow? @@ -157,8 +157,7 @@ function fizzyText(message) { // var angle = -Math.PI/2; // Are we within the boundaries of the image? - const onScreen = this.x > 0 && this.x < width - && this.y > 0 && this.y < height; + const onScreen = this.x > 0 && this.x < width && this.y > 0 && this.y < height; const isBlack = c !== 'rgb(255,255,255)' && onScreen; diff --git a/server/src/rpc.rs b/server/src/rpc.rs index 85e8acbe..03f27b2e 100755 --- a/server/src/rpc.rs +++ b/server/src/rpc.rs @@ -10,31 +10,6 @@ use battle::{Battle}; use combat::{pve}; use account::{Account, create, login, from_token}; -// struct Replier where T: Fn(RpcResponse) { -// send: T, -// msg: RpcResponse, -// } - -// impl Replier where T: Fn(RpcResponse) { -// fn new(send: T) -> Replier { -// Replier { -// send, -// msg: None, -// } -// } - -// fn msg(&mut self, arg: u32) -> u32 { -// match self.msg { -// Some(v) => v, -// None => { -// let v = (self.calculation)(arg); -// self.msg = Some(v); -// v -// }, -// } -// } -// } - pub struct Rpc; impl Rpc {