jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

73 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `e028a4184d00`

tarball

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

17 files changed+211-62

game: name EQ in X-EQ rather than numbering it

A raw EQ alongside the published 50 to 70 band turned every turn into arithmetic, so X-EQ now names the tier the rolls actually use, burn and ring included, and item text speaks in the same vague terms. Edge links now advertise lubricant="optional" and training links an intensity range, since bad9f5b8 let an edge take lube but the UI only offered Content-Type to training moves.

Added file: src/game/arousal.rs+66 additions@@ -0,0 +1,66 @@
+use super::{
+    Run,
+    balance::{DANGER_EQ, EQ_BAND, HOT_EQ, PREMATURE_EQ, RING_RUPTURE_LINE, RUPTURE_LINE},
+};
+
+/// What `X-EQ` shows in place of the number, cut on the lines the rolls already use.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Arousal {
+    Flaccid,
+    Cold,
+    Warm,
+    Ideal,
+    Swollen,
+    Throbbing,
+    Straining,
+    Imminent,
+    Priapic,
+}
+
+impl Arousal {
+    pub fn name(self) -> &'static str {
+        match self {
+            Self::Flaccid => "Flaccid",
+            Self::Cold => "Cold",
+            Self::Warm => "Warm",
+            Self::Ideal => "Ideal",
+            Self::Swollen => "Swollen",
+            Self::Throbbing => "Throbbing",
+            Self::Straining => "Straining",
+            Self::Imminent => "Imminent",
+            Self::Priapic => "Priapic",
+        }
+    }
+}
+
+impl Run {
+    pub(super) fn rupture_line(&self) -> i32 {
+        if self.items.kit.ring {
+            RING_RUPTURE_LINE
+        } else {
+            RUPTURE_LINE
+        }
+    }
+
+    pub fn arousal(&self) -> Arousal {
+        if self.body.conditions.priapism_turns > 0 {
+            Arousal::Priapic
+        } else if self.hotter_than(PREMATURE_EQ) {
+            Arousal::Imminent
+        } else if self.hotter_than(self.rupture_line()) {
+            Arousal::Straining
+        } else if self.hotter_than(HOT_EQ) {
+            Arousal::Throbbing
+        } else if self.hotter_than(DANGER_EQ) {
+            Arousal::Swollen
+        } else if EQ_BAND.contains(&self.body.eq) {
+            Arousal::Ideal
+        } else if self.body.eq == 0 {
+            Arousal::Flaccid
+        } else if self.cold() {
+            Arousal::Cold
+        } else {
+            Arousal::Warm
+        }
+    }
+}

Modified file: src/game/cause.rs+1−1

