jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

24 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `0d604ee39751`

tarball

atagen <boss@atagen.co>2026-10-10 15:15 UTC

8 files changed+107-20

game: close the ignore-Mum and cage key holes

Requests without Authorization used to be free while Mum waited, so ignoring her cost nothing and the floor could be left behind her back. The second search of Nan's drawer always handed over the cage key, and leaving Nan's caged with under £15 was a softlock because no other drawer could help.

Modified file: src/game/balance.rs+1

@@ -50,6 +50,7 @@ pub const RUPTURE_HOT: u32 = 10;

5050 pub const RUPTURE_PREMATURE: u32 = 3;

5151 pub const ZIP: u32 = 200;

5252 pub const RULER_IN_DRAWER: u32 = 2;

53+pub const KEY_IN_DRAWER: u32 = 3;

5354 pub const DEGLOVING: u32 = 60;

5455 pub const DEGLOVING_INTENSITY: i32 = 8;

5556 pub const WINDOW: u32 = 60;

Modified file: src/game/floors.rs+23 additions−9 deletions@@ -3,7 +3,10 @@ use serde_json::{Value, json};
 
 use super::{
     Cause, Elder, Floor, FloorState, Item, Outcome, Run,
-    balance::{FLOOR_ALLOWANCE, FLOOR_TURNS, RULER_IN_DRAWER, STARTING_EQ, ZIP},
+    balance::{
+        FLOOR_ALLOWANCE, FLOOR_TURNS, KEY_IN_DRAWER, RULER_IN_DRAWER, STARTING_EQ, SUSPICION_LIMIT,
+        ZIP,
+    },
     round2,
 };
 use crate::problem::Problem;
@@ -113,6 +116,9 @@ impl Run {
         self.here.drawer_searches += 1;
         self.touch();
         let first = self.here.drawer_searches == 1;
+        if self.items.cage {
+            return Ok(self.rummage_for_key());
+        }
         let ruler_here = self.floor == Floor::Bedroom && self.chance(RULER_IN_DRAWER);
         match self.floor {
             Floor::Bedroom if first && !self.items.ruler && ruler_here => {
@@ -143,13 +149,6 @@ impl Run {
                     "A small box. Inside was a cage. It is now on. The key is not in the box.",
                 ))
             }
-            Floor::Nans if self.items.cage => {
-                self.items.grant(Item::CageKey);
-                Ok(Outcome::json(
-                    StatusCode::OK,
-                    json!({ "detail": "The key was under where the box had been. The cage is off." }),
-                ))
-            }
             Floor::Hotel if first => {
                 self.items.grant(Item::DndSign);
                 self.items.grant(Item::IcePack);
@@ -192,8 +191,23 @@ impl Run {
         .header(header::LOCATION, self.path("")))
     }
 
+    /// Searching while caged is noisy, and the key only turns up some of the time.
+    fn rummage_for_key(&mut self) -> Outcome {
+        let was_below = self.suspicion < SUSPICION_LIMIT;
+        self.suspicion = (self.suspicion + 1).min(SUSPICION_LIMIT);
+        self.maybe_summon_mum(was_below);
+        if !self.chance(KEY_IN_DRAWER) {
+            return Outcome::empty(StatusCode::NO_CONTENT);
+        }
+        self.items.grant(Item::CageKey);
+        Outcome::json(
+            StatusCode::OK,
+            json!({ "detail": "The key was in the drawer. The cage is off." }),
+        )
+    }
+
     /// Whether searching the drawer on this floor would turn anything up.
     pub fn drawer_worth_searching(&self) -> bool {
-        self.here.drawer_searches == 0 || (self.floor == Floor::Nans && self.items.cage)
+        self.here.drawer_searches == 0 || self.items.cage
     }
 }

