jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

51 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `97c05b741d8f`

tarball

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

5 files changed+70-33

game: report what happens to the foreskin

Stretch and dry grew the foreskin on every landed roll, but the gains body only listed length and girth, so the growth looked like it never happened. Degloving also left the foreskin intact on a run that had just lost its outer layer. Both now report the foreskin delta in the body, and degloving takes it the way a crit fail does.

Modified file: src/game/hazards.rs+12 additions−2 deletions@@ -11,6 +11,7 @@ use super::{
         RUPTURE_IN_BAND, RUPTURE_PREMATURE, RUPTURE_WARM, SOFT_INTENSITY, SUSPICION_LIMIT,
         WANDERER_VISIT, WINDOW,
     },
+    measure::round3,
     techniques::Training,
     travel::Exit,
 };
@@ -49,7 +50,7 @@ impl Run {
                 self.decision("cold-degloving", "Cold and unprepared, does the skin tear?"),
                 COLD_DEGLOVING,
             ) {
-                return Err(self.end(Cause::Degloved));
+                return Err(self.deglove());
             }
         }
         if training == Training::Dry
@@ -59,11 +60,20 @@ impl Run {
                 DEGLOVING,
             )
         {
-            return Err(self.end(Cause::Degloved));
+            return Err(self.deglove());
         }
         Ok(ControlFlow::Continue(()))
     }
 