@@ -33,7 +33,7 @@ impl Cause {

3333

3434 pub fn slug(self) -> &'static str {

3535 match self {

36- Self::Ruptured { .. } => "vascular-event",

36+ Self::Ruptured { .. } => "ruptured",

3737 Self::Caught => "caught",

3838 Self::Opened => "opened",

3939 Self::Banned => "banned",

Modified file: src/game/forum.rs+1−1

@@ -42,7 +42,7 @@ pub fn forum_thread() -> Value {

4242 "title": "The definitive jelqing FAQ (updated 2009)",

4343 "posts": [

4444 { "author": "TheElder", "body": "Warm up. Always warm up. A cold jelq is a 412 waiting to happen." },

-            { "author": "TheElder", "body": "Keep EQ between 50 and 70. Above 70 you are gambling. Above 90 you are a cautionary tale." },

45+ { "author": "TheElder", "body": "Keep it Ideal. Swollen is gambling. Straining is a cautionary tale." },

4646 { "author": "newbie_2009", "body": "everyone keeps saying uli. who is uli" },

4747

             { "author": "TheElder", "body": "uli was a member here. He posted the technique in 2001 and never posted again. Some say he ascended. The search function says his account is gone." },

4848 { "author": "TheElder", "body": "We do not say his name in vain. We say it in girth." },

Modified file: src/game/gauges.rs+4 additions−4 deletions@@ -3,7 +3,7 @@ use std::time::Instant;
 use serde_json::{Value, json};
 
 use super::{
-    Arrival, Elder, Excuse, Floor, Grip, Item, Observer, Run, Story, Technique,
+    Arousal, Arrival, Elder, Excuse, Floor, Grip, Item, Observer, Run, Story, Technique,
     balance::DANGER_EQ,
     techniques::{Training, Utility},
 };
@@ -18,7 +18,7 @@ pub struct Gauges {
     pub(crate) girth: f64,
     pub(crate) foreskin: Option<f64>,
     pub(crate) friction: i32,
-    pub(crate) eq: i32,
+    pub(crate) arousal: Arousal,
     pub(crate) stamina: i32,
     pub(crate) max_stamina: i32,
     pub(crate) suspicion: u8,
@@ -62,7 +62,7 @@ impl Run {
         if arrived.is_some() {
             warnings.push("the queued gains have arrived");
         }
-        if self.body.eq > DANGER_EQ && self.ended.is_none() {
+        if self.hotter_than(DANGER_EQ) && self.ended.is_none() {
             warnings.push("it is turning purple");
         }
         Gauges {
@@ -74,7 +74,7 @@ impl Run {
             girth: self.body.girth,
             foreskin: self.body.foreskin,
             friction: self.body.friction,
-            eq: self.body.eq,
+            arousal: self.arousal(),
             stamina: self.body.stamina,
             max_stamina: self.max_stamina(),
             suspicion: self.standing.suspicion,

Modified file: src/game/items.rs+1−1

@@ -98,7 +98,7 @@ impl Item {

9898 Self::WarmTowel => {

9999 "Reusable. Satisfies the warm-up precondition. Use technique=warmup."

100100 }

101- Self::IcePack => "Lowers EQ by 40. Use technique=ice.",

101+ Self::IcePack => "Cools things sharply. Use technique=ice.",

102102 Self::Ruler => "Measures honestly. The length resource now carries a Content-Length.",

103103 Self::DoorLock => "Keeps your brother out once.",

104104 Self::DndSign => "Works on housekeeping. Mum does not read signs.",

Modified file: src/game/mod.rs+2

@@ -1,3 +1,4 @@

1+mod arousal;

12 pub mod balance;

23 mod body;

34 mod cause;

@@ -29,6 +30,7 @@ mod techniques;

2930 mod travel;

3031 mod utility;

3132

33+pub use arousal::Arousal;

3234 #[cfg(test)]

3335 pub use body::Pending;

3436 pub use body::{Arrival, Body, Grip};

Modified file: src/game/rest.rs+2 additions−2 deletions@@ -11,7 +11,7 @@ use serde_json::json;
 
 impl Run {
     pub fn can_hold(&self) -> bool {
-        self.body.eq > DANGER_EQ || self.body.stamina <= 2
+        self.hotter_than(DANGER_EQ) || self.body.stamina <= 2
     }
 
     pub fn hold(&mut self) -> Result<Outcome, Problem> {
@@ -95,7 +95,7 @@ impl Run {
         Ok(Outcome::json(
             StatusCode::OK,
             json!({
-                "detail": "In through the nose, out through the mouth. EQ falls by ten.",
+                "detail": "In through the nose, out through the mouth. EQ falls a little.",
             }),
         ))
     }

Modified file: src/game/roll.rs+3 additions−7 deletions@@ -2,7 +2,7 @@ use super::{
     Grip, Lube, Outcome, Run,
     balance::{
         ARRIVAL_BONUS, BAND_BONUS, CLEAN_HIT, DANGER_EQ, EQ_BAND, GREED_HOT, GREED_WARM, HOT_EQ,
-        NEAR_MISS, QUEUED_ETA, RING_RUPTURE_LINE, RUPTURE_LINE, UNDERHAND_STRETCH, UNDERHAND_WET,
+        NEAR_MISS, QUEUED_ETA, UNDERHAND_STRETCH, UNDERHAND_WET,
     },
     body::Pending,
     measure::round3,
@@ -43,11 +43,7 @@ impl Run {
         let timed = |p: Problem| p.header(SERVER_TIMING, &timing);
 
         let (length, girth) = self.scaled_gains(&profile, intensity);
-        let rupture_line = if self.items.kit.ring {
-            RING_RUPTURE_LINE
-        } else {
-            RUPTURE_LINE
-        };
+        let rupture_line = self.rupture_line();
 
         if natural == 1 {
             return Err(timed(self.critical_failure(training, &profile)));
@@ -109,7 +105,7 @@ impl Run {
             Outcome::json(
                 StatusCode::PARTIAL_CONTENT,
                 gains(
-                    "Partial gains were applied. EQ was below the band.",
+                    "Partial gains were applied. EQ was short of Ideal.",
                     length / 2.0,
                     girth / 2.0,
                     foreskin,

Modified file: src/game/techniques.rs+17 additions−4 deletions@@ -102,12 +102,16 @@ impl Utility {
 
     fn effect(self) -> &'static str {
         match self {
-            Self::Warmup => "EQ +25. Satisfies the warm-up precondition.",
-            Self::Ice => "EQ -40. Treats a friction burn. Consumes an ice pack.",
-            Self::Edge => "EQ +15 and a little girth. Three in a row is a loop.",
+            Self::Warmup => "Warms things a good deal. Satisfies the warm-up precondition.",
+            Self::Ice => "Cools things sharply. Treats a friction burn. Consumes an ice pack.",
+            Self::Edge => {
+                "Warms things a little and adds a little girth. Three in a row is a loop."
+            }
             Self::Pump => "Large gains, all temporary. Requires a pump.",
             Self::Supplement => "Consumes a supplement.",
-            Self::Meditate => "EQ -10, sheds 2 friction. Taught by the forum. Once per floor.",
+            Self::Meditate => {
+                "Cools things a little, sheds 2 friction. Taught by the forum. Once per floor."
+            }
             Self::Energy => "+3 stamina. Consumes an energy drink. Tastes like a battery.",
         }
     }
@@ -142,6 +146,14 @@ impl Technique {
     pub fn lubricant(self) -> Option<&'static str> {
         match self {
             Self::Training(training) => Some(training.profile().lube.name()),
+            Self::Utility(Utility::Edge) => Some(LubeRule::Optional.name()),
+            Self::Utility(_) => None,
+        }
+    }
+
+    pub fn intensity(self) -> Option<&'static str> {
+        match self {
+            Self::Training(_) => Some("1-10"),
             Self::Utility(_) => None,
         }
     }
@@ -152,6 +164,7 @@ impl Technique {
                 return json!({
                     "name": utility.name(),
                     "effect": utility.effect(),
+                    "lubricant": self.lubricant(),
                     "locked": !known,
                 });
             }

Modified file: src/http/links.rs+9 additions−1 deletions@@ -5,7 +5,7 @@ use crate::game::{Branch, Run, SHOP};
 
 pub const REL_BASE: &str = "https://jelq.dev/rels/";
 
-/// One RFC 8288 link. `allow` and `lubricant` are extension attributes (§3), so a client never
+/// One RFC 8288 link. `allow`, `lubricant` and `intensity` are extension attributes (§3), so a client never
 /// has to guess what a target accepts.
 struct Link<'a> {
     href: &'a str,
@@ -13,6 +13,7 @@ struct Link<'a> {
     allow: &'a str,
     title: Option<&'a str>,
     lubricant: Option<&'a str>,
+    intensity: Option<&'a str>,
 }
 
 impl Link<'_> {
@@ -28,6 +29,9 @@ impl Link<'_> {
         if let Some(rule) = self.lubricant {
             let _ = write!(out, "; lubricant=\"{rule}\"");
         }
+        if let Some(range) = self.intensity {
+            let _ = write!(out, "; intensity=\"{range}\"");
+        }
     }
 }
 
@@ -63,6 +67,7 @@ pub fn header(run: &Run) -> String {
             allow: &target.resource.allow(run),
             title: None,
             lubricant: None,
+            intensity: None,
         }
         .write(&mut out);
     }
@@ -77,6 +82,7 @@ pub fn header(run: &Run) -> String {
                 allow: "POST",
                 title: Some(title),
                 lubricant: None,
+                intensity: None,
             }
             .write(&mut out);
         }
@@ -90,6 +96,7 @@ pub fn header(run: &Run) -> String {
             allow: "JELQ",
             title: Some(name),
             lubricant: technique.lubricant(),
+            intensity: technique.intensity(),
         }
         .write(&mut out);
     }
@@ -104,6 +111,7 @@ pub fn header(run: &Run) -> String {
                 allow: "POST",
                 title: Some(&format!("{} for {price}", item.slug())),
                 lubricant: None,
+                intensity: None,
             }
             .write(&mut out);
         }

Modified file: src/http/mod.rs+5 additions@@ -71,6 +71,11 @@ impl AppState {
     pub(crate) fn insert(&self, run: crate::game::Run) {
         self.runs.insert_new(run);
     }
+
+    #[cfg(test)]
+    pub(crate) fn inspect<T>(&self, visit: impl FnMut(&crate::game::Run) -> T) -> Vec<T> {
+        self.runs.each(visit)
+    }
 }
 
 impl Default for AppState {

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

@@ -152,7 +152,7 @@ fn stats(gauges: &Gauges, shame: u32) -> Vec<(HeaderName, String)> {

152152 gauges.foreskin.map_or("gone".into(), |f| format!("{f:.2}")),

153153 ),

154154 (X_FRICTION, format!("{}/{FRICTION_MAX}", gauges.friction)),

155- (X_EQ, gauges.eq.to_string()),

155+ (X_EQ, gauges.arousal.name().into()),

156156 (

157157 X_STAMINA,

158158 format!("{}/{}", gauges.stamina, gauges.max_stamina),

Modified file: src/http/runs.rs+2 additions−3 deletions@@ -19,7 +19,7 @@ use super::{
 use crate::{
     game::{
         Branch, Cause, Floor, Grip, Item, LUBRICANTS, Lube, Run, Technique,
-        balance::{EQ_BAND, VIEWS_PER_SECOND},
+        balance::VIEWS_PER_SECOND,
     },
     problem::Problem,
 };
@@ -49,7 +49,7 @@ pub static RUN: RunResource = RunResource {
         Verb::new("JELQ", jelq).only_when(not_in_clinic, "JELQ is not performed in the clinic."),
         Verb::new("HOLD", hold_run).only_when(
             Run::can_hold,
-            "HOLD is only available above 70 EQ or at 2 stamina or less.",
+            "HOLD is only available once Swollen or at 2 stamina or less.",
         ),
         Verb::new("PUT", put_run),
         Verb::new("DELETE", delete_run),
@@ -157,7 +157,6 @@ fn get_techniques(run: &mut Run, _: &Ctx) -> Response {
         "usage": format!("JELQ {}?technique=<name>[,<name>]&intensity=<1-10>", run.path("")),
         "lubricant": "Declared with Content-Type.",
         "lubricants": LUBRICANTS,
-        "eq_band": [EQ_BAND.start(), EQ_BAND.end()],
         "techniques": listed,
     }))
     .into_response()

Modified file: src/tests/methods.rs+10 additions−1 deletions@@ -107,7 +107,16 @@ async fn links_offer_only_usable_techniques() {
     assert!(!usable.contains(&"uli".to_owned()), "uli needs the forum");
     assert!(!usable.contains(&"pump".to_owned()), "pump needs a pump");
     assert!(
-        header(&warm, "link").contains("title=\"wet\"; allow=\"JELQ\"; lubricant=\"required\"")
+        header(&warm, "link")
+            .contains("title=\"wet\"; allow=\"JELQ\"; lubricant=\"required\"; intensity=\"1-10\"")
+    );
+    let edge = header(&warm, "link")
+        .split(", ")
+        .find(|link| link.contains("title=\"edge\""))
+        .unwrap();
+    assert!(
+        edge.ends_with("allow=\"JELQ\"; lubricant=\"optional\""),
+        "an edge takes lube but no intensity"
     );
 
     let Harness { app: forum, .. } = harness(Floor::Forum, SEED, |_| {});

Modified file: src/tests/mod.rs+10 additions−1 deletions@@ -79,6 +79,14 @@ pub fn warnings(response: &Response) -> Vec<String> {
 pub struct Harness {
     pub app: Router,
     pub origin: String,
+    pub state: Arc<AppState>,
+}
+
+impl Harness {
+    /// The EQ of `cafebabe`, which `X-EQ` only names.
+    pub fn eq(&self) -> i32 {
+        self.state.inspect(|run| run.body.eq)[0]
+    }
 }
 
 pub fn harness(floor: Floor, seed: u64, setup: impl FnOnce(&mut Run)) -> Harness {
@@ -89,8 +97,9 @@ pub fn harness(floor: Floor, seed: u64, setup: impl FnOnce(&mut Run)) -> Harness
     let origin = run.origin_etag();
     state.insert(run);
     Harness {
-        app: router(state),
+        app: router(state.clone()),
         origin,
+        state,
     }
 }
 

Modified file: src/tests/turns.rs+71 additions−29 deletions@@ -2,49 +2,65 @@ use super::*;
 
 #[tokio::test]
 async fn meditation_is_free_but_only_once_per_floor() {
-    let app = seeded_with(Floor::Bedroom, |run| run.online.meditation_taught = true);
-    let response = send(&app, "JELQ", "/runs/cafebabe?technique=meditate", &[], "").await;
+    let held = harness(Floor::Bedroom, SEED, |run| {
+        run.online.meditation_taught = true
+    });
+    let app = &held.app;
+    let response = send(app, "JELQ", "/runs/cafebabe?technique=meditate", &[], "").await;
     assert_eq!(response.status(), StatusCode::OK);
-    assert_eq!(header(&response, "x-eq"), "10");
+    assert_eq!(header(&response, "x-eq"), "Cold");
+    assert_eq!(held.eq(), 10);
     assert_eq!(header(&response, "x-stamina"), "10/10");
-    let again = send(&app, "JELQ", "/runs/cafebabe?technique=meditate", &[], "").await;
+    let again = send(app, "JELQ", "/runs/cafebabe?technique=meditate", &[], "").await;
     assert_eq!(again.status(), StatusCode::CONFLICT);
 }
 
 #[tokio::test]
 async fn meditation_respects_the_priapism_floor() {
-    let app = seeded_with(Floor::Bedroom, |run| {
+    let held = harness(Floor::Bedroom, SEED, |run| {
         run.body.eq = 80;
         run.body.conditions.priapism_turns = 3;
         run.online.meditation_taught = true;
     });
-    let calmed = send(&app, "JELQ", "/runs/cafebabe?technique=meditate", &[], "").await;
+    let calmed = send(
+        &held.app,
+        "JELQ",
+        "/runs/cafebabe?technique=meditate",
+        &[],
+        "",
+    )
+    .await;
     assert_eq!(calmed.status(), StatusCode::OK);
-    let view = send(&app, "GET", "/runs/cafebabe", &[], "").await;
-    assert_eq!(header(&view, "x-eq"), "75");
+    assert_eq!(header(&calmed, "x-eq"), "Priapic");
+    assert_eq!(held.eq(), 75);
 }
 
 #[tokio::test]
 async fn priapism_holds_the_floor_through_every_reset() {
-    let exit = seeded_with(Floor::Bedroom, |run| {
+    let exit = harness(Floor::Bedroom, SEED, |run| {
         run.body.eq = 90;
         run.here.turns = 99;
         run.body.conditions.priapism_turns = 3;
     });
-    let out = send(&exit, "POST", "/runs/cafebabe/floor", &[], "").await;
+    let out = send(&exit.app, "POST", "/runs/cafebabe/floor", &[], "").await;
     assert_eq!(out.status(), StatusCode::SEE_OTHER);
-    let view = send(&exit, "GET", "/runs/cafebabe", &[], "").await;
-    assert_eq!(header(&view, "x-eq"), "75");
+    assert_eq!(exit.eq(), 75);
 
-    let melon = seeded_with(Floor::Bedroom, |run| {
+    let melon = harness(Floor::Bedroom, SEED, |run| {
         run.body.eq = 95;
         run.here.kitchen.melon_offered = true;
         run.body.conditions.priapism_turns = 2;
     });
-    let bite = send(&melon, "POST", "/runs/cafebabe/kitchen/watermelon", &[], "").await;
+    let bite = send(
+        &melon.app,
+        "POST",
+        "/runs/cafebabe/kitchen/watermelon",
+        &[],
+        "",
+    )
+    .await;
     assert_eq!(bite.status(), StatusCode::OK);
-    let view = send(&melon, "GET", "/runs/cafebabe", &[], "").await;
-    assert_eq!(header(&view, "x-eq"), "75");
+    assert_eq!(melon.eq(), 75);
 }
 
 #[tokio::test]
@@ -261,7 +277,7 @@ async fn an_energy_drink_ends_exhaustion_without_the_refractory_period() {
     assert_eq!(header(&drink, "x-stamina"), "3/10");
     assert_eq!(
         header(&drink, "x-eq"),
-        "60",
+        "Ideal",
         "still warm, unlike the refractory HOLD"
     );
     let jelq = send(&app, "JELQ", "/runs/cafebabe?technique=edge", &[], "").await;
@@ -286,29 +302,26 @@ async fn overstaying_a_floor_is_warned_then_punished() {
     let mut busted = 0;
     let mut moved = 0;
     for seed in 0..60u64 {
-        let app = app_with(Floor::ChangingRoom, seed, |run| {
+        let held = harness(Floor::ChangingRoom, seed, |run| {
             run.body.eq = 80;
             run.body.conditions.priapism_turns = 9;
             run.here.turns = 7;
         });
-        let eighth = send(&app, "HOLD", "/runs/cafebabe", &[], "").await;
+        let app = &held.app;
+        let eighth = send(app, "HOLD", "/runs/cafebabe", &[], "").await;
         assert!(
             warnings(&eighth)
                 .iter()
                 .any(|w| w.contains("The gym closes"))
         );
-        let ninth = send(&app, "HOLD", "/runs/cafebabe", &[], "").await;
+        let ninth = send(app, "HOLD", "/runs/cafebabe", &[], "").await;
         assert!(warnings(&ninth).iter().any(|w| w.contains("last turn")));
-        let tenth = send(&app, "HOLD", "/runs/cafebabe", &[], "").await;
+        let tenth = send(app, "HOLD", "/runs/cafebabe", &[], "").await;
         match tenth.status() {
             StatusCode::GONE => busted += 1,
             StatusCode::REQUEST_TIMEOUT => {
                 assert_eq!(header(&tenth, "x-floor"), "4");
-                assert_eq!(
-                    header(&tenth, "x-eq"),
-                    "75",
-                    "priapism holds the deflation at 75"
-                );
+                assert_eq!(held.eq(), 75, "priapism holds the deflation at 75");
                 moved += 1;
             }
             other => panic!("seed {seed} overstayed into {other}"),
@@ -345,15 +358,15 @@ async fn friction_at_the_limit_tears_the_foreskin() {
 
 #[tokio::test]
 async fn ice_treats_a_burn_even_through_priapism() {
-    let app = seeded_with(Floor::ChangingRoom, |run| {
+    let held = harness(Floor::ChangingRoom, SEED, |run| {
         run.body.eq = 80;
         run.body.conditions.priapism_turns = 3;
         run.body.conditions.friction_burn = true;
         run.body.friction = 9;
         run.items.stores.ice_packs = 1;
     });
-    let iced = send(&app, "JELQ", "/runs/cafebabe?technique=ice", &[], "").await;
-    assert_eq!(header(&iced, "x-eq"), "80");
+    let iced = send(&held.app, "JELQ", "/runs/cafebabe?technique=ice", &[], "").await;
+    assert_eq!(held.eq(), 80);
     assert_eq!(header(&iced, "x-friction"), "6/10");
     assert!(warnings(&iced).iter().all(|w| !w.contains("friction burn")));
 }
@@ -424,3 +437,32 @@ async fn the_refractory_period_gives_back_some_stamina_and_rarely_all() {
     }
     assert!((8..=35).contains(&full), "{full} second winds in 400");
 }
+
+#[tokio::test]
+async fn eq_is_named_rather_than_numbered() {
+    for (eq, setup, named) in [
+        (0, None, "Flaccid"),
+        (20, None, "Cold"),
+        (40, None, "Warm"),
+        (60, None, "Ideal"),
+        (60, Some("burn"), "Swollen"),
+        (80, None, "Swollen"),
+        (88, None, "Throbbing"),
+        (85, Some("ring"), "Straining"),
+        (93, None, "Straining"),
+        (97, None, "Imminent"),
+        (40, Some("priapism"), "Priapic"),
+    ] {
+        let app = seeded_with(Floor::Bedroom, |run| {
+            run.body.eq = eq;
+            match setup {
+                Some("burn") => run.body.conditions.friction_burn = true,
+                Some("ring") => run.items.kit.ring = true,
+                Some("priapism") => run.body.conditions.priapism_turns = 3,
+                _ => {}
+            }
+        });
+        let view = send(&app, "GET", "/runs/cafebabe", &[], "").await;
+        assert_eq!(header(&view, "x-eq"), named, "{eq} with {setup:?}");
+    }
+}

Modified file: src/ui.html+6 additions−6 deletions@@ -53,7 +53,7 @@ pre, li, p, td, label { overflow-wrap: anywhere; }
 const REL = "https://jelq.dev/rels/";
 const METHODS = ["JELQ", "HOLD", "GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "TRACE"];
 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", "overstayed", "run-ended"];
+const DEATHS = ["ruptured", "caught", "opened", "banned", "degloved", "zip", "watermelon", "overstayed", "run-ended"];
 let stocked = null;
 let excuses = [];
 let nonce = null;
@@ -64,7 +64,7 @@ const STATS = [
   ["x-girth", "Girth"],
   ["x-foreskin", "Foreskin"],
   ["x-friction", "Friction"],
-  ["x-eq", "EQ (aim for 50 to 70)"],
+  ["x-eq", "EQ"],
   ["x-stamina", "Stamina"],
   ["x-suspicion", "Suspicion"],
   ["x-shame", "Shame"],
@@ -153,8 +153,8 @@ function options(name) {
   if (name === "technique") return techniques.map(t => t.name);
   if (name === "also") {
     const first = technique(fieldValue("technique"));
-    if (!first || !first.lubricant) return [""];
-    const partners = techniques.filter(t => t.lubricant && t.name !== first.name && !clashes(first, t));
+    if (!first || !first.intensity) return [""];
+    const partners = techniques.filter(t => t.intensity && t.name !== first.name && !clashes(first, t));
     return [""].concat(partners.map(t => t.name));
   }
   if (name === "lube") {
@@ -272,7 +272,7 @@ function fieldNames() {
     const chosen = technique(fieldValue("technique"));
     names = ["technique"];
     if (options("also").length > 1) names.push("also");
-    if (chosen && chosen.lubricant) names.push("intensity");
+    if (chosen && chosen.intensity) names.push("intensity");
     if (["required", "optional"].includes(lubeRule())) names.push("lube");
   }
   const scoped = run && !["runs", "global"].includes(t.key);
@@ -330,7 +330,7 @@ function parseLinks(header) {
     const params = Object.fromEntries([...match[2].matchAll(/([a-z-]+)="([^"]*)"/g)].map(p => [p[1], p[2]]));
     const name = (params.rel || "").replace(REL, "");
     if (name === "technique") {
-      moves.push({ name: params.title, lubricant: params.lubricant || null });
+      moves.push({ name: params.title, lubricant: params.lubricant || null, intensity: params.intensity || null });
       continue;
     }
     const methods = (params.allow || "GET").split(",").map(s => s.trim());

jelq

Commit e028a4184d00

Commit `e028a4184d00`