Modified file: src/game/household.rs+26 additions−7 deletions@@ -94,13 +94,28 @@ impl Run {
         let challenge = |p: Problem| p.header(header::WWW_AUTHENTICATE, &challenge_value);
 
         let Some(authorization) = authorization else {
-            return Err(challenge(
-                Problem::new(
+            let knocked_before = self.mum.as_ref().is_some_and(|visit| visit.knocked);
+            if let Some(visit) = &mut self.mum {
+                visit.knocked = true;
+            }
+            if !knocked_before {
+                self.touch();
+                return Err(challenge(
+                    Problem::new(
+                        StatusCode::UNAUTHORIZED,
+                        "someone-at-the-door",
+                        format!("Someone is at the door. {errand}"),
+                    )
+                    .with("inventory", self.path("/inventory")),
+                ));
+            }
+            return Err(self.strike(
+                challenge(Problem::new(
                     StatusCode::UNAUTHORIZED,
-                    "someone-at-the-door",
-                    format!("Someone is at the door. {errand}"),
-                )
-                .with("inventory", self.path("/inventory")),
+                    "knocking-again",
+                    format!("Mum is knocking again. {errand}"),
+                )),
+                Cause::Opened,
             ));
         };
 
@@ -173,6 +188,10 @@ impl Run {
     }
 
     fn mum_strike(&mut self, problem: Problem) -> Problem {
+        self.strike(problem, Cause::Caught)
+    }
+
+    fn strike(&mut self, problem: Problem, cause: Cause) -> Problem {
         self.touch();
         let Some(visit) = &mut self.mum else {
             return problem;
@@ -181,7 +200,7 @@ impl Run {
         if visit.strikes < PATIENCE {
             return problem;
         }
-        self.end(Cause::Caught)
+        self.end(cause)
     }
 
     fn leave_door(&mut self) {

Modified file: src/game/state.rs+7 additions−1 deletions@@ -151,6 +151,7 @@ pub struct MumVisit {
     pub errand: &'static str,
     pub nonce: String,
     pub strikes: u8,
+    pub knocked: bool,
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
@@ -179,6 +180,7 @@ pub enum Story {
 pub enum Cause {
     Ruptured { ice_unused: bool },
     Caught,
+    Opened,
     Banned,
     Degloved,
     Zip,
@@ -190,6 +192,7 @@ impl Cause {
         match self {
             Self::Ruptured { .. } => "vascular-event",
             Self::Caught => "caught",
+            Self::Opened => "opened",
             Self::Banned => "banned",
             Self::Degloved => "degloved",
             Self::Zip => "zip",
@@ -208,6 +211,9 @@ impl Cause {
             Self::Caught => {
                 "Mum has seen enough. The run has ended. Nobody will mention it at dinner."
             }
+            Self::Opened => {
+                "Mum has stopped knocking and opened the door. The run has ended. Nobody will mention it at dinner."
+            }
             Self::Banned => "Your account has been banned. The forum can tell. The run has ended.",
             Self::Degloved => {
                 "The outer layer has been removed in one piece. It will not be returning. The run has ended."
@@ -222,7 +228,7 @@ impl Cause {
     fn status(self) -> StatusCode {
         match self {
             Self::Ruptured { .. } => StatusCode::INTERNAL_SERVER_ERROR,
-            Self::Caught | Self::Degloved | Self::Abandoned => StatusCode::GONE,
+            Self::Caught | Self::Opened | Self::Degloved | Self::Abandoned => StatusCode::GONE,
             Self::Banned => StatusCode::FORBIDDEN,
             Self::Zip => StatusCode::CONFLICT,
         }

Modified file: src/game/turn.rs+2 additions−1 deletions@@ -365,7 +365,7 @@ impl Run {
         }
     }
 
-    fn maybe_summon_mum(&mut self, was_below: bool) {
+    pub(super) fn maybe_summon_mum(&mut self, was_below: bool) {
         if !self.floor.has_mum() || self.mum.is_some() {
             return;
         }
@@ -378,6 +378,7 @@ impl Run {
                 errand,
                 nonce,
                 strikes: 0,
+                knocked: false,
             });
         }
     }

Modified file: src/http/runs.rs+1−1

@@ -79,7 +79,7 @@ pub static TECHNIQUES: RunResource = home(&[Verb::new("GET", get_techniques)]);

7979 pub static DRAWER: RunResource = home(&[Verb::new("POST", search_drawer)]);

8080 pub static BRANCH: RunResource = home(&[Verb::new("POST", choose_branch)]);

8181 pub static FLOOR: RunResource =

82- pockets(&[Verb::new("GET", get_floor), Verb::new("POST", leave_floor)]);

82+ home(&[Verb::new("GET", get_floor), Verb::new("POST", leave_floor)]);

8383 pub static SHOP: RunResource = home(&[Verb::new("GET", get_shop)]);

8484 pub static BUY: RunResource = home(&[Verb::new("POST", buy)]);

8585 pub static PORTAL: RunResource = pockets(&[

Modified file: src/tests.rs+46 additions@@ -83,6 +83,7 @@ fn mum_at_the_door(run: &mut Run) {
         errand: "She heard a noise.",
         nonce: "abc".into(),
         strikes: 0,
+        knocked: false,
     });
 }
 
@@ -778,3 +779,48 @@ async fn links_hide_resources_that_would_do_nothing() {
     let rels = linked_rels(&send(&clinic, "GET", "/runs/cafebabe", &[], "").await);
     assert!(rels.contains(&"diagnosis".to_owned()) && rels.contains(&"thread".to_owned()));
 }
+
+#[tokio::test]
+async fn ignoring_mum_has_consequences() {
+    let app = seeded_with(Floor::Bedroom, |run| {
+        mum_at_the_door(run);
+        run.here.turns = 6;
+    });
+    let knock = send(&app, "GET", "/runs/cafebabe", &[], "").await;
+    assert_eq!(
+        json(knock).await["type"],
+        "https://jelq.dev/problems/someone-at-the-door"
+    );
+    let leave = send(&app, "POST", "/runs/cafebabe/floor", &[], "").await;
+    assert_eq!(
+        leave.status(),
+        StatusCode::UNAUTHORIZED,
+        "no leaving with Mum at the door"
+    );
+    send(&app, "GET", "/runs/cafebabe", &[], "").await;
+    let opened = send(&app, "GET", "/runs/cafebabe", &[], "").await;
+    assert_eq!(opened.status(), StatusCode::GONE);
+    assert_eq!(
+        json(opened).await["type"],
+        "https://jelq.dev/problems/opened"
+    );
+}
+
+#[tokio::test]
+async fn caged_drawers_are_noisy_and_eventually_give_up_the_key() {
+    let app = seeded_with(Floor::ChangingRoom, |run| run.items.cage = true);
+    let mut statuses = Vec::new();
+    for _ in 0..12 {
+        let response = send(&app, "POST", "/runs/cafebabe/drawer", &[], "").await;
+        statuses.push(response.status());
+        if response.status() == StatusCode::OK {
+            break;
+        }
+    }
+    assert_eq!(statuses.last(), Some(&StatusCode::OK), "{statuses:?}");
+    assert!(
+        statuses[..statuses.len() - 1]
+            .iter()
+            .all(|s| *s == StatusCode::NO_CONTENT)
+    );
+}

Modified file: src/ui.html+1−1

@@ -51,7 +51,7 @@ Language <select id="locale"><option>en-GB</option><option>en-US</option><option

5151 const REL = "https://jelq.dev/rels/";

5252 const METHODS = ["JELQ", "GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "TRACE"];

5353

 const LUBES = ["", "application/baby-oil", "application/coconut-oil", "application/lotion", "application/vaseline", "text/plain; charset=spit", "image/jpeg"];

54-const DEATHS = ["vascular-event", "caught", "banned", "degloved", "zip", "run-ended"];

54+const DEATHS = ["vascular-event", "caught", "opened", "banned", "degloved", "zip", "run-ended"];

5555 const STATS = [

5656 ["x-floor", "Floor"],

5757 ["x-self-reported-length", "Self-reported length"],

jelq

Commit 0d604ee39751

Commit `0d604ee39751`