From 3969427b26d67c55f23194c6cbb1c28a012c316b Mon Sep 17 00:00:00 2001
From: hwp <>
Date: Sun, 27 Jun 2021 12:13:29 -0400
Subject: [PATCH] initial commit
---
game/base-combat/npc-generation.twee | 29 +++++++++------------
game/base-system/named-npcs.twee | 39 ++++++++++++++++------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/game/base-combat/npc-generation.twee b/game/base-combat/npc-generation.twee
index 28d2d90a79..48700e6e7a 100644
--- a/game/base-combat/npc-generation.twee
+++ b/game/base-combat/npc-generation.twee
@@ -32,18 +32,14 @@
<</if>>
<<elseif _generate_partner is 1>>
<<unset _generate_partner>>
- <<if $NPCList[0].gender is "f">>
- <<if $homochance lt random(1, 100)>>
+ <<if $homochance lt random(1, 100)>>
+ <<if $NPCList[0].gender is "f">>
<<set $NPCList[_n].gender to "m">><<set $NPCList[_n].pronoun to "m">>
<<else>>
<<set $NPCList[_n].gender to "f">><<set $NPCList[_n].pronoun to "f">>
<</if>>
<<else>>
- <<if $homochance lt random(1, 100)>>
- <<set $NPCList[_n].gender to "f">><<set $NPCList[_n].pronoun to "f">>
- <<else>>
- <<set $NPCList[_n].gender to "m">><<set $NPCList[_n].pronoun to "m">>
- <</if>>
+ <<set $NPCList[_n].gender to $NPCList[0].gender>><<set $NPCList[_n].pronoun to $NPCList[0].pronoun>>
<</if>>
<<else>>
<<if $malechance lt $rng>>
@@ -539,8 +535,9 @@
<<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">>
- <<set $NPCList[_n].gender to "f">>
+ <<set $NPCList[_n].gender to "h">>
<</if>>
<<elseif $NPCList[_n].pronoun is "f">>
<<if random(0, 99) gte $dgchance>>
@@ -548,7 +545,8 @@
<<set $NPCList[_n].gender to "f">>
<<else>>
<<set $NPCList[_n].penis to "clothed">>
- <<set $NPCList[_n].gender to "m">>
+ <<set $NPCList[_n].vagina to "clothed">>
+ <<set $NPCList[_n].gender to "h">>
<</if>>
<</if>>
<</if>>
@@ -706,8 +704,8 @@
<</if>>
<</if>>
-<<if $NPCList[_n].adult is 1>> <!-- set adult pp size -->
- <<if $NPCList[_n].gender is "m" or $NPCList[_n].gender is "h">>
+<<if $NPCList[_n].gender is "m" or $NPCList[_n].gender is "h">>
+ <<if $NPCList[_n].adult is 1>> <!-- set adult pp size -->
<<switch _rngpp>>
<<case 0>>
<<set $NPCList[_n].penisdesc to "tiny penis">>
@@ -722,9 +720,7 @@
<<set $NPCList[_n].penisdesc to "penis">>
<<set $NPCList[_n].penissize to 2>>
<</switch>>
- <</if>>
-<<else>> <!-- set student pp size -->
- <<if $NPCList[_n].gender is "m" or $NPCList[_n].gender is "h">>
+ <<else>> <!-- set student pp size -->
<<switch _rngpp>>
<<case 0>>
<<set $NPCList[_n].penisdesc to "tiny penis">>
@@ -740,7 +736,7 @@
<</if>>
<<set $rng to random(1, 100)>>
-<<if $NPCList[_n].pronoun is "f">>
+<<if $NPCList[_n].breastsize gte 1>>
<<if $NPCList[_n].adult is 1>>
<<if $rng gte 61>>
<<set $NPCList[_n].lactation to 1>>
@@ -794,8 +790,7 @@
<</switch>>
<<set $NPCList[_xx].penis to "clothed">>
-<<set $NPCList[_xx].vagina to "none">>
-<<set $NPCList[_xx].gender to "m">>
+<<set $NPCList[_xx].gender to "h">>
<<switch random(1, 4)>>
<<case 1 2 3>>
diff --git a/game/base-system/named-npcs.twee b/game/base-system/named-npcs.twee
index 57eb4d9088..deb53896cb 100644
--- a/game/base-system/named-npcs.twee
+++ b/game/base-system/named-npcs.twee
@@ -145,13 +145,13 @@ Zohar
<<if random(0, 99) gte $cbchance>>
<<set $NPCName[_i].gender to "m">>
<<else>>
- <<set $NPCName[_i].gender to "f">>
+ <<set $NPCName[_i].gender to "h">>
<</if>>
<<elseif $NPCName[_i].pronoun is "f">>
<<if random(0, 99) gte $dgchance>>
<<set $NPCName[_i].gender to "f">>
<<else>>
- <<set $NPCName[_i].gender to "m">>
+ <<set $NPCName[_i].gender to "h">>
<</if>>
<</if>>
<</if>>
@@ -186,10 +186,10 @@ Zohar
<</if>>
<<if $NPCName[_i].breastsize is 0 or $args[0] is "breasts">>
- <<if $NPCName[_i].pronoun is "f">>
- <<set $NPCName[_i].breastsize to random (_b_mod_lower, _b_mod_upper)>>
- <<else>>
+ <<if $NPCName[_i].pronoun is "m">>
<<set $NPCName[_i].breastsize to 0>>
+ <<else>>
+ <<set $NPCName[_i].breastsize to random (_b_mod_lower, _b_mod_upper)>>
<</if>>
<</if>>
<<if $NPCName[_i].breastsize gt 0>>
@@ -223,7 +223,10 @@ Zohar
<</if>>
<<if $NPCName[_i].penissize is 0 or $args[0] is "penis">>
- <<if $NPCName[_i].gender is "m">>
+ <<if $NPCName[_i].gender is "f">>
+ <<set $NPCName[_i].penissize to 0>>
+ <<set $NPCName[_i].penisdesc to "none">>
+ <<else>>
<<switch random (_p_mod_lower, _p_mod_upper)>>
<<case 5 6 7>>
<<set $NPCName[_i].penisdesc to either("thick cock","hefty cock","big cock","large cock","veiny cock","meaty cock")>>
@@ -238,9 +241,6 @@ Zohar
<<set $NPCName[_i].penisdesc to either("tiny penis","pathetic cock","little penis","small penis","mini penis","micro penis")>>
<<set $NPCName[_i].penissize to 1>>
<</switch>>
- <<else>>
- <<set $NPCName[_i].penissize to 0>>
- <<set $NPCName[_i].penisdesc to "none">>
<</if>>
<</if>>
<!-- Set pp to size in case PC selected it-->
@@ -395,13 +395,17 @@ Zohar
<<set $NPCList[0].breastsize to $NPCName[_i].breastsize>>
<<set $NPCList[0].breastsdesc to $NPCName[_i].breastsdesc>>
<<set $NPCList[0].breastdesc to $NPCName[_i].breastdesc>>
+<<set $NPCList[0].vagina to "clothed">>
+
+<<set $NPCList[0].penis to "clothed">>
+<<set $NPCList[0].penissize to $NPCName[_i].penissize>>
+<<set $NPCList[0].penisdesc to $NPCName[_i].penisdesc>>
<<if $NPCName[_i].gender is "m">>
- <<set $NPCList[0].penis to "clothed">>
- <<set $NPCList[0].penissize to $NPCName[_i].penissize>>
- <<set $NPCList[0].penisdesc to $NPCName[_i].penisdesc>>
-<<else>>
- <<set $NPCList[0].vagina to "clothed">>
+ <<set $NPCList[0].vagina to "none">>
+<</if>>
+<<if $NPCName[_i].gender is "f">>
+ <<set $NPCList[0].penis to "none">>
<</if>>
<<set $NPCList[0].insecurity to $NPCName[_i].insecurity>>
@@ -422,11 +426,12 @@ Zohar
<<set $NPCList[0].lefthand to "none">>
<<set $NPCList[0].righthand to "none">>
<<set $NPCList[0].stance to "approach">>
+ <<set $NPCList[0].penis to 0>>
+ <<set $NPCList[0].vagina to 0>>
<<if $NPCName[_i].gender is "m">>
- <<set $NPCList[0].penis to 0>>
<<set $NPCList[0].vagina to "none">>
- <<else>>
- <<set $NPCList[0].vagina to 0>>
+ <</if>>
+ <<if $NPCName[_i].gender is "f">>
<<set $NPCList[0].penis to "none">>
<</if>>
<<if $blackWolfMonsterRoll isnot undefined and $blackwolfmonster is 1>>
--
GitLab