From 45b76d644e6b2cc1211408c37349e3b15d27ed2e Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 18 Sep 2017 02:44:07 -0400 Subject: [PATCH] Fixes and custom eye colors. --- src/pregmod/widgets/pregmodWidgets.tw | 4 +++- src/uncategorized/addCustomDescriptors.tw | 9 +++++++++ src/uncategorized/seBirth.tw | 8 ++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 14049ba3e50..e313322a711 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1574,7 +1574,9 @@ created by <<set $birthsTotal += $slaves[$i].pregType>> <<if $slaves[$i].pregSource > 0>> <<set _babyDaddy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].pregSource; })>> - <<set $slaves[_babyDaddy].slavesFathered += $slaves[$i].pregType>> + <<if _babyDaddy != -1>> + <<set $slaves[_babyDaddy].slavesFathered += $slaves[$i].pregType>> + <</if>> <<elseif $slaves[$i].pregSource == -1>> <<set $PC.slavesFathered += $slaves[$i].pregType>> <</if>> diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw index 8ee47b6f472..7240ae36b49 100644 --- a/src/uncategorized/addCustomDescriptors.tw +++ b/src/uncategorized/addCustomDescriptors.tw @@ -120,6 +120,15 @@ Her hair is $activeSlave.hColor in color. Custom hair color: <<textbox "$activeSlave.hColor" $activeSlave.hColor "Add custom descriptors">> <br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'black with purple highlights'// +<br><br> +<<if $activeSlave.eyeColor != $activeSlave.origEye>> + She is wearing $activeSlave.eyeColor lenses. +<<else>> + She has $activeSlave.eyeColor eyes. +<</if>> +Custom eye color: <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "Add custom descriptors">> +<br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'blue'// + <br><br> Change her custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Add custom descriptors">> <br> //For best results, use complete sentences; for example: 'She has blue stars tattooed along her cheekbones.'// diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index 17818839181..99545c4d663 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -551,7 +551,9 @@ Since $possessive <<if $slaves[$i].mpreg == 1>>ass<<else>>vagina<</if>> was spar <<set $birthsTotal += $slaves[$i].pregType>> <<if $slaves[$i].pregSource > 0>> <<set _babyDaddy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].pregSource; })>> - <<set $slaves[_babyDaddy].slavesFathered += $slaves[$i].pregType>> + <<if _babyDaddy != -1>> + <<set $slaves[_babyDaddy].slavesFathered += $slaves[$i].pregType>> + <</if>> <<elseif $slaves[$i].pregSource == -1>> <<set $PC.slavesFathered += $slaves[$i].pregType>> <</if>> @@ -969,7 +971,9 @@ Childbirth has @@.lime;stretched out $possessive vagina.@@ <<set $birthsTotal += $slaves[$i].pregType>> <<if $slaves[$i].pregSource > 0>> <<set _babyDaddy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].pregSource; })>> - <<set $slaves[_babyDaddy].slavesFathered += $slaves[$i].pregType>> + <<if _babyDaddy != -1>> + <<set $slaves[_babyDaddy].slavesFathered += $slaves[$i].pregType>> + <</if>> <<elseif $slaves[$i].pregSource == -1>> <<set $PC.slavesFathered += $slaves[$i].pregType>> <</if>> -- GitLab