From 9b7b0a81bbce965bab7dc011a50d59ae41923e10 Mon Sep 17 00:00:00 2001 From: Cayleth <vikingbaerserker@gmail.com> Date: Wed, 6 Mar 2019 18:51:19 -0800 Subject: [PATCH] Move for loop behind pregsource Fix for surrogacy later --- src/init/storyInit.tw | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index cf5245bd8b2..a825ed44650 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -95,30 +95,30 @@ You should have received a copy of the GNU General Public License along with thi <<set $slaves[_i].sisters += 1>> <</if>> <</for>> + <<if $slaves[_k].pregSource > 0>> + <<set $slaves[_k].pregSource += _NGPOffset>> + <<set _getFather = $slaveIndices[$slaves[_k].pregSource]>> + <<if ndef _getFather>> + <<set $slaves[_k].pregSource = 0>> + <</if>> + <</if>> <<for _sInit = 0; _sInit < $slaves[_k].womb.length; _sInit++>> - <<if $slaves[_k].pregSource > 0>> - <<set $slaves[_k].pregSource += _NGPOffset>> - <<set _getFather = $slaveIndices[$slaves[_k].pregSource]>> - <<if ndef _getFather>> - <<set $slaves[_k].pregSource = 0>> - <</if>> - <<if $slaves[_k].womb[_sInit].fatherID > 0>> - <<set $slaves[_k].womb[_sInit].fatherID += _NGPOffset>> - <</if>> - <<if $slaves[_k].womb[_sInit].genetics.father > 0>> - <<set $slaves[_k].womb[_sInit].genetics.father += _NGPOffset>> - <<elseif $freshPC == 1 && $slaves[_k].womb[_sInit].genetics.father == -1>> - <<set $slaves[_k].womb[_sInit].genetics.father = -_NGPOffset>> - <<elseif $slaves[_k].womb[_sInit].genetics.father < -1>> - <<set $slaves[_k].womb[_sInit].genetics.father -= _NGPOffset>> - <</if>> - <<if $slaves[_k].womb[_sInit].genetics.mother > 0>> - <<set $slaves[_k].womb[_sInit].genetics.mother += _NGPOffset>> - <<elseif $freshPC == 1 && $slaves[_k].womb[_sInit].genetics.mother == -1>> - <<set $slaves[_k].womb[_sInit].genetics.mother = -_NGPOffset>> - <<elseif $slaves[_k].womb[_sInit].genetics.mother < -1>> - <<set $slaves[_k].womb[_sInit].genetics.mother -= _NGPOffset>> - <</if>> + <<if $slaves[_k].womb[_sInit].fatherID > 0>> + <<set $slaves[_k].womb[_sInit].fatherID += _NGPOffset>> + <</if>> + <<if $slaves[_k].womb[_sInit].genetics.father > 0>> + <<set $slaves[_k].womb[_sInit].genetics.father += _NGPOffset>> + <<elseif $freshPC == 1 && $slaves[_k].womb[_sInit].genetics.father == -1>> + <<set $slaves[_k].womb[_sInit].genetics.father = -_NGPOffset>> + <<elseif $slaves[_k].womb[_sInit].genetics.father < -1>> + <<set $slaves[_k].womb[_sInit].genetics.father -= _NGPOffset>> + <</if>> + <<if $slaves[_k].womb[_sInit].genetics.mother > 0>> + <<set $slaves[_k].womb[_sInit].genetics.mother += _NGPOffset>> + <<elseif $freshPC == 1 && $slaves[_k].womb[_sInit].genetics.mother == -1>> + <<set $slaves[_k].womb[_sInit].genetics.mother = -_NGPOffset>> + <<elseif $slaves[_k].womb[_sInit].genetics.mother < -1>> + <<set $slaves[_k].womb[_sInit].genetics.mother -= _NGPOffset>> <</if>> <</for>> <<if $slaves[_k].cloneID != 0>> -- GitLab