aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation/properties.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation/properties.rs')
-rw-r--r--src/federation/properties.rs13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/federation/properties.rs b/src/federation/properties.rs
index b45b664..91e038e 100644
--- a/src/federation/properties.rs
+++ b/src/federation/properties.rs
@@ -161,8 +161,17 @@ pub(super) fn generate_at(rng: &mut Rng, kind: Kind, revision: Option<Revision>)
.collect();
let roll = rng.below(100);
let event = if roll < 4 {
- // A node merges, its party's or not.
- harness::merge(&party.name, rng.below(10) as u8, &deps)
+ // A node merges: one its party lists there, more often than not, else any.
+ let listed = world.state_at(&deps).nodes_of(&party.name, &current);
+ let ours: Vec<u8> = (0..10)
+ .filter(|seed| listed.contains(&harness::node_id(*seed)))
+ .collect();
+ let seed = if !ours.is_empty() && rng.chance(0.75) {
+ *rng.pick(&ours)
+ } else {
+ rng.below(10) as u8
+ };
+ harness::merge(&party.name, seed, &deps)
} else if roll < 35 || (roll >= 60 && mine.is_empty()) {
let path = format!("home/{}/k{}", party.name, rng.below(3));
writer.write(&deps, &path, harness::str(&step.to_string()))