From 02aafc2d5e93bf0fc0d36db21399f5fed390837f Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 14 Nov 2017 04:08:11 -0500 Subject: [PATCH] fixes and RESS work --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 12 +- src/art/artWidgets.tw | 2 +- src/uncategorized/RESS.tw | 146 +++++++++++++++++-- src/uncategorized/randomIndividualEvent.tw | 4 +- src/uncategorized/securityForceEOWReport.tw | 10 +- 5 files changed, 153 insertions(+), 21 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index b3b8a5aae00..3bdd17d2d2b 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4543,6 +4543,8 @@ Pregmod 0.10.3.0 -fixes -RESS work + 11/13/16 + 126 -fixes -major oversight corrections @@ -4562,6 +4564,12 @@ Pregmod 0.10.3.0 129.1 -more fixes + 11/14/16 + 130 - -fixed free range assignment - -SFanon's stuff \ No newline at end of file + -fixed the free range dairy assignment scene + -SFanon's stuff + + 131 + -fixes + -Completed RESS cleanup \ No newline at end of file diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw index 8e12b109633..04514c987d9 100644 --- a/src/art/artWidgets.tw +++ b/src/art/artWidgets.tw @@ -366,7 +366,7 @@ vector art added later is drawn over previously added art <<elseif $args[0].belly >= 100>> <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/preg belly 100.svg'" + " style='"+ _skinFilter + "'>">> /* - <<if $args[0].navelPiercing >= 1>>/*Navel Piercing*/ + <<if $args[0].navelPiercing >= 1>>/Navel Piercing/ <<print "<img class='paperdoll' src=" + _folderLoc + "/body/addon/preg navel piercing.svg'" + "/>">> <</if>> <<if $args[0].navelPiercing == 2>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 6edfb37d657..b3e416fab71 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -18163,14 +18163,52 @@ You tell her kindly that you understand, and that she'll be trained to address t <<link "Enjoy some oral with an evening of wallscreen television">> <<EventNameDelink $activeSlave>> <<replace "#result">> - There are some things that never change, even after ascension to the high position of an arcology owner. One of these fixtures of life is the ability to enjoy a relaxing evening of wallscreen television and <<if $PC.dick == 1>>a blowjob<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>some cunnilingus<</if>>. With $activeSlave.slaveName sequestered between your legs, you tune into your favorite Free Cities serial drama and <<if !canSee($activeSlave)>>audibly <</if>>widen your legs slightly as you sink back into the chair with a sigh of contentment. She <<if $activeSlave.preg > 20>>kneels carefully with an arm wrapped protectively around her bump<<else>>sinks to her knees obediently with her hands placed placidly on her thighs<</if>> before putting her mouth to work, <<if $activeSlave.oralSkill >= 100>>her mastery at giving oral providing a wealth of pleasure<<elseif $activeSlave.oralSkill > 60>>her skills in oral providing ample pleasure<<else>>her mediocre oral skills providing some relief<</if>>.<<if $activeSlave.teeth > 2>> Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you still feel the extreme care she has to take to keep her sharklike teeth clear of you.<<elseif $activeSlave.lips > 40>> Her huge lips are soft and pillowy against you.<<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>> Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as she takes care to keep her braces off you.<</if>> You have an enjoyable evening glued to your wallscreen, punctuated by the playful ruffling <<if $activeSlave.hLength > 1>>of $activeSlave.slaveName's $activeSlave.hColor hair<<else>>across $activeSlave.slaveName's scalp<</if>> and the occasional orgasm into her waiting mouth. Though your experience was more stimulating than hers, $activeSlave.slaveName enjoyed @@.hotpink;being used while you enjoyed yourself.@@ + There are some things that never change, even after ascension to the high position of an arcology owner. One of these fixtures of life is the ability to enjoy a relaxing evening of wallscreen television and <<if $PC.dick == 1>>a blowjob<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>some cunnilingus<</if>>. With $activeSlave.slaveName sequestered between your legs, you tune into your favorite Free Cities serial drama and <<if !canSee($activeSlave)>>audibly <</if>>widen your legs slightly as you sink back into the chair with a sigh of contentment. She + <<if $activeSlave.belly >= 300000>> + gently leans onto her _belly belly with her arms steadying the mass + <<elseif $activeSlave.belly >= 5000>> + <<if $activeSlave.bellyPreg >= 3000>> + kneels carefully with an arm wrapped protectively around her bump + <<else>> + kneels carefully with an arm craddling her _belly belly + <</if>> + <<else>> + sinks to her knees obediently with her hands placed placidly on her thighs + <</if>> + before putting her mouth to work, + <<if $activeSlave.oralSkill >= 100>> + her mastery at giving oral providing a wealth of pleasure. + <<elseif $activeSlave.oralSkill > 60>> + her skills in oral providing ample pleasure. + <<else>> + her mediocre oral skills providing some relief. + <</if>> + <<if $activeSlave.teeth > 2>> + Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you still feel the extreme care she has to take to keep her sharklike teeth clear of you. + <<elseif $activeSlave.lips > 40>> + Her huge lips are soft and pillowy against you. + <<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>> + Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as she takes care to keep her braces off you. + <</if>> + You have an enjoyable evening glued to your wallscreen, punctuated by the playful ruffling <<if $activeSlave.hLength > 1>>of $activeSlave.slaveName's $activeSlave.hColor hair<<else>>across $activeSlave.slaveName's scalp<</if>> and the occasional orgasm into her waiting mouth. Though your experience was more stimulating than hers, $activeSlave.slaveName enjoyed @@.hotpink;being used while you enjoyed yourself.@@ <<set $activeSlave.devotion += 4, $activeSlave.oralCount += 1, $oralTotal += 1>> <</replace>> <</link>> <br><<link "Spend the night idly cuddling">> <<EventNameDelink $activeSlave>> <<replace "#result">> - Though your evening could hardly be called eventful, there is something eminently comforting about having a warm <<if $activeSlave.physicalAge > 30>>woman<<else>>girl<</if>> cuddled up beside you to idly while away the hours. She @@.mediumaquamarine;trusts you more@@ for these few intimate hours amidst her life of sexual servitude. + Though your evening could hardly be called eventful, there is something eminently comforting about having a warm + <<if $activeSlave.physicalAge > 30>> + woman + <<elseif $activeSlave.physicalAge > 18>> + young lady + <<elseif $activeSlave.physicalAge > 12>> + teen + <<else>> + little girl + <</if>> + cuddled up beside you to idly while away the hours<<if $activeSlave.bellyPreg >= 1500 && $activeSlave.pregSource == -1>>, especially when she is <<if $activeSlave.belly >= 300000>>so massively swollen with your children<<else>>heavy with your child<<if $activeSlave.pregType > 1>>ren<</if>><</if>><</if>>. + She @@.mediumaquamarine;trusts you more@@ for these few intimate hours amidst her life of sexual servitude. <<set $activeSlave.trust += 4>> <</replace>> <</link>> @@ -18189,22 +18227,74 @@ You tell her kindly that you understand, and that she'll be trained to address t <<EventNameDelink $activeSlave>> <<replace "#result">> You hook your arms underneath her own, pulling her off of the ground in one swift yank upwards. Taken off guard by her sudden vertical ascension, she clings to your chest instinctively, - <<if $PC.boobs == 1>> - <<if $activeSlave.boobs > 2000>>her huge breasts squashing against yours<<elseif $activeSlave.boobs > 800>>her breasts pressing heavily against yours<<else>>her chest pressing against your breasts<</if>>. + <<if $PC.boobs == 1 || $PC.title == 0>> + <<if $activeSlave.boobs > 25000>>her immense udders doing their best to keep you apart<<elseif $activeSlave.boobs > 2000>>her huge breasts squashing against yours<<elseif $activeSlave.boobs > 800>>her breasts pressing heavily against yours<<else>>her chest pressing against your breasts<</if>>. + <<else>> + <<if $activeSlave.boobs > 25000>>her immense udders doing their best to keep you apart<<elseif $activeSlave.boobs > 2000>>her huge breasts forming a soft cushion between your two bodies<<elseif $activeSlave.boobs > 800>>her breasts pressing up against your hard chest pleasantly<<else>>her chest pressing against yours<</if>>. + <</if>> + Her body is held aloft entirely by your crushing embrace and her arms wrapped daintily about your shoulders, for as short as she is, her attempts to wrap her legs around your waist leave them dangling awkwardly in the air. This unique position soon has her + <<if $activeSlave.belly >= 10000>> + _belly belly + <<if $PC.dick == 1>> + trapping your dick against your own + <<if $PC.pregKnown == 1>> + pregnancy. + <<else>> + stomach. + <</if>> + You take advantage of the situation and thrust between your middles, grunting and panting as her tiny body rubs up against your cock. You quickly coat your rounded stomachs in your cum. + <<else>> + rubbing against your own + <<if $PC.pregKnown == 1>> + pregnancy. + <<else>> + stomach. + <</if>> + While it feels interesting, it isn't very satisfying. + <</if>> <<else>> - <<if $activeSlave.boobs > 2000>>her huge breasts forming a soft cushion between your two bodies<<elseif $activeSlave.boobs > 800>>her breasts pressing up against your hard chest pleasantly<<else>>her chest pressing against yours<</if>>. + crotch rubbing up against your own<<if $PC.dick == 0>>, so you don a strap-on<</if>>. Lightly maneuvering her in the air, you position her + <<if canDoVaginal($activeSlave)>> + such that you press up against her pussy. + <<else>> + such that you press up against her ass. + <</if>> + She moans softly in anticipation as you lift her up by her arms, before lowering her slowly onto your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>, her knees desperately pressing against your hips in an attempt to steady herself. Held aloft in your arms, she arches her back and cocks her hips wildly to ride you in midair,<<if $activeSlave.belly >= 1500>> even as she carefully keeps her bulge from slamming into your hard body,<</if>> grunting and panting as her tiny body rubs up against your own. <</if>> - Her body is held aloft entirely by your crushing embrace and her arms wrapped daintily about your shoulders, for as short as she is, her attempts to wrap her legs around your waist leave them dangling awkwardly in the air. This unique position soon has her crotch rubbing up against your own<<if $PC.dick == 0>>, so you don a strap-on<</if>>. Lightly maneuvering her in the air, you position her <<if $activeSlave.vagina > -1>>such that you press up against her pussy<<else>>such that you press up against her ass<</if>>. She moans softly in anticipation as you lift her up by her arms, before lowering her slowly onto your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>, her knees desperately pressing against your hips in an attempt to steady herself. Held aloft in your arms, she arches her back and cocks her hips wildly to ride you in midair,<<if $activeSlave.preg > 20>> even as she carefully keeps her bulge from slamming into your hard body,<</if>> grunting and panting as her tiny body rubs up against your own. <br><br> - When you grow bored of the position, you turn her around to impale her <<if $activeSlave.butt > 5>>huge<<elseif $activeSlave.butt > 3>>rounded<<else>>tight<</if>> butt as you pound her standing from behind, her <<if $activeSlave.boobs > 2000>>titanic<<elseif $activeSlave.boobs > 800>>big<<else>>small<</if>> breasts bouncing with every deep thrust upwards. Her small body spasms with the force of her immense pleasure, and when she orgasms, you have to wrap your arms beneath her breasts and pull her up against you to stop her limp body from crashing to the ground. Eventually, you lower her back down onto the ground level, watching with bemusement as she curls up, breathing heavily from her exertions. Eventually she recovers her composure somewhat, rising from her stupor to @@.hotpink;blow you a kiss.@@ + When you grow bored of the position, you turn her around to impale her + <<if $activeSlave.butt > 12>> + bountiful + <<elseif $activeSlave.butt > 7>> + giant + <<elseif $activeSlave.butt > 5>> + huge + <<elseif $activeSlave.butt > 3>> + rounded + <<else>> + tight + <</if>> + butt as you pound her standing from behind, her + <<if $activeSlave.boobs > 2000>> + titanic + <<elseif $activeSlave.boobs > 800>> + big + <<else>> + small + <</if>> + breasts<<if $activeSlave.belly >= 1500>> and _belly belly<</if>> bouncing with every deep thrust upwards. Her small body spasms with the force of her immense pleasure, and when she orgasms, you have to wrap your arms beneath her breasts and pull her up against you to stop her limp body from crashing to the ground. Eventually, you lower her back down onto the ground level, watching with bemusement as she curls up, breathing heavily from her exertions. Eventually she recovers her composure somewhat, rising from her stupor to @@.hotpink;blow you a kiss.@@ <<set $activeSlave.devotion += 4>> - <<BothVCheck>> + <<if $activeSlave.belly >= 10000>> + <<AnalVCheck>> + <<else>> + <<BothVCheck>> + <</if>> <</replace>> <</link>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>> <br><<link "Show her that short girls can still serve">> <<EventNameDelink $activeSlave>> <<replace "#result">> - You lightly place your palms on her shoulders and apply a little pressure<<if $PC.dick == 0>>as you don a strap-on<</if>>. From your towering position above her, you easily push her down to her knees with little more than a gradual increase in force. From your standing position, your <<if $PC.dick == 0>>phallus<<else>>cock<</if>> hovers above her head, tantalizingly out of the immediate reach of her lips. + You lightly place your palms on her shoulders and apply a little pressure<<if $PC.dick == 0>>as you don a strap-on<</if>>. From your towering position above her, you easily push her down to her knees with little more than a gradual increase in force. From your standing position<<if $activeSlave.belly >= 300000>>, after straddling her _belly belly<</if>>, your <<if $PC.dick == 0>>phallus<<else>>cock<</if>> hovers above her head, tantalizingly out of the immediate reach of her lips. <<if ($activeSlave.teeth == "removable")>> She quickly pulls her removable teeth out, setting them aside as she looks up at your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>. <<elseif ($activeSlave.teeth == "pointy")>> @@ -18214,10 +18304,21 @@ You tell her kindly that you understand, and that she'll be trained to address t <</if>> You inform her that short slaves like her might have to try harder, but they can still serve just as well as any of their taller peers. Understanding your meaning, she pushes herself up as far as she can with your hands still lightly pressing down on her shoulders, straining her neck until she can take you fully into her waiting mouth, keeping her eyes closed as she concentrates intently on her task. She lightly rocks back and forth on her knees in an attempt to gain a little height to better pleasure you with her mouth, an amusing sight to behold as you stand above her. <br><br> - Eventually, you lift a hand off of her shoulder to run it possessively through her $activeSlave.hColor hair, letting her know that she's an excellent little cocksucker. In her eagerness to thank you, she ends up talking into your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>, though these muffled attempts at speech soon devolve back into submissive moaning. In time, you silence even these moans as you blow your load down her throat, and she swallows it all. She opens her eyes slowly, endowed with a belly full of cum and a new understanding of @@.mediumaquamarine;her place as a short slave@@. + Eventually, you lift a hand off of her shoulder to run it possessively through her $activeSlave.hColor hair, letting her know that she's an excellent little cocksucker. In her eagerness to thank you, she ends up talking into your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>, though these muffled attempts at speech soon devolve back into submissive moaning. In time, you silence even these moans as you + <<if $PC.balls == 3>> + pump your endless load down her throat and steadily fill her stomach. She opens her eyes slowly, endowed with a belly stuffed to capacity with cum + <<elseif $PC.balls == 2>> + pump load after load down her throat and into her stomach. She opens her eyes slowly, endowed with a belly stuffed with cum + <<elseif $PC.balls == 1>> + blow your huge load down her throat, and diligently she swallows it all. She opens her eyes slowly, endowed with a belly full of cum + <<else>> + blow your load down her throat, and she swallows it all. She opens her eyes slowly, endowed with a belly full of cum + <</if>> + and a new understanding of @@.mediumaquamarine;her place as a short slave@@. <</replace>> <<set $activeSlave.oralCount += 1, $oralTotal += 1, $activeSlave.trust += 4>> <</link>> +<<if canDoAnal($activeSlave)>> <br><<link "Show her that short girls are easier to abuse">> <<EventNameDelink $activeSlave>> <<replace "#result">> @@ -18226,11 +18327,12 @@ You tell her kindly that you understand, and that she'll be trained to address t <<AnalVCheck>> <</replace>> <</link>><<if $activeSlave.anus == 0>>//This option will take anal virginity//<</if>> +<</if>> <<if ($arcade > 0)>> <br><<link "Show her that short girls are amusing in the arcade">> <<EventNameDelink $activeSlave>> <<replace "#result">> - You inform $activeSlave.slaveName that short girls like her are delightfully amusing when immured in the arcade. Magnanimous as you are, you have two other slaves drag her off to be installed in the arcade for a day, so that she too may see the humor in having short girls serve in the arcade. Though $arcadeName has arcade pens to match any height of slave, you have $activeSlave.slaveName confined in a pen built for a much taller slave. Although her head and neck protrude from one side of the pen without issue, she is too short for her ass to fill the other opening. As a result, she must use the tips of her toes maintain an unsteady grip on the rear opening, forcing her to maintain an extremely taxing stretch just to keep her body held aloft within the pen. Costumers are unable to fuck her holes but readily delight in watching her squirm to keep her body extended and horizontal, even with hard cocks brutally fucking her face. Somewhere in the gruelling, 18-hour marathon of relentless throat fucking, her precarious position slips and her lower half tumbles into the interior of the pen proper. Until an attendant rescues her, her neck is held crooked at an unnatural angle by her restraints, as the rest of her body dangles beneath it. Her ordeal forces her to accept that a short girl's place is as an @@.hotpink;amusing arcade hole@@. Though she can't find the humor@@.gold;in such a terrible plight@@. Furthermore, her intense exertions during her stay @@.red;negatively effects her health@@. Your other slaves take note of what you do to short girls who ask questions about their place in your penthouse. + You inform $activeSlave.slaveName that short girls like her are delightfully amusing when immured in the arcade. Magnanimous as you are, you have two other slaves drag her off to be installed in the arcade for a day, so that she too may see the humor in having short girls serve in the arcade. Though $arcadeName has arcade pens to match any height of slave, you have $activeSlave.slaveName confined in a pen built for a much taller slave. Although her head and neck protrude from one side of the pen without issue, she is too short for her ass to fill the other opening. As a result, she must use the tips of her toes maintain an unsteady grip on the rear opening, forcing her to maintain an extremely taxing stretch just to keep her body held aloft within the pen. Costumers are unable to fuck her holes but readily delight in watching her squirm to keep her body extended and horizontal, even with hard cocks brutally fucking her face. Somewhere in the gruelling, 18-hour marathon of relentless throat fucking, her precarious position slips and her lower half tumbles into the interior of the pen proper. Until an attendant rescues her, her neck is held crooked at an unnatural angle by her restraints, as the rest of her body dangles beneath it. Her ordeal forces her to accept that a short girl's place is as an @@.hotpink;amusing arcade hole@@. Though she can't find the humor@@.gold;in such a terrible plight@@. Furthermore, her intense exertions during her stay @@.red;negatively effects her health@@. Your other slaves take note of what you do to short girls who ask questions about their place in your penthouse. <<set $activeSlave.devotion += 5, $activeSlave.trust -= 5, $activeSlave.health -= 5, $activeSlave.oralCount += 55, $activeSlave.oralTotal += 55>> <<set $activeSlave.publicCount += 55>> <</replace>> @@ -18242,7 +18344,27 @@ You tell her kindly that you understand, and that she'll be trained to address t <<link "Take pity">> <<EventNameDelink $activeSlave>> <<replace "#result">> - Deciding to take pity, you stand up<<if $PC.dick == 0>>, pull on a strap-on,<</if>> and approach her crumpled, weeping form. You reach down and take her clasped hands in yours, pulling her gently to her feet and giving her a quick cuddle. You make it just long enough to reassure her that you care for her, but not long enough to frustrate her even further; her extreme horniness is only sharpened by the hug and the way it traps her arms between her <<if $activeSlave.boobsImplant > 0>>fake boobs<<elseif $activeSlave.boobs > 4000>>monstrous udders<<elseif $activeSlave.boobs > 800>>big soft breasts<<elseif $activeSlave.boobs > 400>>tits<<else>>flat chest<</if>> and your <<if $PC.boobs == 1>>bosom<<else>>hard pectorals<</if>>. She sniffles, trying to restrain her hopes. You push her backwards toward the couch, giving her a kiss to really bring her to the height of anticipation before laying her down and sliding your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> <<if $activeSlave.anus > 1>>inside her soft asshole<<else>>up her tight little butt<</if>>. + Deciding to take pity, you stand up<<if $PC.dick == 0>>, pull on a strap-on,<</if>> and approach her crumpled, weeping form. You reach down and take her clasped hands in yours, pulling her gently to her feet and giving her a quick cuddle. You make it just long enough to reassure her that you care for her, but not long enough to frustrate her even further; her extreme horniness is only sharpened by the hug and the way it traps her arms between her + <<if Math.floor($activeSlave.boobsImplant/$activeSlave.boobs) >= .60>> + fake boobs + <<elseif $activeSlave.boobs > 4000>> + monstrous udders + <<elseif $activeSlave.boobs > 800>> + big soft breasts + <<elseif $activeSlave.boobs > 300>> + tits + <<else>> + flat chest + <</if>> + and your + <<if $PC.boobs == 1>> + bosom. + <<elseif $PC.title == 0>> + chest. + <<else>> + hard pectorals. + <</if>> + She sniffles, trying to restrain her hopes. You push her backwards toward the couch, giving her a kiss to really bring her to the height of anticipation before laying her down and sliding your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> <<if $activeSlave.anus > 1>>inside her soft asshole<<else>>up her tight little butt<</if>>. <<if $activeSlave.prostate != 0>> The instant <<if $PC.dick == 1>>your hard dickhead<<else>>the hard tip of your phallus<</if>> presses against her prostate, she orgasms, squirting <<if $activeSlave.balls == 0>>translucent fluid<<else>>cum<</if>>. She looks like she wants to say something, or maybe even apologize, so you shush her with a gentle hand and pull out, letting the fluid run down <<if $activeSlave.scrotum > 0>>her soft scrotum<<else>>the pretty skin between her cumhole and her anus<</if>> until it glazes her asspussy. You use <<if $PC.dick == 1>>the tip of your cock<<else>>the head of the strap-on<</if>> to massage the fluid into the hole before penetrating it again with the extra lubrication. <<else>> diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index 755ce0d0c31..43e79207839 100644 --- a/src/uncategorized/randomIndividualEvent.tw +++ b/src/uncategorized/randomIndividualEvent.tw @@ -1422,7 +1422,7 @@ <<if $eventSlave.assignment == "serve the public">> <<if $eventSlave.devotion >= -20>> -<<if canDoAnal($eventSlave) || canDoVaginal($eventSlave) +<<if canDoAnal($eventSlave) || canDoVaginal($eventSlave)>> <<set $RESSevent.push("nice guys")>> <</if>> <</if>> @@ -1436,6 +1436,7 @@ <<if $eventSlave.height < (Height.mean($eventSlave)*0.95)>> <<if $eventSlave.physicalAge > 12>> +<<if canDoAnal($activeSlave)>> <<if $eventSlave.devotion > 20>> <<if $eventSlave.trust <= 95>> <<set $RESSevent.push("devoted shortstack")>> @@ -1443,6 +1444,7 @@ <</if>> <</if>> <</if>> +<</if>> <</if>> /* closes amp/crawling exempt */ diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index f9ed771e129..d0a8463aa50 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -59,19 +59,19 @@ securityForceX */ <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-28,-24)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-30,-28)>> <<else>> <<set $securityForcePersonnel += random(-30,-26)>> <</if>> <<elseif $securityForcePersonnel < 1100>> - <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-30,-26)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-32,-32)>> <<else>> <<set $securityForcePersonnel += random(-34,-28)>> + <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-30,-28)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-32,-32)>> <<else>> <<set $securityForcePersonnel += random(-34,-28)>> <</if>> <<elseif $securityForcePersonnel < 1200>> - <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-32,-28)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-34,-36)>> <<else>> <<set $securityForcePersonnel += random(-38,-30)>> + <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-32,-34)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-34,-36)>> <<else>> <<set $securityForcePersonnel += random(-38,-30)>> <</if>> <<elseif $securityForcePersonnel < 1300>> - <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-36,-30)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-36,-40)>> <<else>> <<set $securityForcePersonnel += random(-42,-32)>> + <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-34,-38)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-36,-40)>> <<else>> <<set $securityForcePersonnel += random(-42,-32)>> <</if>> <<elseif $securityForcePersonnel < 1400>> - <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-38,-32)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-38,-44)>> <<else>> <<set $securityForcePersonnel += random(-46,-34)>> + <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-36,-42)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-38,-44)>> <<else>> <<set $securityForcePersonnel += random(-46,-34)>> <</if>> <<elseif $securityForcePersonnel < 1500>> - <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-40,-34)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-40,-48)>> <<else>> <<set $securityForcePersonnel += random(-50,-36)>> + <<if $securityForceFocus == "recruit">> <<set $securityForcePersonnel += random(-48,-46)>> <<elseif $securityForceFocus == "raiding">> <<set $securityForcePersonnel += random(-40,-48)>> <<else>> <<set $securityForcePersonnel += random(-50,-36)>> <</if>> <<else>> <<set $securityForcePersonnel += random(-1,1)>> -- GitLab