jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

49 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `f16ab17c8ff6`

tarball

atagen <boss@atagen.co>2026-10-13 11:18 UTC

9 files changed+141-47

game: guide a schemeless excuse and close the kitchen on the first telling

A bare Authorization like "homework" parsed as no excuse at all and drew the not-heard rejection and a strike, and the UI's datalist produced exactly that header. It now gets a free hint naming the right scheme, and the UI offers only the floor's excuses as full Excuse or Digest credentials. The kitchen's first telling was a Warning the next raid ignored, so the telling now closes it for the floor and drops its link.

Modified file: src/game/balance/kitchen.rs−1

@@ -5,7 +5,6 @@ pub const KETTLE_ODDS: u32 = 6;

55 /// A telling is suspicion + 1 in this many, so a quiet house tolerates a raid and a noisy one does not.

66 pub const KITCHEN_TOLD: u32 = 8;

77 pub const RAID_NOISE: i32 = 1;

8-pub const KITCHEN_TELLINGS: u8 = 2;

98 pub const WATERMELON: (u32, u32) = (2, 5);

109 /// Caught with the melon is suspicion + 2 in this many.

1110 pub const CAUGHT_MELONED: u32 = 9;

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

@@ -144,5 +144,6 @@ pub struct Drawer {

144144 #[derive(Default)]

145145 pub struct KitchenVisit {

146146 pub(crate) kettle_boiled: bool,

147+ pub(crate) closed: bool,

147148 pub(crate) melon_offered: bool,

148149 }

Modified file: src/game/gauges.rs+2 additions−2 deletions@@ -4,7 +4,7 @@ use serde_json::{Value, json};
 
 use super::{
     Elder, Excuse, Floor, Grip, Item, Observer, Run, Story, Technique,
-    balance::{DANGER_EQ, KITCHEN_TELLINGS},
+    balance::DANGER_EQ,
     techniques::{Training, Utility},
 };
 
@@ -87,7 +87,7 @@ impl Run {
         Reach {
             foreskin: self.body.foreskin.is_some(),
             drawer: self.drawer_worth_searching(),
-            kitchen: self.floor.has_kitchen() && self.household.kitchen_tellings < KITCHEN_TELLINGS,
+            kitchen: self.floor.has_kitchen() && !self.here.kitchen.closed,
             thread: self.thread_reachable(),
             shop: self.floor.shop_open(),
             portal: self.needs_portal(),

Modified file: src/game/household.rs+22 additions−1 deletions@@ -101,7 +101,6 @@ 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>,
-    pub(crate) kitchen_tellings: u8,
 }
 
 pub struct MumVisit {
@@ -135,6 +134,17 @@ fn spoken(authorization: &str) -> &str {
         .map_or("", |(_, rest)| rest.trim().trim_matches('"'))
 }
 
+fn names_a_scheme(authorization: &str) -> bool {
+    authorization
+        .trim()
+        .split_once(' ')
+        .is_some_and(|(scheme, _)| {
+            ["basic", "digest", "excuse"]
+                .iter()
+                .any(|known| known.eq_ignore_ascii_case(scheme))
+        })
+}
+
 fn turned_away(code: &'static str, detail: &'static str) -> Problem {
     Problem::new(StatusCode::UNAUTHORIZED, code, detail)
 }
@@ -226,6 +236,17 @@ impl Run {
             self.confess();
             return Ok(());
         }
+        if !names_a_scheme(authorization) {
+            self.touch();
+            return Err(turned_away(
+                "excuse-unheard",
+                if digest {
+                    "Mum did not catch that. At Christmas she uses Digest, with the excuse as the username."
+                } else {
+                    "Mum did not catch that. Excuses are given as Excuse \"homework\"."
+                },
+            ));
+        }
         if parse_credentials(authorization, Scheme::Basic).is_some() {
             return Err(self.mum_strike(turned_away(
                 "basic",

Modified file: src/game/kitchen.rs+17 additions−23 deletions@@ -2,10 +2,10 @@ use axum::http::{StatusCode, header};
 use serde_json::json;
 
 use super::{
-    Cause, Floor, Item, Notice, Outcome, Run, Story,
+    Cause, Floor, Item, Outcome, Run, Story,
     balance::{
-        CAUGHT_MELONED, COCONUT_ODDS, ENERGY_ODDS, KETTLE_ODDS, KITCHEN_ICE_ODDS, KITCHEN_TELLINGS,
-        KITCHEN_TOLD, MELON_SHAME, RAID_NOISE, RUPTURE_LINE, WATERMELON,
+        CAUGHT_MELONED, COCONUT_ODDS, ENERGY_ODDS, KETTLE_ODDS, KITCHEN_ICE_ODDS, KITCHEN_TOLD,
+        MELON_SHAME, RAID_NOISE, RUPTURE_LINE, WATERMELON,
     },
 };
 use crate::problem::Problem;
@@ -20,12 +20,8 @@ impl Run {
                 "There is no kitchen on this floor.",
             ));
         }
-        if self.household.kitchen_tellings >= KITCHEN_TELLINGS {
-            return Err(Problem::new(
-                StatusCode::GONE,
-                "kitchen-off-limits",
-                "The kitchen is off limits. You have been told twice.",
-            ));
+        if self.here.kitchen.closed {
+            return Err(self.off_limits());
         }
         if self.online.story == Story::Pending {
             return Ok(self.branch_offer());
@@ -77,20 +73,9 @@ impl Run {
             u32::from(self.standing.suspicion) + 1,
             KITCHEN_TOLD,
         ) {
-            self.household.kitchen_tellings += 1;
-            if self.household.kitchen_tellings >= KITCHEN_TELLINGS {
-                self.end_kitchen_visit();
-                return Err(Problem::new(
-                    StatusCode::GONE,
-                    "kitchen-off-limits",
-                    "The kitchen is off limits. You have been told twice.",
-                ));
-            }
-            self.notices.push(if self.floor == Floor::Nans {
-                Notice::StopRaidingTheFridge
-            } else {
-                Notice::StopRaidingTheKitchen
-            });
+            self.here.kitchen.closed = true;
+            self.end_kitchen_visit();
+            return Err(self.off_limits());
         }
         if melon {
             self.here.kitchen.melon_offered = true;
@@ -99,6 +84,15 @@ impl Run {
         Ok(self.unpack(loot))
     }
 
+    fn off_limits(&self) -> Problem {
+        let detail = if self.floor == Floor::Nans {
+            "Stop raiding the fridge. The kitchen is off limits."
+        } else {
+            "Stop raiding the kitchen. The kitchen is off limits."
+        };
+        Problem::new(StatusCode::GONE, "kitchen-off-limits", detail)
+    }
+
     fn unpack(&mut self, loot: usize) -> Outcome {
         let (item, detail) = match loot {
             0 => (

Modified file: src/game/notice.rs−4 deletions@@ -4,8 +4,6 @@ pub enum Notice {
     BrotherTriedTheDoor,
     GymStaffLeaveIt,
     HousekeepingReadTheSign,
-    StopRaidingTheKitchen,
-    StopRaidingTheFridge,
     KevIsTheBar,
     DrawerJammed,
     DrawerComesLoose,
@@ -21,8 +19,6 @@ impl Notice {
             Self::BrotherTriedTheDoor => "your brother tried the door",
             Self::GymStaffLeaveIt => "the gym staff have seen worse, and they leave it there",
             Self::HousekeepingReadTheSign => "housekeeping read the sign",
-            Self::StopRaidingTheKitchen => "Stop raiding the kitchen.",
-            Self::StopRaidingTheFridge => "Stop raiding the fridge.",
             Self::KevIsTheBar => "Kev is 8 inches, he says. Nobody asked you, which is worse.",
             Self::DrawerJammed => "The drawer has jammed.",
             Self::DrawerComesLoose => "The drawer comes loose. That took a while.",

Modified file: src/tests/household.rs+61 additions−2 deletions@@ -317,7 +317,7 @@ async fn raids_get_noisier_and_the_household_notices() {
                 let mut run = Run::new("cafebabe".into(), "cafe".into(), seed);
                 run.body.eq = 40;
                 run.standing.suspicion = suspicion;
-                run.raid_kitchen().is_ok() && run.household.kitchen_tellings == 1
+                run.raid_kitchen().is_err() && run.here.kitchen.closed
             })
             .count()
     };
@@ -334,6 +334,65 @@ async fn raids_get_noisier_and_the_household_notices() {
 
     let mut run = Run::new("cafebabe".into(), "cafe".into(), SEED);
     run.body.eq = 40;
-    assert!(run.raid_kitchen().is_ok());
+    let _ = run.raid_kitchen();
     assert_eq!(run.standing.suspicion, 1, "every raid makes a little noise");
 }
+
+#[tokio::test]
+async fn one_telling_closes_the_kitchen_and_its_link() {
+    let app = seeded_with(Floor::Bedroom, |run| run.standing.suspicion = 4);
+    let mut told = None;
+    for _ in 0..20 {
+        let raid = send(&app, "POST", "/runs/cafebabe/kitchen", &[], "").await;
+        if raid.status() == StatusCode::GONE {
+            told = Some(raid);
+            break;
+        }
+        assert!(
+            warnings(&raid).iter().all(|w| !w.contains("Stop raiding")),
+            "there is no warning before the telling"
+        );
+    }
+    let told = told.expect("a noisy house tells within twenty raids");
+    assert!(
+        json(told).await["detail"]
+            .as_str()
+            .unwrap()
+            .starts_with("Stop raiding the kitchen.")
+    );
+    let view = send(&app, "GET", "/runs/cafebabe", &[], "").await;
+    assert!(!header(&view, "link").contains("/kitchen"));
+}
+
+#[tokio::test]
+async fn an_excuse_without_a_scheme_is_explained_for_free() {
+    let app = seeded_with(Floor::Bedroom, mum_at_the_door);
+    for said in ["homework", "on a call", "homework", "homework"] {
+        let response = send(
+            &app,
+            "GET",
+            "/runs/cafebabe",
+            &[("authorization", said)],
+            "",
+        )
+        .await;
+        assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+        assert!(
+            json(response).await["detail"]
+                .as_str()
+                .unwrap()
+                .contains("Excuse \"homework\"")
+        );
+    }
+    let view = send(&app, "GET", "/runs/cafebabe", &[], "").await;
+    assert_eq!(header(&view, "x-shame"), "0");
+    let excused = send(
+        &app,
+        "GET",
+        "/runs/cafebabe",
+        &[("authorization", "Excuse \"homework\"")],
+        "",
+    )
+    .await;
+    assert_eq!(excused.status(), StatusCode::OK);
+}

Modified file: src/tests/rolls.rs+19 additions−6 deletions@@ -122,22 +122,35 @@ async fn the_kitchen_pays_out_at_the_documented_odds() {
     let mut oil = 0;
     let mut drinks = 0;
     let mut packs = 0;
-    for seed in 0..600u64 {
+    let mut raids = 0;
+    for seed in 0..800u64 {
         let mut run = Run::new("cafebabe".into(), "cafe".into(), seed);
-        run.household.kitchen_tellings = 0;
         let held = (
             run.items.lubes.coconut_oil,
             run.items.stores.energy_drinks,
             run.items.stores.ice_packs,
         );
-        let _ = run.raid_kitchen();
+        if run.raid_kitchen().is_err() {
+            continue;
+        }
+        raids += 1;
         oil += u32::from(run.items.lubes.coconut_oil > held.0);
         drinks += u32::from(run.items.stores.energy_drinks > held.1);
         packs += u32::from(run.items.stores.ice_packs > held.2);
     }
-    assert!((170..=230).contains(&oil), "coconut {oil} in 600");
-    assert!((90..=150).contains(&drinks), "energy {drinks} in 600");
-    assert!((45..=105).contains(&packs), "ice {packs} in 600");
+    let rate = |found: u32| f64::from(found) / f64::from(raids);
+    assert!(
+        (0.28..=0.39).contains(&rate(oil)),
+        "coconut {oil} in {raids}"
+    );
+    assert!(
+        (0.15..=0.25).contains(&rate(drinks)),
+        "energy {drinks} in {raids}"
+    );
+    assert!(
+        (0.08..=0.17).contains(&rate(packs)),
+        "ice {packs} in {raids}"
+    );
 }
 
 #[tokio::test]

Modified file: src/ui.html+19 additions−8 deletions@@ -25,13 +25,7 @@ Language <select id="locale"><option>en-GB</option><option>en-US</option><option
 <form id="form">
 <h3>Method</h3>
 <div id="methods"></div>
-<datalist id="excuses">
-<option value="changing"><option value="homework"><option value="pulled a muscle">
-<option value="tidying"><option value="the washing up"><option value="fed the cat">
-<option value="revising"><option value="on a call"><option value="wrapping presents">
-<option value="folding the washing"><option value="hanging the lights">
-<option value="helping Nan"><option value="peeling sprouts"><option value="the truth">
-</datalist>
+<datalist id="excuses"></datalist>
 
 <h3>Request</h3>
 <table id="fields" cellpadding="2"></table>
@@ -60,6 +54,8 @@ const METHODS = ["JELQ", "HOLD", "GET", "HEAD", "POST", "PUT", "PATCH", "DELETE"
 const ALL_LUBES = ["", "application/baby-oil", "application/coconut-oil", "application/lotion", "application/vaseline", "text/plain; charset=spit", "image/jpeg"];
 const DEATHS = ["vascular-event", "caught", "opened", "banned", "degloved", "zip", "watermelon", "run-ended"];
 let stocked = null;
+let excuses = [];
+let nonce = null;
 let inventorySeq = 0;
 const STATS = [
   ["x-floor", "Floor"],
@@ -285,6 +281,13 @@ function fieldNames() {
   return (asked ? ["authorization"] : []).concat(names);
 }
 
+function renderExcuses() {
+  const said = excuses.concat(["the truth"]);
+  $("excuses").replaceChildren(...said.map(e => el("option", {
+    value: nonce ? 'Digest username="' + e + '", nonce="' + nonce + '"' : 'Excuse "' + e + '"',
+  })));
+}
+
 function renderFields() {
   const table = $("fields");
   table.replaceChildren();
@@ -380,6 +383,8 @@ function absorb(r, sentMethod, sentPath) {
   if (digest && !(values.authorization || "").includes(digest[1])) {
     values.authorization = 'Digest username="", nonce="' + digest[1] + '"';
   }
+  if ("www-authenticate" in headers) nonce = digest ? digest[1] : null;
+  renderExcuses();
   let body = null;
   try { body = JSON.parse(r.body); } catch (e) {}
   const problem = body && typeof body.type === "string" ? body.type.split("/").pop() : null;
@@ -402,7 +407,13 @@ function absorb(r, sentMethod, sentPath) {
       .then(r => r.json())
       .then(r => {
         if (run !== active || seq !== inventorySeq) return;
-        try { stocked = (JSON.parse(r.body).items || []).map(i => i.name); render(); } catch (e) {}
+        try {
+          const held = JSON.parse(r.body);
+          stocked = (held.items || []).map(i => i.name);
+          excuses = held.excuses || [];
+          renderExcuses();
+          render();
+        } catch (e) {}
       });
   }
   offered = body ? hrefs(body, []) : [];

jelq

Commit f16ab17c8ff6

Commit `f16ab17c8ff6`