jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

75 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `2176d9a94bd9`

tarball

atagen <boss@atagen.co>2026-10-14 11:12 UTC

4 files changed+98-41

game: announce Mum at the door and keep her away on the turn she left

Dismissing Mum in answer_door ran before the turn's settle, so the same request could roll a fresh summon and send her straight back. Her arrival also had no telling, so the errand only surfaced on the next knock. Each errand is now one knock/parting pair so the arrival Warning and the parting always match.

Modified file: src/game/household.rs+52 additions−40 deletions@@ -86,53 +86,61 @@ fn is_truth(spoken: &str) -> bool {
 /// Why Mum came to the door, and how she leaves once she believes you.
 #[derive(Clone, Copy)]
 pub struct Errand {
+    pub(crate) arrival: &'static str,
     pub(crate) knock: &'static str,
     pub(crate) parting: &'static str,
 }
 
-pub const HEARD_A_NOISE: Errand = Errand {
-    knock: "She heard a noise.",
-    parting: "Mum seems satisfied. It must have been the pipes.",
-};
-const VIRAL: Errand = Errand {
-    knock: "A neighbour has sent her something.",
-    parting: "Mum seems satisfied. She has decided not to open the attachment.",
-};
+macro_rules! errand {
+    ($knock:literal, $parting:literal) => {
+        Errand {
+            arrival: concat!("Mum is at the door. ", $knock),
+            knock: $knock,
+            parting: concat!("Mum seems satisfied. ", $parting),
+        }
+    };
+}
+
+pub const HEARD_A_NOISE: Errand = errand!("She heard a noise.", "It must have been the pipes.");
+const VIRAL: Errand = errand!(
+    "A neighbour has sent her something.",
+    "She has decided not to open the attachment."
+);
 const BEDROOM_ERRANDS: [Errand; 4] = [
-    Errand {
-        knock: "She has brought your washing.",
-        parting: "Mum seems satisfied. She leaves the washing on the chair.",
-    },
-    Errand {
-        knock: "She wants to know if you have eaten.",
-        parting: "Mum seems satisfied. There will be a plate in the oven.",
-    },
-    Errand {
-        knock: "She needs the wifi password.",
-        parting: "Mum seems satisfied. She has written the wifi password on her hand.",
-    },
-    Errand {
-        knock: "She would like to talk about your future.",
-        parting: "Mum seems satisfied. The future can wait until dinner.",
-    },
+    errand!(
+        "She has brought your washing.",
+        "She leaves the washing on the chair."
+    ),
+    errand!(
+        "She wants to know if you have eaten.",
+        "There will be a plate in the oven."
+    ),
+    errand!(
+        "She wants the wifi password.",
+        "She has written the wifi password on her hand."
+    ),
+    errand!(
+        "She would like to talk about your future.",
+        "The future can wait until dinner."
+    ),
 ];
 const CHRISTMAS_ERRANDS: [Errand; 4] = [
-    Errand {
-        knock: "Nan would like to see you.",
-        parting: "Mum seems satisfied. She tells Nan you are on your way.",
-    },
-    Errand {
-        knock: "Christmas dinner is in ten minutes.",
-        parting: "Mum seems satisfied. She will save you a pig in a blanket.",
-    },
-    Errand {
-        knock: "The King's speech is about to start.",
-        parting: "Mum seems satisfied. She will tell you what the King said.",
-    },
-    Errand {
-        knock: "An uncle has asked where you went.",
-        parting: "Mum seems satisfied. She tells the uncle you are helping in the kitchen.",
-    },
+    errand!(
+        "Nan would like to see you.",
+        "She tells Nan you are on your way."
+    ),
+    errand!(
+        "Christmas dinner is in ten minutes.",
+        "She will save you a pig in a blanket."
+    ),
+    errand!(
+        "The King's speech is about to start.",
+        "She will tell you what the King said."
+    ),
+    errand!(
+        "An uncle has asked where you went.",
+        "She tells the uncle you are helping in the kitchen."
+    ),
 ];
 
 #[derive(Default)]
@@ -140,6 +148,8 @@ pub struct Household {
     pub(crate) mum: Option<MumVisit>,
     /// Every excuse Mum has accepted this run. Digest Mum remembers them all.
     pub(crate) heard: Vec<Excuse>,
+    /// Set when the request now being answered sent Mum away, so the same turn cannot fetch her back.
+    pub(crate) just_left: bool,
 }
 
 pub struct MumVisit {
@@ -227,6 +237,7 @@ impl Run {
 
     /// Mum answers every request on the run until she has been given something she believes.
     pub fn answer_door(&mut self, authorization: Option<&str>) -> Result<(), Problem> {
+        self.household.just_left = false;
         if self.household.mum.is_none() {
             return Ok(());
         }
@@ -380,6 +391,7 @@ impl Run {
         if let Some(visit) = self.household.mum.take() {
             self.notices
                 .push(Notice::MumSatisfied(visit.errand.parting));
+            self.household.just_left = true;
         }
         self.standing.suspicion = 0;
         self.touch();

Modified file: src/game/notice.rs+2 additions@@ -13,6 +13,7 @@ pub enum Notice {
     DrawerComesLoose,
     ThreadHasReplies,
     Reflection,
+    MumAtTheDoor(&'static str),
     MumSatisfied(&'static str),
     ColdStart,
     RunningLong(Floor),
@@ -34,6 +35,7 @@ impl Notice {
             Self::DrawerComesLoose => "The drawer comes loose. That took a while.",
             Self::ThreadHasReplies => "Somewhere, a forum thread from 2009 still has replies.",
             Self::Reflection => "the count reached ten, and then the reflection started",
+            Self::MumAtTheDoor(arrival) => arrival,
             Self::MumSatisfied(parting) => parting,
             Self::ColdStart => "Cold start. The server has noted this.",
             Self::RunningLong(floor) => match floor {

Modified file: src/game/progress.rs+2 additions−1 deletions@@ -171,7 +171,7 @@ impl Run {
 
     pub(super) fn maybe_summon_mum(&mut self) {
         let was_below = self.standing.at_turn_start < SUSPICION_LIMIT;
-        if !self.floor.has_mum() || self.household.mum.is_some() {
+        if !self.floor.has_mum() || self.household.mum.is_some() || self.household.just_left {
             return;
         }
         let summoned = was_below && self.standing.suspicion == SUSPICION_LIMIT;
@@ -190,6 +190,7 @@ impl Run {
             )
         {
             let errand = self.errand(summoned);
+            self.notices.push(Notice::MumAtTheDoor(errand.arrival));
             let nonce = self.fresh_nonce();
             self.household.mum = Some(MumVisit {
                 errand,

Modified file: src/tests/household.rs+42 additions@@ -446,3 +446,45 @@ async fn a_stale_nonce_is_explained_for_free() {
     .await;
     assert_eq!(current.status(), StatusCode::OK);
 }
+
+#[tokio::test]
+async fn mum_announces_herself_but_never_returns_on_the_turn_she_left() {
+    let mut arrivals = 0;
+    for seed in 0..200u64 {
+        let app = app_with(Floor::Bedroom, seed, |run| {
+            mum_at_the_door(run);
+            run.body.eq = 60;
+            run.here.brother_told = true;
+            run.standing.suspicion = 4;
+        });
+        let excused = send(
+            &app,
+            "JELQ",
+            "/runs/cafebabe?technique=stretch&intensity=10",
+            &[("authorization", "Excuse \"homework\"")],
+            "",
+        )
+        .await;
+        assert!(
+            excused.headers().get("www-authenticate").is_none(),
+            "seed {seed} fetched Mum straight back"
+        );
+        let again = send(
+            &app,
+            "JELQ",
+            "/runs/cafebabe?technique=stretch&intensity=10",
+            &[],
+            "",
+        )
+        .await;
+        if again.headers().get("www-authenticate").is_some() {
+            arrivals += 1;
+            assert!(
+                warnings(&again)
+                    .iter()
+                    .any(|w| w.contains("Mum is at the door. She"))
+            );
+        }
+    }
+    assert!(arrivals > 0, "Mum never came back at all");
+}

jelq

Commit 2176d9a94bd9

Commit `2176d9a94bd9`