diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js index 0e882b9b451178f19b7f618094283835defc8bf3..0a0a688aaa2179fcbbbdc942c05fa9b532415314 100644 --- a/src/js/utilsFC.js +++ b/src/js/utilsFC.js @@ -2460,12 +2460,18 @@ window.randomCareer = function(slave) { } }; +/** + * @param {App.Entity.SlaveState} slave + */ +window.resyncSlaveHight = function(slave) { + slave.height = Math.round(Height.random(slave)); +}; /** * @param {App.Entity.SlaveState} slave */ window.resyncSlaveToAge = function(slave) { - slave.height = Height.random(slave); + resyncSlaveHight(slave); slave.pubertyXX = slave.actualAge < slave.pubertyAgeXX ? 0 : 1; slave.pubertyXY = slave.actualAge < slave.pubertyAgeXY ? 0 : 1; if (slave.actualAge < 12) { diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 29b107873b30207ff6e774117afe8606d8871659..caa05211cfcbde850a122ea55a4bf6eb67725a2f 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -721,7 +721,7 @@ <<textbox2 "$activeSlave.height" $activeSlave.height "Starting Girls">>cm <<comment>> <<link `"Average height for a " + $activeSlave.actualAge + " year old is " + Math.round(Height.mean($activeSlave)) + "cm. Apply."`>> - <<ResyncHeight $activeSlave>><<goto "Starting Girls">> + <<= resyncSlaveHight($activeSlave)>> <<goto "Starting Girls">> <</link>> <</options>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index c62bb18c2d6076a5d1fdb35417079bb9c403a5d2..b7b05d0bc64e1b59c654d6fb5c50b0e33c18d1b6 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -646,44 +646,6 @@ $activeSlave.slaveName is up for review: <</replace>> <</widget>> -<<widget "ResyncHeight">> - -<<set $args[0].height = Math.round(Height.random($args[0]))>> -/* -<<switch $activeSlave.actualAge>> -<<case 3>> - <<set $activeSlave.height = random(91,96)>> -<<case 4>> - <<set $activeSlave.height = random(97,104)>> -<<case 5>> - <<set $activeSlave.height = random(104,111)>> -<<case 6>> - <<set $activeSlave.height = random(112,119)>> -<<case 7>> - <<set $activeSlave.height = random(118,126)>> -<<case 8>> - <<set $activeSlave.height = random(124,132)>> -<<case 9>> - <<set $activeSlave.height = random(129,137)>> -<<case 10>> - <<set $activeSlave.height = random(133,142)>> -<<case 11>> - <<set $activeSlave.height = random(140,149)>> -<<case 12>> - <<set $activeSlave.height = random(147,156)>> -<<case 13>> - <<set $activeSlave.height = random(152,162)>> -<<case 14>> - <<set $activeSlave.height = random(156,165)>> -<<case 15>> - <<set $activeSlave.height = random(157,166)>> -<<default>> - <<set $activeSlave.height = random(159,167)>> -<</switch>> -*/ - -<</widget>> - <<widget "BodyguardWeapon">> <<if ($activeSlave.muscles+$activeSlave.height-100)/25 > 5>> diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw index 1ff63ff69aec758b1ad2d841a876ceb1d9c775de..dd808d61ef39b2ac98525e9c0c39d21c62770585 100644 --- a/src/uncategorized/pRivalryHostage.tw +++ b/src/uncategorized/pRivalryHostage.tw @@ -199,7 +199,7 @@ <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> -<<ResyncHeight $activeSlave>> +<<= resyncSlaveHight($activeSlave)>> <<switch $rivalryFS>> <<case "Repopulation Focus">> diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw index fddf8f0b24d46f480298a7191167be112e8738ff..d1f4f9575c9efe53eaededc494eab95b7283ba66 100644 --- a/src/uncategorized/reRecruit.tw +++ b/src/uncategorized/reRecruit.tw @@ -1020,7 +1020,7 @@ <<set $activeSlave.scrotum = $activeSlave.balls>> <<set $activeSlave.height = random(180,200)>> <<if $pedo_mode == 1>> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <</if>> <<set $activeSlave.weight = 0>> <<set $activeSlave.muscles = 50>> @@ -1067,7 +1067,7 @@ <<set $activeSlave.underArmHStyle = "waxed">> <<set $activeSlave.height = random(180,200)>> <<if $pedo_mode == 1>> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <</if>> <<set $activeSlave.hips = -1>> <<set $activeSlave.butt = 0>> @@ -1524,7 +1524,7 @@ <<set $activeSlave.weight = -20>> <<set $activeSlave.height = random(160,200)>> <<if $pedo_mode == 1>> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <</if>> <<set $activeSlave.face = random(15,100)>> <<set $activeSlave.butt = random(1,2)>> diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw index c3159087a45aa703241144f963b380a6ac1bd692..875814f49bae9e8f5d00d81803188a6f0b0f5c48 100644 --- a/src/uncategorized/reRelativeRecruiter.tw +++ b/src/uncategorized/reRelativeRecruiter.tw @@ -371,7 +371,7 @@ <<set $activeSlave.pubertyXY = 0>> <</if>> <<if _relationType != "twin">> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <</if>> <<set $activeSlave.devotion = random(25,45)>> <<set $activeSlave.trust = random(-15,15)>> diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw index 79d4c099cb8fff69a55d765d31124f30a55c713a..3ef861bbf0f81c851a610f2c4886deea9f19ad8e 100644 --- a/src/uncategorized/recETS.tw +++ b/src/uncategorized/recETS.tw @@ -852,7 +852,7 @@ <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> <<set $activeSlave.genes = "XY">> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <<set $activeSlave.vagina = -1>> <<set $activeSlave.pubertyXX = 0>> <<set $activeSlave.pubertyXY = 1>> @@ -904,7 +904,7 @@ <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> <<set $activeSlave.genes = "XX">> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <<set $activeSlave.pubertyXX = 1>> <<set $activeSlave.pubertyXY = 0>> <<set $activeSlave.vagina = 3>> @@ -947,7 +947,7 @@ <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> <<set $activeSlave.genes = "XY">> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <<set $activeSlave.vagina = -1>> <<set $activeSlave.pubertyXX = 0>> <<set $activeSlave.pubertyXY = 1>> @@ -989,7 +989,7 @@ <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <<set $activeSlave.pubicHStyle = "shaved">> <<if $familyTesting == 1>> <<else>> @@ -1094,7 +1094,7 @@ <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <<set $activeSlave.vagina = 0>> <<if $activeSlave.actualAge < $fertilityAge>> <<set $activeSlave.pubertyXX = 0>> @@ -1136,7 +1136,7 @@ <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> - <<ResyncHeight $activeSlave>> + <<= resyncSlaveHight($activeSlave)>> <<set $activeSlave.vagina = -1>> <<if $activeSlave.actualAge < $potencyAge>> <<set $activeSlave.pubertyXY = 0>>