jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

61 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `6033b0db186c`

tarball

atagen <boss@atagen.co>2026-10-13 12:46 UTC

5 files changed+76-16

game: check the clock before the lube and deliver queued gains on the way out

The overstay check lived in begin_turn, which runs after the lube is taken and the stroke has chafed, so a turn that never happened still cost both. Queued gains were due on a run-wide turn and could trail a player onto later floors. The 202 also now reports foreskin torn by the stroke it queued.

Modified file: src/game/dispatch.rs+3 additions@@ -66,6 +66,7 @@ impl Run {
         }
         self.ready(Technique::Utility(utility), lube)?;
         self.check_storage()?;
+        self.check_clock()?;
         self.floor_enemy()?;
         match utility {
             Utility::Edge => self.edge(),
@@ -82,6 +83,7 @@ impl Run {
         self.ready(Technique::Training(training), lube)?;
         self.check_storage()?;
         self.lube_available(lube)?;
+        self.check_clock()?;
         self.floor_enemy()?;
         self.take_lube(lube)?;
         let cold = self.cold();
@@ -115,6 +117,7 @@ impl Run {
         self.ready(Technique::Training(b), lube)?;
         self.check_storage()?;
         self.lube_available(lube)?;
+        self.check_clock()?;
         self.floor_enemy()?;
         self.take_lube(lube)?;
         let cold = self.cold();

Modified file: src/game/roll.rs+9 additions−7 deletions@@ -133,13 +133,15 @@ impl Run {
                 girth,
                 foreskin: profile.foreskin_growth,
             });
-            Outcome::json(
-                StatusCode::ACCEPTED,
-                json!({
-                    "detail": "Gains have been queued. They may arrive.",
-                    "eta_turns": eta,
-                }),
-            )
+            let mut body = json!({
+                "detail": "Gains have been queued. They may arrive.",
+                "eta_turns": eta,
+            });
+            let torn = std::mem::take(&mut self.body.torn);
+            if torn > 0.0 {
+                body["foreskin"] = json!(-round3(torn));
+            }
+            Outcome::json(StatusCode::ACCEPTED, body)
         }
     }
 

Modified file: src/game/run.rs+5 additions−6 deletions@@ -149,15 +149,13 @@ impl Run {
     }
 
     pub(super) fn begin_turn(&mut self) -> Result<(), Problem> {
-        if self.floor.timed() && self.here.turns + 1 >= FLOOR_LIMIT {
-            return Err(self.overstay());
-        }
+        self.check_clock()?;
         self.touch();
         self.turn += 1;
         self.here.turns += 1;
         self.body.torn = 0.0;
         self.standing.at_turn_start = self.standing.suspicion;
-        self.realise();
+        self.realise(false);
         if self.floor.timed() && self.here.turns + 2 == FLOOR_LIMIT {
             self.notices.push(Notice::RunningLong(self.floor));
         } else if self.floor.timed() && self.here.turns + 1 == FLOOR_LIMIT {
@@ -359,10 +357,11 @@ impl Run {
         self.body.exhausted = true;
     }
 
-    pub(super) fn realise(&mut self) {
+    /// Leaving a floor lets time pass, so everything still queued arrives at once.
+    pub(super) fn realise(&mut self, everything: bool) {
         let (due, waiting): (Vec<_>, Vec<_>) = std::mem::take(&mut self.body.pending)
             .into_iter()
-            .partition(|p| p.due <= self.turn);
+            .partition(|p| everything || p.due <= self.turn);
         self.body.pending = waiting;
         for p in due {
             let foreskin = self.gain(p.length, p.girth, p.foreskin);

Modified file: src/game/travel.rs+12 additions−3 deletions@@ -1,8 +1,9 @@
 use super::{
     Cause, Elder, Floor, FloorState, Notice, Outcome, Run,
     balance::{
-        EQ_BAND, FLOOR_ALLOWANCE, FLOOR_TURNS, FRICTION_FLOOR, LOCKER_ROOM_BAR, LOCKER_ROOM_OTHERS,
-        LOCKER_ROOM_SHAME, OVERSTAY_BUSTED, OVERSTAY_EQ, OVERSTAY_SHAME, STARTING_EQ, ZIP,
+        EQ_BAND, FLOOR_ALLOWANCE, FLOOR_LIMIT, FLOOR_TURNS, FRICTION_FLOOR, LOCKER_ROOM_BAR,
+        LOCKER_ROOM_OTHERS, LOCKER_ROOM_SHAME, OVERSTAY_BUSTED, OVERSTAY_EQ, OVERSTAY_SHAME,
+        STARTING_EQ, ZIP,
     },
     measure::round2,
 };
@@ -29,6 +30,7 @@ impl Run {
             warm_arrival: warm,
             ..FloorState::default()
         };
+        self.realise(true);
         self.reset_eq(STARTING_EQ);
         self.standing.suspicion = 0;
         self.shed(FRICTION_FLOOR);
@@ -43,8 +45,15 @@ impl Run {
         self.touch();
     }
 
+    pub(super) fn check_clock(&mut self) -> Result<(), Problem> {
+        if self.floor.timed() && self.here.turns + 1 >= FLOOR_LIMIT {
+            return Err(self.overstay());
+        }
+        Ok(())
+    }
+
     /// A floor past its limit either ends the run or moves you along, shamed and deflated.
-    pub(super) fn overstay(&mut self) -> Problem {
+    fn overstay(&mut self) -> Problem {
         self.touch();
         if self.chance(
             self.decision(

Modified file: src/tests/turns.rs+47 additions@@ -355,3 +355,50 @@ async fn ice_treats_a_burn_even_through_priapism() {
     assert_eq!(header(&iced, "x-eq"), "80");
     assert!(warnings(&iced).iter().all(|w| !w.contains("friction burn")));
 }
+
+#[tokio::test]
+async fn leaving_a_floor_delivers_every_queued_gain() {
+    let app = seeded_with(Floor::ChangingRoom, |run| {
+        run.here.turns = 6;
+        run.body.pending.push(crate::game::Pending {
+            due: run.turn + 4,
+            length: 0.2,
+            girth: 0.1,
+            foreskin: 0.0,
+        });
+    });
+    let left = send(&app, "POST", "/runs/cafebabe/floor", &[], "").await;
+    assert_eq!(left.status(), StatusCode::SEE_OTHER);
+    assert_eq!(
+        header(&left, "x-gains-arrived"),
+        "length=0.200, girth=0.100"
+    );
+}
+
+#[tokio::test]
+async fn an_overstayed_jelq_spends_no_lube() {
+    let app = seeded_with(Floor::ChangingRoom, |run| {
+        run.body.eq = 60;
+        run.here.turns = 9;
+        run.items.lubes.baby_oil = 1;
+    });
+    let late = send(
+        &app,
+        "JELQ",
+        "/runs/cafebabe?technique=wet",
+        &[("content-type", "application/baby-oil")],
+        "",
+    )
+    .await;
+    assert!([StatusCode::GONE, StatusCode::REQUEST_TIMEOUT].contains(&late.status()));
+    if late.status() == StatusCode::REQUEST_TIMEOUT {
+        let held = json(send(&app, "GET", "/runs/cafebabe/inventory", &[], "").await).await;
+        assert!(
+            held["items"]
+                .as_array()
+                .unwrap()
+                .iter()
+                .any(|i| i["name"] == "baby-oil")
+        );
+    }
+}

jelq

Commit 6033b0db186c

Commit `6033b0db186c`