+    fn deglove(&mut self) -> Problem {
+        let lost = self.body.foreskin.take();
+        let problem = self.end(Cause::Degloved);
+        match lost {
+            Some(lost) => problem.with("foreskin", -round3(lost)),
+            None => problem,
+        }
+    }
+
     pub(super) fn hazards(&mut self, intensity: i32) -> Interruption {
         if !self.hotter_than(PREMATURE_EQ)
             && self.chance(

Modified file: src/game/roll.rs+27 additions−21 deletions@@ -10,7 +10,15 @@ use super::{
 };
 use crate::{headers::SERVER_TIMING, problem::Problem};
 use axum::http::{StatusCode, header};
-use serde_json::json;
+use serde_json::{Value, json};
+
+fn gains(detail: &str, length: f64, girth: f64, foreskin: Option<f64>) -> Value {
+    let mut body = json!({ "detail": detail, "length": round3(length), "girth": round3(girth) });
+    if let Some(foreskin) = foreskin {
+        body["foreskin"] = json!(round3(foreskin));
+    }
+    body
+}
 
 impl Run {
     pub(super) fn roll(
@@ -52,14 +60,15 @@ impl Run {
             return Err(timed(self.rupture()));
         }
         if natural == 20 {
-            self.gain(length * 2.0, girth * 2.0, profile.foreskin_growth);
+            let foreskin = self.gain(length * 2.0, girth * 2.0, profile.foreskin_growth);
             return Ok(Outcome::json(
                 StatusCode::PERMANENT_REDIRECT,
-                json!({
-                    "detail": "Your length has moved permanently.",
-                    "length": round3(length * 2.0),
-                    "girth": round3(girth * 2.0),
-                }),
+                gains(
+                    "Your length has moved permanently.",
+                    length * 2.0,
+                    girth * 2.0,
+                    foreskin,
+                ),
             )
             .header(header::LOCATION, self.path("/length"))
             .header(SERVER_TIMING, timing));
@@ -96,24 +105,21 @@ impl Run {
 
     fn land(&mut self, profile: &Profile, length: f64, girth: f64, clean: bool) -> Outcome {
         if self.body.eq < *EQ_BAND.start() {
-            self.gain(length / 2.0, girth / 2.0, profile.foreskin_growth);
+            let foreskin = self.gain(length / 2.0, girth / 2.0, profile.foreskin_growth);
             Outcome::json(
                 StatusCode::PARTIAL_CONTENT,
-                json!({
-                    "detail": "Partial gains were applied. EQ was below the band.",
-                    "length": round3(length / 2.0),
-                    "girth": round3(girth / 2.0),
-                }),
+                gains(
+                    "Partial gains were applied. EQ was below the band.",
+                    length / 2.0,
+                    girth / 2.0,
+                    foreskin,
+                ),
             )
         } else if clean {
-            self.gain(length, girth, profile.foreskin_growth);
+            let foreskin = self.gain(length, girth, profile.foreskin_growth);
             Outcome::json(
                 StatusCode::OK,
-                json!({
-                    "detail": "Gains were applied.",
-                    "length": round3(length),
-                    "girth": round3(girth),
-                }),
+                gains("Gains were applied.", length, girth, foreskin),
             )
         } else {
             let eta = self.oracle.span_int(
@@ -165,14 +171,14 @@ impl Run {
 
     pub(super) fn critical_failure(&mut self, training: Training, profile: &Profile) -> Problem {
         let uses_foreskin = profile.foreskin.is_some_and(|(min, _)| min > 0.0);
-        if uses_foreskin && self.body.foreskin.is_some() {
-            self.body.foreskin = None;
+        if uses_foreskin && let Some(lost) = self.body.foreskin.take() {
             self.standing.shame += 25;
             return Problem::new(
                 StatusCode::GONE,
                 "foreskin-lost",
                 "The technique has removed the foreskin. It will not be returning.",
             )
+            .with("foreskin", -round3(lost))
             .header(header::CONTENT_LOCATION, self.path("/foreskin"));
         }
         if self.hotter_than(DANGER_EQ) {

Modified file: src/game/run.rs+4 additions−4 deletions@@ -362,12 +362,12 @@ impl Run {
         }
     }
 
-    pub(super) fn gain(&mut self, length: f64, girth: f64, foreskin: f64) {
+    pub(super) fn gain(&mut self, length: f64, girth: f64, foreskin: f64) -> Option<f64> {
         self.body.length += length;
         self.body.girth += girth;
-        if let Some(f) = &mut self.body.foreskin {
-            *f += foreskin;
-        }
+        let f = self.body.foreskin.as_mut().filter(|_| foreskin != 0.0)?;
+        *f += foreskin;
+        Some(foreskin)
     }
 
     pub(super) fn rupture(&mut self) -> Problem {

Modified file: src/tests/body.rs+19 additions@@ -415,3 +415,22 @@ fn the_drawer_starts_with_at_most_one_bottle() {
         "{stocked}/400 started with lube"
     );
 }
+
+#[tokio::test]
+async fn stretching_reports_the_foreskin_it_grew() {
+    let mut landed = 0;
+    for seed in 0..40u64 {
+        let app = app_with(Floor::Bedroom, seed, |run| {
+            run.body.warmed_up = true;
+            run.body.eq = 60;
+            run.body.foreskin = Some(1.0);
+        });
+        let stretch = send(&app, "JELQ", "/runs/cafebabe?technique=stretch", &[], "").await;
+        if stretch.status() == StatusCode::OK {
+            assert_eq!(header(&stretch, "x-foreskin"), "1.03");
+            assert_eq!(json(stretch).await["foreskin"], 0.03);
+            landed += 1;
+        }
+    }
+    assert!(landed > 0, "forty stretches and none landed clean");
+}

Modified file: src/tests/rolls.rs+8 additions−6 deletions@@ -215,12 +215,14 @@ async fn degloving_takes_one_cold_stroke_in_twenty() {
             run.body.foreskin = Some(1.0);
         });
         let cold = send(&app, "JELQ", "/runs/cafebabe?technique=stretch", &[], "").await;
-        if cold.status() == StatusCode::GONE
-            && json(cold).await["type"]
-                .as_str()
-                .unwrap()
-                .ends_with("degloved")
-        {
+        if cold.status() != StatusCode::GONE {
+            continue;
+        }
+        let bare = header(&cold, "x-foreskin") == "gone";
+        let problem = json(cold).await;
+        if problem["type"].as_str().unwrap().ends_with("degloved") {
+            assert!(bare, "degloving takes the foreskin with it");
+            assert_eq!(problem["foreskin"], -1.0);
             degloved += 1;
         }
     }

jelq

Commit 97c05b741d8f

Commit `97c05b741d8f`