From ac8238fb960d5b952dbaafc25d6019171dbc4b5b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 27 Nov 2020 20:51:17 +0000 Subject: [PATCH] quieten highlighting for only grasp/ungrasp Signed-off-by: Ian Jackson --- src/api.rs | 2 +- src/updates.rs | 5 +++++ templates/script.ts | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/api.rs b/src/api.rs index cbb48b43..4ffc338f 100644 --- a/src/api.rs +++ b/src/api.rs @@ -250,7 +250,7 @@ impl ApiPieceOp for ApiPieceGrab { if pc.held.is_some() { throw!(OnlineError::PieceHeld) } pc.held = Some(player); - let update = PieceUpdateOp::Modify(()); + let update = PieceUpdateOp::ModifyQuiet(()); let logent = LogEntry { html : Html(format!("{} grasped {}", diff --git a/src/updates.rs b/src/updates.rs index c6ee500b..09b108c1 100644 --- a/src/updates.rs +++ b/src/updates.rs @@ -69,6 +69,7 @@ pub enum PieceUpdateOp { Delete(), Insert(NS), Modify(NS), + ModifyQuiet(NS), Move(Pos), SetZLevel(ZL), } @@ -203,6 +204,7 @@ impl PieceUpdateOp { Delete() => None, Insert(ns) => Some(ns), Modify(ns) => Some(ns), + ModifyQuiet(ns) => Some(ns), Move(_) => None, SetZLevel(_) => None, } @@ -217,6 +219,7 @@ impl PieceUpdateOp { Delete() => Delete(), Insert(ns) => Insert(f(ns)?), Modify(ns) => Modify(f(ns)?), + ModifyQuiet(ns) => ModifyQuiet(f(ns)?), Move(pos) => Move(pos), SetZLevel(zl) => SetZLevel(g(zl)?), }) @@ -227,6 +230,7 @@ impl PieceUpdateOp { Delete() => Delete(), Insert(ns) => Insert(ns), Modify(ns) => Modify(ns), + ModifyQuiet(ns) => ModifyQuiet(ns), Move(pos) => Move(*pos), SetZLevel(zl) => SetZLevel(zl), } @@ -251,6 +255,7 @@ impl PieceUpdateOp { Delete() => None, Insert(_) => None, Modify(_) => None, + ModifyQuiet(_) => None, Move(_) => None, SetZLevel(l) => Some(l.borrow().zg), } diff --git a/templates/script.ts b/templates/script.ts index 8e389bf5..c1d93d92 100644 --- a/templates/script.ts +++ b/templates/script.ts @@ -891,9 +891,15 @@ type PieceStateMessage = { uos: UoDescription[], } +pieceops.ModifyQuiet = function +(piece: PieceId, p: PieceInfo, info: PieceStateMessage) { + console.log('PIECE UPDATE MODIFY QUIET ',piece,info) + piece_modify(piece, p, info, false); +} + pieceops.Modify = function (piece: PieceId, p: PieceInfo, info: PieceStateMessage) { - console.log('PIECE UPDATE MODIFY ',piece,info) + console.log('PIECE UPDATE MODIFY LOuD ',piece,info) piece_note_moved(piece,p); piece_modify(piece, p, info, false); } -- 2.30.2