diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 293b9a9d6a3c8e6b645d11768ff3a596afbee753..04cec1fbe8068334498bd0005c3948e2fb489c0f 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,9 +4,13 @@ 4/05/2018 + 27 + -fixed a bad $i in nextWeek + -added a basic overpower roll for slave vs player + 26 -added anon's aphrodisiac demonstration to FCTV - -fuckdoll onversion now unsets inflation + -fuckdoll conversion now unsets inflation 4/04/2018 diff --git a/devNotes/twine JS b/devNotes/twine JS index 94a59dff86a10812d099a0276da17d5112daae3c..40505b37f1965c4ffed0445562e0b9c602e10eb0 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -979,13 +979,13 @@ window.nippleColor = function(slave) { window.overpowerCheck = function(slave, PC) { var strength; - if(State.variables.arcologies[0].FSPhyscialIdealist != "unset") { + if(State.variables.arcologies[0].FSPhysicalIdealist != "unset") { if(PC.title == 1) { strength = 130; } else { strength = 100; } - } elseif(PC.title == 1) { + } else if(PC.title == 1) { strength = 50; } else { strength = 30; diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw index 724825972bd832fe9ca3ccfe9eb75abf50a4d0a3..054ef25372ce1ea2db3577c22d923c59f6f697d5 100644 --- a/src/js/storyJS.tw +++ b/src/js/storyJS.tw @@ -975,6 +975,26 @@ window.nippleColor = function(slave) { } } +window.overpowerCheck = function(slave, PC) { + var strength; + + if(State.variables.arcologies[0].FSPhysicalIdealist != "unset") { + if(PC.title == 1) { + strength = 130; + } else { + strength = 100; + } + } else if(PC.title == 1) { + strength = 50; + } else { + strength = 30; + } + strength += (185-slave.height); + strength -= (PC.belly/1000); + + return strength; +} + window.jsAlert = function(obj) { alert(obj); diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw index 07ded600757b5bbb964831fd1326fcfe144703b0..6f30441a12d218dabcb9c69140df956b44b206ae 100644 --- a/src/pregmod/widgets/playerDescriptionWidgets.tw +++ b/src/pregmod/widgets/playerDescriptionWidgets.tw @@ -149,7 +149,7 @@ They are all natural, heavy, and a bit saggy though they retain some perk. Every single move you make sends ripples through your cleavage. You catch yourself watching them move in the mirror every so often. <</if>> <<if $PC.preg > 30 || $PC.births > 0>> - Your breasts feel even more enormous lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples. + Your breasts feel even more enormous lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples. <</if>> <<elseif $PC.boobsBonus == 2>> Your breasts are @@ -166,7 +166,7 @@ They are all natural and a little heavy. They bounce lewdly when you shake them and take a little too long to calm down. <</if>> <<if $PC.preg > 30 || $PC.births > 0>> - Your breasts feel even more huge lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples. + Your breasts feel even more huge lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples. <</if>> <<elseif $PC.boobsBonus == 1>> Your breasts are pretty @@ -183,7 +183,7 @@ They are nice and perky, despite their size. They bounce lewdly when you shake them. <</if>> <<if $PC.preg > 30 || $PC.births > 0>> - Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples. + Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples. <</if>> <<elseif $PC.boobsBonus == -0.5>> Your breasts are certainly @@ -196,7 +196,7 @@ <</if>> They are nice and perky, with just the right amount of bounce when you shake them. <<if $PC.preg > 30 || $PC.births > 0>> - Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples. + Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples. <</if>> <<elseif $PC.boobsBonus == -1>> Your breasts are fairly average, at least to old world @@ -209,17 +209,17 @@ <</if>> They are very perky, but aren't big enough to have a nice bounce when you shake them. <<if $PC.preg > 30 || $PC.births > 0>> - Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples. + Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples. <</if>> <<elseif $PC.boobs == 1>> - Your breasts are on the larger side of things<<if $PC.preg > 30 || $PC.births > 0>>, though you could do without the wetspots forming over your nipples<</if>>. + Your breasts are on the larger side of things<<if $PC.preg > 30 || $PC.births > 0>>, though you could do without the wet spots forming over your nipples<</if>>. <<if $PC.markings == "freckles">> The tops of your breasts and your cleavage are lightly freckled. <<elseif $PC.markings == "heavily freckled">> They are covered in freckles, which are particularly dense in the cleft between them. <</if>> <<elseif $PC.title == 1>> - Your chest is quite masculine<<if $PC.preg > 30 || $PC.births > 0>>, though the pair of wetspots forming over your nipples suggest otherwise,<</if>><<if $PC.markings == "freckles">> and covered in a light spray of freckles<<elseif $PC.markings == "heavily freckled">> and covered in dense freckles<</if>>. + Your chest is quite masculine<<if $PC.preg > 30 || $PC.births > 0>>, though the pair of wet spots forming over your nipples suggest otherwise,<</if>><<if $PC.markings == "freckles">> and covered in a light spray of freckles<<elseif $PC.markings == "heavily freckled">> and covered in dense freckles<</if>>. <<else>> Your chest is non-existent<<if $PC.preg > 30 || $PC.births > 0>>, save for the pair of bulging milk glands beneath your nipples,<</if>><<if $PC.markings == "freckles">> and covered in a light spray of freckles<<elseif $PC.markings == "heavily freckled">> and covered in dense freckles<</if>>. <</if>> diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index ad0108a8b313e4dd31f4f02ef8b5c3df88e1598c..1f858d00916a8870cc7489bad4bbb4e7bbf4725b 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -30,7 +30,7 @@ <<if $seeAge == 1>> <<set $slaves[_i].physicalAge += 1, $slaves[_i].actualAge += 1, $slaves[_i].visualAge += 1>> <<set $slaves[_i].ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>> /*Hopefully this works. It is intended, over a slave's lifetime, to cause her menopause to shift.*/ - <<if $slaves[$i].broodmother == 1>> + <<if $slaves[_i].broodmother == 1>> <<set $slaves[_i].ovaryAge += .2>> <</if>> <<if $slaves[_i].physicalAge <= 18 && $loliGrow == 0>>