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

Merge branch 'fixes' into 'pregmod-master'

Fixes

Closes #363

See merge request pregmodfan/fc-pregmod!3045
parents 8e9d96d4 16113d70
No related branches found
No related tags found
No related merge requests found
......@@ -21,8 +21,13 @@
<<set _one = relativeTerm($activeSlave, $sissy)>> /* sissy is active's blank */
<<set _other = relativeTerm($sissy, $activeSlave)>> /* active is sissy's blank */
<<else>>
<<set _one = $sissy.relation >>
<<set _other = $activeSlave.relation >>
<<if $sissy.actualAge == $activeSlave.actualAge>>
<<set _one = "twin">>
<<set _other = "twin">>
<<else>>
<<set _one = $sissy.relation >>
<<set _other = $activeSlave.relation >>
<</if>>
<</if>>
/* gender relation descriptions */
......
......@@ -247,7 +247,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<</if>>
<<for _pca = 0; _pca < $slaves.length; _pca++>>
<<run WombChangeID($slaves[_pca], $traitor.missingParentTag, $traitor.ID)>>
<<run WombChangeGeneID(slave, $traitor.missingParentTag, $traitor.ID)>>
<<run WombChangeGeneID($slaves[_pca], $traitor.missingParentTag, $traitor.ID)>>
<</for>>
<<set $traitor.health = random(-80,-60)>>
<<set $traitor.origin = "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">>
......
......@@ -455,7 +455,7 @@ It isn't obvious how she managed to escape, though no doubt you could review the
<</if>>
<<for _reb = 0; _reb < $slaves.length; _reb++>>
<<run WombChangeID($slaves[_reb], $activeSlave.missingParentTag, $activeSlave.ID)>>
<<run WombChangeGeneID(slave, $activeSlave.missingParentTag, $activeSlave.ID)>>
<<run WombChangeGeneID($slaves[_reb], $activeSlave.missingParentTag, $activeSlave.ID)>>
<</for>>
<<set $boomerangStats = 0>>
<<replace "#result">>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment