diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index de74a0e91dc7cfdc4f302bd63bcf68cc65b066c6..5f2f6c7417c0e1fcf1e272b34cdd4c9b57c9d214 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along with thi /* This needs to be broken down into individual files that can be added to StoryInit instead. */ +<<set _NGPOffset = 1200000>> <<if def $slaves>> <<set _SL = $slaves.length>> <<for _i = 0; _i < _SL; _i++>> @@ -30,25 +31,25 @@ You should have received a copy of the GNU General Public License along with thi <</for>> <<for _i = 0; _i < _SL; _i++>> <<if $slaves[_i].assignment == "be imported">> - <<set $slaves[_i].ID += 1200000>> + <<set $slaves[_i].ID += _NGPOffset>> <<set $slaves[_i].assignment = "rest">> <<set $slaves[_i].assignmentVisible = 1>> <<set $slaves[_i].weekAcquired = 0>> <<set $slaves[_i].newGamePlus = 1>> <<PMODinit $slaves[_i]>> <<if $slaves[_i].mother > 0>> - <<set $slaves[_i].mother += 1200000>> + <<set $slaves[_i].mother += _NGPOffset>> <<elseif $freshPC == 1 && $slaves[_i].mother == -1>> - <<set $slaves[_i].mother = -1200000>> + <<set $slaves[_i].mother = -_NGPOffset>> <<elseif $slaves[_i].mother < -1>> - <<set $slaves[_i].mother -= 1200000>> + <<set $slaves[_i].mother -= _NGPOffset>> <</if>> <<if $slaves[_i].father > 0>> - <<set $slaves[_i].father += 1200000>> + <<set $slaves[_i].father += _NGPOffset>> <<elseif $freshPC == 1 && $slaves[_i].father == -1>> - <<set $slaves[_i].father = -1200000>> + <<set $slaves[_i].father = -_NGPOffset>> <<elseif $slaves[_i].father < -1>> - <<set $slaves[_i].father -= 1200000>> + <<set $slaves[_i].father -= _NGPOffset>> <</if>> <<set $slaves[_i].daughters = 0>> <<set $slaves[_i].sisters = 0>> @@ -68,13 +69,13 @@ You should have received a copy of the GNU General Public License along with thi <<set $slaves[_i].nationality = "Ancient Chinese Revivalist">> <</if>> <<if $slaves[_i].relationTarget != 0>> - <<set $slaves[_i].relationTarget += 1200000>> + <<set $slaves[_i].relationTarget += _NGPOffset>> <</if>> <<if $slaves[_i].relationshipTarget != 0>> - <<set $slaves[_i].relationshipTarget += 1200000>> + <<set $slaves[_i].relationshipTarget += _NGPOffset>> <</if>> <<if $slaves[_i].cloneID != 0>> - <<set $slaves[_i].cloneID += 1200000>> + <<set $slaves[_i].cloneID += _NGPOffset>> <</if>> <<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>> <<set $slaves[_i].drugs = "no drugs">> @@ -95,28 +96,28 @@ You should have received a copy of the GNU General Public License along with thi <</if>> <</for>> <<if $slaves[_k].pregSource > 0>> - <<set $slaves[_k].pregSource += 1200000>> + <<set $slaves[_k].pregSource += _NGPOffset>> <<set _getFather = $slaveIndices[$slaves[_k].pregSource]>> <<if ndef _getFather>> <<set $slaves[_k].pregSource = 0>> <</if>> <<for _sInit = 0; _sInit < $slaves[_k].womb.length; _sInit++>> <<if $slaves[_k].womb[_sInit].fatherID > 0>> - <<set $slaves[_k].womb[_sInit].fatherID += 1200000>> + <<set $slaves[_k].womb[_sInit].fatherID += _NGPOffset>> <</if>> <<if $slaves[_k].womb[_sInit].genetics.father > 0>> - <<set $slaves[_k].womb[_sInit].genetics.father += 1200000>> + <<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 = -1200000>> + <<set $slaves[_k].womb[_sInit].genetics.father = -_NGPOffset>> <<elseif $slaves[_k].womb[_sInit].genetics.father < -1>> - <<set $slaves[_k].womb[_sInit].genetics.father -= 1200000>> + <<set $slaves[_k].womb[_sInit].genetics.father -= _NGPOffset>> <</if>> <<if $slaves[_k].womb[_sInit].genetics.mother > 0>> - <<set $slaves[_k].womb[_sInit].genetics.mother += 1200000>> + <<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 = -1200000>> + <<set $slaves[_k].womb[_sInit].genetics.mother = -_NGPOffset>> <<elseif $slaves[_k].womb[_sInit].genetics.mother < -1>> - <<set $slaves[_k].womb[_sInit].genetics.mother -= 1200000>> + <<set $slaves[_k].womb[_sInit].genetics.mother -= _NGPOffset>> <</if>> <</for>> <</if>> @@ -392,24 +393,24 @@ You should have received a copy of the GNU General Public License along with thi <<set $PC.career = "arcology owner", $PC.trading = 100, $PC.warfare = 100, $PC.hacking = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>> <</if>> <<if $PC.mother > 0>> - <<set $PC.mother += 1200000>> + <<set $PC.mother += _NGPOffset>> <<elseif $PC.mother < 0>> - <<set $PC.mother -= 1200000>> + <<set $PC.mother -= _NGPOffset>> <</if>> <<if $PC.father > 0>> - <<set $PC.father += 1200000>> + <<set $PC.father += _NGPOffset>> <<elseif $PC.father < 0>> - <<set $PC.father -= 1200000>> + <<set $PC.father -= _NGPOffset>> <</if>> <<if $PC.pregSource > 0>> - <<set $PC.pregSource += 1200000>> + <<set $PC.pregSource += _NGPOffset>> <<set _getFather = $slaveIndices[$PC.pregSource]>> <<if ndef _getFather>> <<set $PC.pregSource = 0>> <</if>> <<for _sInit = 0; _sInit < $PC.womb.length; _sInit++>> <<if $PC.womb[_sInit].fatherID > 0>> - <<set $PC.womb[_sInit].fatherID += 1200000>> + <<set $PC.womb[_sInit].fatherID += _NGPOffset>> <</if>> <</for>> <</if>> @@ -420,10 +421,10 @@ You should have received a copy of the GNU General Public License along with thi <<for _i = 0; _i < _SL; _i++>> <<if $familyTesting == 1>> <<if $slaves[_i].mother == -1>> - <<set $slaves[_i].mother = $missingParentID+1200000>> + <<set $slaves[_i].mother = $missingParentID+_NGPOffset>> <</if>> <<if $slaves[_i].father == -1>> - <<set $slaves[_i].father = $missingParentID+1200000>> + <<set $slaves[_i].father = $missingParentID+_NGPOffset>> <</if>> <<if $slaves[_i].pregSource == -1>> <<set $slaves[_i].pregSource = 0>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index ac65d6a8e82b00f6a8ac9d2dde83a6d052b18945..1b085286a926d13cf71cef1d09df80305a2e5143 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1175,7 +1175,7 @@ is <<elseif isAunt(_lover, $activeSlave)>> $He is in an @@.lightgreen;incestuous relationship with $his niece, <<= SlaveFullName(_lover)>>.@@ <<elseif areCousins($activeSlave, _lover)>> - $He is in an @@.lightgreen;incestuous relationship with $his cousin, <<= SlaveFullName(_lover)>>.@ + $He is in an @@.lightgreen;incestuous relationship with $his cousin, <<= SlaveFullName(_lover)>>.@@ <</if>> <<else>> <<switch areSisters($activeSlave, _lover)>>