Skip to content
Snippets Groups Projects
Commit 2d94f4b1 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'patch-1' into 'pregmod-master' 

Prevent incestuous recETS pairs from hating their partner's gender

See merge request !7526
parents cb84758b 15709b93
No related branches found
No related tags found
1 merge request!7526Prevent incestuous recETS pairs from hating their partner's gender
Hide whitespace changes
Inline Side-by-side
src/uncategorized/recETS.tw
+ 42
− 0
View file @ 2d94f4b1
...@@ -167,6 +167,9 @@ ...@@ -167,6 +167,9 @@
<<set $activeSlave.clothes = "conservative clothing">> <<set $activeSlave.clothes = "conservative clothing">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "bushy">> <<set $activeSlave.pubicHStyle = "bushy">>
<<if $activeSlave.behavioralFlaw == "hates men">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>> <<set $activeSlave.relationship = 3>>
...@@ -191,6 +194,9 @@ ...@@ -191,6 +194,9 @@
<<set $activeSlave.faceShape = "masculine">> <<set $activeSlave.faceShape = "masculine">>
<<set $activeSlave.clothes = "conservative clothing">> <<set $activeSlave.clothes = "conservative clothing">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<if $activeSlave.behavioralFlaw == "hates women">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>> <<set $activeSlave.relationship = 3>>
...@@ -226,6 +232,9 @@ ...@@ -226,6 +232,9 @@
<<set $activeSlave.clothes = "cutoffs and a t-shirt">> <<set $activeSlave.clothes = "cutoffs and a t-shirt">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">> <<set $activeSlave.pubicHStyle = "in a strip">>
<<if $activeSlave.behavioralFlaw == "hates men">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<run setMissingParents($activeSlave)>> <<run setMissingParents($activeSlave)>>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
...@@ -252,6 +261,9 @@ ...@@ -252,6 +261,9 @@
<<set $activeSlave.clothes = "cutoffs and a t-shirt">> <<set $activeSlave.clothes = "cutoffs and a t-shirt">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">> <<set $activeSlave.pubicHStyle = "in a strip">>
<<if $activeSlave.behavioralFlaw == "hates women">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<run setMissingParents($activeSlave)>> <<run setMissingParents($activeSlave)>>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
...@@ -276,6 +288,9 @@ ...@@ -276,6 +288,9 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.attrXY = 80>> <<set $activeSlave.attrXY = 80>>
<<set $activeSlave.pubicHStyle = "bushy">> <<set $activeSlave.pubicHStyle = "bushy">>
<<if $activeSlave.behavioralFlaw == "hates men">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<run setMissingParents($activeSlave)>> <<run setMissingParents($activeSlave)>>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
...@@ -300,6 +315,9 @@ ...@@ -300,6 +315,9 @@
<<set $activeSlave.clothes = "cutoffs and a t-shirt">> <<set $activeSlave.clothes = "cutoffs and a t-shirt">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">> <<set $activeSlave.pubicHStyle = "in a strip">>
<<if $activeSlave.behavioralFlaw == "hates women">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<run setMissingParents($activeSlave)>> <<run setMissingParents($activeSlave)>>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
...@@ -323,6 +341,9 @@ ...@@ -323,6 +341,9 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.attrXY = 80>> <<set $activeSlave.attrXY = 80>>
<<set $activeSlave.pubicHStyle = "bushy">> <<set $activeSlave.pubicHStyle = "bushy">>
<<if $activeSlave.behavioralFlaw == "hates men">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<run setMissingParents($activeSlave)>> <<run setMissingParents($activeSlave)>>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
...@@ -347,6 +368,9 @@ ...@@ -347,6 +368,9 @@
<<set $activeSlave.clothes = "cutoffs and a t-shirt">> <<set $activeSlave.clothes = "cutoffs and a t-shirt">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">> <<set $activeSlave.pubicHStyle = "in a strip">>
<<if $activeSlave.behavioralFlaw == "hates men">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<run setMissingParents($activeSlave)>> <<run setMissingParents($activeSlave)>>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
...@@ -383,6 +407,9 @@ ...@@ -383,6 +407,9 @@
<<set $activeSlave.clothes = "conservative clothing">> <<set $activeSlave.clothes = "conservative clothing">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "bushy">> <<set $activeSlave.pubicHStyle = "bushy">>
<<if $activeSlave.behavioralFlaw == "hates women">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>> <<set $activeSlave.relationship = 3>>
...@@ -407,6 +434,9 @@ ...@@ -407,6 +434,9 @@
<<set $activeSlave.faceShape = "masculine">> <<set $activeSlave.faceShape = "masculine">>
<<set $activeSlave.clothes = "conservative clothing">> <<set $activeSlave.clothes = "conservative clothing">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>> <<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<if $activeSlave.behavioralFlaw == "hates men">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "sinful">> <<set $activeSlave.behavioralQuirk = "sinful">>
<<set $activeSlave.canRecruit = 0>> <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>> <<set $activeSlave.relationship = 3>>
...@@ -761,6 +791,9 @@ ...@@ -761,6 +791,9 @@
<<set $activeSlave.lactationDuration = 0>> <<set $activeSlave.lactationDuration = 0>>
<<set $activeSlave.anus = 0>> <<set $activeSlave.anus = 0>>
<<set $activeSlave.butt -= 2>> <<set $activeSlave.butt -= 2>>
<<if $activeSlave.behavioralFlaw == "hates women">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "none">> <<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">> <<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.mother = $activeSlave.ID - 1000>> <<set $activeSlave.mother = $activeSlave.ID - 1000>>
...@@ -807,6 +840,9 @@ ...@@ -807,6 +840,9 @@
<<set $activeSlave.pregSource = $activeSlave.ID - 1000>> <<set $activeSlave.pregSource = $activeSlave.ID - 1000>>
<<run SetBellySize($activeSlave)>> <<run SetBellySize($activeSlave)>>
<<set $activeSlave.faceShape = "cute">> <<set $activeSlave.faceShape = "cute">>
<<if $activeSlave.behavioralFlaw == "hates men">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "none">> <<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">> <<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.father = $activeSlave.ID - 1000>> <<set $activeSlave.father = $activeSlave.ID - 1000>>
...@@ -845,6 +881,9 @@ ...@@ -845,6 +881,9 @@
<<set $activeSlave.lactationDuration = 0>> <<set $activeSlave.lactationDuration = 0>>
<<set $activeSlave.anus = 0>> <<set $activeSlave.anus = 0>>
<<set $activeSlave.pubicHStyle = "bushy">> <<set $activeSlave.pubicHStyle = "bushy">>
<<if $activeSlave.behavioralFlaw == "hates women">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "none">> <<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">> <<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.clothes = "conservative clothing">> <<set $activeSlave.clothes = "conservative clothing">>
...@@ -922,6 +961,9 @@ ...@@ -922,6 +961,9 @@
<<set $activeSlave.lactationDuration = 0>> <<set $activeSlave.lactationDuration = 0>>
<<set $activeSlave.anus = 0>> <<set $activeSlave.anus = 0>>
<<set $activeSlave.pubicHStyle = "bushy">> <<set $activeSlave.pubicHStyle = "bushy">>
<<if $activeSlave.behavioralFlaw == "hates women">>
<<set $activeSlave.behavioralFlaw = "none">>
<</if>>
<<set $activeSlave.behavioralQuirk = "none">> <<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">> <<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.clothes = "conservative clothing">> <<set $activeSlave.clothes = "conservative clothing">>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment