From 79f96a2ee04412ca79b5e9e51ab812d48e6a0230 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 30 Dec 2018 14:56:57 +1100 Subject: [PATCH 1/2] add joinable check to zone --- server/src/zone.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/server/src/zone.rs b/server/src/zone.rs index 3d432cac..59c5ac93 100644 --- a/server/src/zone.rs +++ b/server/src/zone.rs @@ -139,6 +139,10 @@ pub fn zone_update(zone: &Zone, tx: &mut Transaction) -> Result<(), Error> { pub fn zone_join(params: ZoneJoinParams, tx: &mut Transaction, account: &Account) -> Result { let mut zone = zone_get(tx, params.zone_id)?; + if !node_joinable(&zone.graph, NodeIndex::from(params.node_id)) { + return Err(err_msg("not not joinable")); + } + let mut game = game_pve_new(params.cryp_ids, PveMode::Normal, tx, account)?; game.set_zone(zone.id, params.node_id); @@ -159,7 +163,7 @@ pub fn zone_join(params: ZoneJoinParams, tx: &mut Transaction, account: &Account return Ok(game); } -pub fn zone_close(params: ZoneCloseParams, tx: &mut Transaction, account: &Account) -> Result<(), Error> { +pub fn zone_close(params: ZoneCloseParams, tx: &mut Transaction, _account: &Account) -> Result<(), Error> { let mut zone = zone_get(tx, params.zone_id)?; zone.active = false; zone_update(&zone, tx)?; @@ -191,7 +195,7 @@ pub fn create_zone_graph() -> ZoneGraph { return gr; } -pub fn node_joinable(graph: &mut ZoneGraph, target_index: NodeIndex) -> bool { +pub fn node_joinable(graph: &ZoneGraph, target_index: NodeIndex) -> bool { // early return for already attempted { let target_encounter = match graph.node_weight(target_index) { @@ -199,8 +203,6 @@ pub fn node_joinable(graph: &mut ZoneGraph, target_index: NodeIndex) -> bool { None => panic!("{:?} has no weight for {:?}", graph, target_index), }; - println!("{:?}", target_encounter); - if target_encounter.game_id.is_some() { return false; } @@ -216,8 +218,6 @@ pub fn node_joinable(graph: &mut ZoneGraph, target_index: NodeIndex) -> bool { } }); - println!("{:?}", filtered); - // if a node is a neighbour of that graph // and hasn't been attempted // it is joinable @@ -248,8 +248,8 @@ mod tests { #[test] fn zone_joinable_test() { - let mut graph = create_zone_graph(); - assert!(node_joinable(&mut graph, NodeIndex::from(1))); - assert!(!node_joinable(&mut graph, NodeIndex::from(2))); + let graph = create_zone_graph(); + assert!(node_joinable(&graph, NodeIndex::from(1))); + assert!(!node_joinable(&graph, NodeIndex::from(2))); } } From 1f180402b3ca3f0f35e5bc9fdee19a45d024bdfc Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 30 Dec 2018 15:15:34 +1100 Subject: [PATCH 2/2] smarter joinable algo --- client/src/scenes/cryps.js | 6 ++++++ client/src/scenes/menu.game.list.js | 2 -- client/src/scenes/missions.js | 3 +-- server/src/zone.rs | 9 +++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/src/scenes/cryps.js b/client/src/scenes/cryps.js index 802b3fe8..f10e0921 100644 --- a/client/src/scenes/cryps.js +++ b/client/src/scenes/cryps.js @@ -3,6 +3,7 @@ const Phaser = require('phaser'); const Header = require('./header'); const Menu = require('./menu'); const Combat = require('./combat'); +const Missions = require('./missions'); function renderCryps() { const config = { @@ -35,6 +36,11 @@ function renderCryps() { if (!data || game.registry.get('inGame')) return false; return game.scene.add('Combat', Combat, true); } + + if (key === 'zone') { + return game.scene.add('Missions', Missions, true, data); + } + return true; } diff --git a/client/src/scenes/menu.game.list.js b/client/src/scenes/menu.game.list.js index 1ef465c2..47ba4705 100644 --- a/client/src/scenes/menu.game.list.js +++ b/client/src/scenes/menu.game.list.js @@ -1,5 +1,4 @@ const Phaser = require('phaser'); -const Missions = require('./missions'); const { TEXT, @@ -123,7 +122,6 @@ class MenuGameList extends Phaser.Scene { }); zones.on('pointerdown', () => { - this.scene.add('Missions', Missions, true); return ws.sendAccountZone(); }); diff --git a/client/src/scenes/missions.js b/client/src/scenes/missions.js index 4aff968a..5dde1f03 100644 --- a/client/src/scenes/missions.js +++ b/client/src/scenes/missions.js @@ -15,8 +15,7 @@ class Missions extends Phaser.Scene { this.load.image('eye', 'https://labs.phaser.io/assets/particles/green-orb.png'); } - create() { - const zone = this.registry.get('zone'); + create(zone) { if (!zone) return false; this.scene.manager.add('MissionControls', MissionControls, true); diff --git a/server/src/zone.rs b/server/src/zone.rs index 59c5ac93..3c7c4ae1 100644 --- a/server/src/zone.rs +++ b/server/src/zone.rs @@ -208,11 +208,8 @@ pub fn node_joinable(graph: &ZoneGraph, target_index: NodeIndex) -> bool { } } - // now check the graph for connectedness - // get all the nodes that have been successfully completed - let mut filtered = graph.clone(); - filtered.retain_nodes(|g, i| { - match g.node_weight(i) { + let success_indices = graph.node_indices().filter(|i| { + match graph.node_weight(*i) { Some(encounter) => encounter.success, None => panic!("no weight for {:?}", i), } @@ -221,7 +218,7 @@ pub fn node_joinable(graph: &ZoneGraph, target_index: NodeIndex) -> bool { // if a node is a neighbour of that graph // and hasn't been attempted // it is joinable - for i in filtered.node_indices() { + for i in success_indices { match graph.neighbors(i).find(|n| *n == target_index) { Some(_n) => return true, None => continue,