From 16113d70ea99231b1f7d0a1709e5da53418e0b0f Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Thu, 29 Nov 2018 19:22:48 -0500 Subject: [PATCH] Fixes --- src/npc/newSlaveIncestSex.tw | 9 +++++++-- src/uncategorized/pCoupAttempt.tw | 2 +- src/uncategorized/reBoomerang.tw | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw index d4d2680a192..e9c4beae5aa 100644 --- a/src/npc/newSlaveIncestSex.tw +++ b/src/npc/newSlaveIncestSex.tw @@ -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 */ diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw index 408c7354089..0084e0742fa 100644 --- a/src/uncategorized/pCoupAttempt.tw +++ b/src/uncategorized/pCoupAttempt.tw @@ -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.">> diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw index 6b79d7220b7..5f015e8a5de 100644 --- a/src/uncategorized/reBoomerang.tw +++ b/src/uncategorized/reBoomerang.tw @@ -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">> -- GitLab