From 8e8033b0792a5b3c0b3f05e206d977702035068a Mon Sep 17 00:00:00 2001 From: hwp <> Date: Sun, 8 Aug 2021 20:01:51 -0400 Subject: [PATCH] added double sliders, basically readded trans npcs --- game/base-combat/npc-generation.twee | 11 +++++-- game/base-system/settings.twee | 49 +++++++++++++++++++--------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/game/base-combat/npc-generation.twee b/game/base-combat/npc-generation.twee index eca6219407..f953209b64 100644 --- a/game/base-combat/npc-generation.twee +++ b/game/base-combat/npc-generation.twee @@ -530,19 +530,26 @@ <<set $NPCList[_n].penis to 0>> <</if>> <<else>> + <<set $rng to random(0,99)>> <<if $NPCList[_n].pronoun is "m">> - <<if random(0, 99) gte $cbchance>> + <<if $rng lte $mregularchance>> <<set $NPCList[_n].penis to "clothed">> <<set $NPCList[_n].gender to "m">> + <<elseif $rng gte (100 - $cbchance)>> + <<set $NPCList[_n].vagina to "clothed">> + <<set $NPCList[_n].gender to "f">> <<else>> <<set $NPCList[_n].penis to "clothed">> <<set $NPCList[_n].vagina to "clothed">> <<set $NPCList[_n].gender to "h">> <</if>> <<elseif $NPCList[_n].pronoun is "f">> - <<if random(0, 99) gte $dgchance>> + <<if $rng lte $fregularchance>> <<set $NPCList[_n].vagina to "clothed">> <<set $NPCList[_n].gender to "f">> + <<elseif $rng gte (100 - $dgchance)>> + <<set $NPCList[_n].penis to "clothed">> + <<set $NPCList[_n].gender to "m">> <<else>> <<set $NPCList[_n].penis to "clothed">> <<set $NPCList[_n].vagina to "clothed">> diff --git a/game/base-system/settings.twee b/game/base-system/settings.twee index d086c4807e..4227cf075f 100644 --- a/game/base-system/settings.twee +++ b/game/base-system/settings.twee @@ -628,30 +628,49 @@ <<numberslider "$malechance" $malechance 0 100 1>> <br><br> - <span class="gold">Percentage of women that have a penis and a vagina</span> - <br> - <<numberslider "$dgchance" $dgchance 0 100 1>> - <br><br> + <span class="gold">Female Genitals</span> + <br> + <div class="solidBorderContainer" style="width:50%"> + <<if $fregular is undefined>> + <<set $fregular to 100-$dgchance>> + <<set $fhermchance to 0>> + <</if>> + + <span class="gold">Percentage of women that have only a vagina:</span> + <span id="numberslider-value-fregular">$fregular</span><br> + <span class="gold">Percentage of women that have a penis and a vagina:</span> + <span id="numberslider-value-fhermchance">$fhermchance</span><br> + <span class="gold">Percentage of women that have only a penis:</span> + <span id="numberslider-value-dgchance">$dgchance</span><br><br> + + <<doubleslider "fregular" "fhermchance" "dgchance" "#fa0000" "#ab00fa" "#006cfa">> + </div> - <!-- <span class="gold">Percentage of women that have a penis and no vagina</span> <br> - <<numberslider "$dgchance" $dgchance 0 100 1>> - <br><br> --> <span class="gold">Percentage of women that have a strap-on penis</span> <br> <<numberslider "$straponchance" $straponchance 0 100 1>> <br><br> - <span class="gold">Percentage of men that have a penis and a vagina</span> - <br> - <<numberslider "$cbchance" $dgchance 0 100 1>> - <br><br> - - <!-- <span class="gold">Percentage of men that have no penis and a vagina</span> + <span class="gold">Male Genitals</span> + <br> + <div class="solidBorderContainer" style="width:50%"> + <<if $mregular is undefined>> + <<set $mregular to 100-$cbchance>> + <<set $mhermchance to 0>> + <</if>> + + <span class="gold">Percentage of men that have only a penis</span><br> + <span id="numberslider-value-mregular">$mregular</span><br> + <span class="gold">Percentage of men that have a penis and a vagina</span><br> + <span id="numberslider-value-mhermchance">$mhermchance</span><br> + <span class="gold">Percentage of men that have only a vagina</span><br> + <span id="numberslider-value-cbchance">$cbchance</span><br> + + <<doubleslider "mregular" "mhermchance" "cbchance" "#006cfa" "#ab00fa" "#fa0000">> + </div> <br> - <<numberslider "$cbchance" $cbchance 0 100 1>> - <br><br> --> <span class="gold">Percentage of other victims that are male</span> <br> -- GitLab