diff options
Diffstat (limited to 'server/tools/src/recipe_diagram.rs')
| -rw-r--r-- | server/tools/src/recipe_diagram.rs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/server/tools/src/recipe_diagram.rs b/server/tools/src/recipe_diagram.rs index 903b869a..b463e3b6 100644 --- a/server/tools/src/recipe_diagram.rs +++ b/server/tools/src/recipe_diagram.rs @@ -19,7 +19,7 @@ use anyhow::Result; use hurrycurry_protocol::{ Gamedata, ItemIndex, Message, Recipe, RecipeIndex, - book::{Diagram, DiagramEdge, DiagramNode, EdgeStyle, NodeStyle}, + book::{Diagram, DiagramEdge, DiagramNode, NodeStyle}, glam::Vec2, }; use hurrycurry_server::data::Serverdata; @@ -104,7 +104,6 @@ pub(crate) fn recipe_diagram( src: item_index[&i], dst: item_index[&r.outputs[0]], label: None, - style: EdgeStyle::Regular, }); } continue; @@ -113,11 +112,11 @@ pub(crate) fn recipe_diagram( && r.inputs.len() == 1 && r.outputs.len() == 1 { + diag.nodes[item_index[&r.inputs[0]]].style = NodeStyle::ProcessPassive; diag.edges.push(DiagramEdge { src: item_index[&r.inputs[0]], dst: item_index[&r.outputs[0]], label: None, - style: EdgeStyle::ProcessPassive, }); continue; } @@ -142,7 +141,6 @@ pub(crate) fn recipe_diagram( src: item_index[&i], dst: index, label: None, - style: EdgeStyle::Regular, }); } for o in r.outputs { @@ -150,7 +148,6 @@ pub(crate) fn recipe_diagram( src: index, dst: item_index[&o], label: None, - style: EdgeStyle::Regular, }); } } @@ -188,10 +185,10 @@ fn merge_combine_clusters(diag: &mut Diagram) { if outputs .iter() - .all(|&(ei, ni)| diag.nodes[ni].style.is_procuct() && diag.edges[ei].style.is_regular()) - && inputs.iter().all(|&(ei, ni)| { - diag.nodes[ni].style.is_procuct() && diag.edges[ei].style.is_regular() - }) + .all(|&(ei, ni)| diag.nodes[ni].style.is_procuct()) + && inputs + .iter() + .all(|&(ei, ni)| diag.nodes[ni].style.is_procuct()) { let mut to_remove = inputs .iter() @@ -214,7 +211,6 @@ fn merge_combine_clusters(diag: &mut Diagram) { src: input.1, dst: output.1, label: None, - style: EdgeStyle::Regular, }); } } |