diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw b/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw index aa58e4b0654949e226454473958c61645492e5b2..9b9171e5f8bbaf5af7ec0dcf1c5ec885c57052bf 100644 --- a/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw +++ b/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw @@ -1,4 +1,4 @@ -:: SpecialForceBarracksAdditionalColonelInteractions +:: SpecialForceBarracksAdditionalColonelInteractions [nobr] <<if $securityForceColonelToken == 0 && $securityForceSexedColonelToken == 0 && $CurrentTradeShowAttendance == 0>> <br><br> diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw index 389c0e1a80ea41fee7eb22c48605045f096c07e4..72fdf1e14761481333a0f673198c1985c63071c5 100644 --- a/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw +++ b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw @@ -75,7 +75,7 @@ <<if random(1,100) > 50>> _Name raises a hand in greeting and nods as you approach. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture are visible, the result of her excitation and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, boss?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?" <<elseif random(1,100) > 50>> - _Name is in no condition initially, to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, boss," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, boss," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "excellent" she laughs. "I have to say, it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?" + _Name is in no condition initially to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, boss," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, boss," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "excellent" she laughs. "I have to say, it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?" <<elseif random(1,100) > 70 && $securityForceDepravity >= 1.5 && ($ColonelCore == "cruel")>> _Name is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, boss, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that boss," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem, you're here to talk business. So, what's up?" <<else>> diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw index f0fba28dbbca44b818a283d66fb6eb68dd77179c..524e3c9be93ae92e8d4fa4aa2a3f717f3404de6a 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw @@ -447,4 +447,4 @@ Modernized the armor and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the laser designator in the midle. <</switch>> <</if>> -<</if>> +<</if>> \ No newline at end of file diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index e84e90c5731b4ff0b57c8c5b7ae9c13fda5c1392..411c9077051692e6a114e5b7dae831b8363412be 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -1,10 +1,9 @@ -:: SpecialForceUpgradeOptions +:: SpecialForceUpgradeOptions [nobr] <<HSM>> -<<nobr>> <<if ($SFAO < _max) && $securityForceUpgradeToken == 0>> <span id="resultX"> - <br>Which facility or equipment do you wish _Name to upgrade this week? + Which facility or equipment do you wish _Name to upgrade this week? <<if _Barracks < 1 || _Barracks < 2 || _Barracks < 4>><br> More barracks upgrades are required to unlock further options.<</if>> <<if $securityForceUpgradeToken == 0 && _Barracks < 5>> @@ -136,7 +135,7 @@ <br><<link "Garage">> <<replace "#resultX">> <span id="resultB"> - <br><br>"Which unit do you wish to upgrade or 'borrow'?" + "Which unit do you wish to upgrade or 'borrow'?" <<link "Go back">> <<goto "SFM Barracks">> <</link>> @@ -201,7 +200,7 @@ <br><<link "Hangar">> <<replace "#resultX">> <span id="resultY"> - <br><br>"Which unit do you wish to upgrade or 'borrow'?" + "Which unit do you wish to upgrade or 'borrow'?" <<link "Go back">> <<goto "SFM Barracks">> <</link>> @@ -302,7 +301,7 @@ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env*$HackingSkillMultiplier>> <</replace>> <</link>> // Costs <<print cashFormat(35000000*$Env*$HackingSkillMultiplier)>> // - <<elseif $securityForceAC130 > 1 && $securityForceAC130 < _AC130Max>> + <<elseif $securityForceAC130 >= 1 && $securityForceAC130 < _AC130Max>> <br><<link "AC-130">> <<replace "#resultY">><br> "Sure, boss." she says, nodding. "Upgrading the AC-130, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it." @@ -361,7 +360,7 @@ <br><<link "Launch Bay">> <<replace "#resultX">> <span id="resultZ"> - <br><br>"Which unit do you wish to upgrade or 'borrow'?" + "Which unit do you wish to upgrade or 'borrow'?" <<link "Go back">> <<goto "SFM Barracks">> <</link>> @@ -507,7 +506,7 @@ <br><<link "Naval Yard">> <<replace "#resultX">> <span id="resultA"> - <br><br>"Which unit do you wish to upgrade or 'borrow'?" + "Which unit do you wish to upgrade or 'borrow'?" <<link "Go back">> <<goto "SFM Barracks">> <</link>> @@ -600,5 +599,4 @@ <<if ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>> </span> -<</if>> -<</nobr>> +<</if>> \ No newline at end of file diff --git a/src/pregmod/SecForceEX/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw index 626b36316c8cb8bdc96725c23b71df450d35a828..c7d64fa12b46f92fb85c27fee3a4c4315eccd7ac 100644 --- a/src/pregmod/SecForceEX/securityForceTradeShow.tw +++ b/src/pregmod/SecForceEX/securityForceTradeShow.tw @@ -1,28 +1,17 @@ :: securityForceTradeShow [nobr] <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">> - -<<set _N1 = 2>> -<<set _N2 = 2>> -<<set _N3 = 2>> - -<<if $economy == .5>> - <<set $Env = _N1>> -<<elseif $economy == 1>> - <<set $Env = _N2>> -<<elseif $economy == 1.5>> - <<set $Env = _N3>> -<</if>> +<<include "SimpleWorldEcomonyCheck">> +<<if ndef $TradeShowAttendanceGranted>> <<set $TradeShowAttendanceGranted = 0>> <</if>> <<if $OverallTradeShowAttendance == 0>> + <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, back when I was a major before I joined $securityForceName. Me and a couple of colleagues went to a bi-yearly international security trade show, I would very much like to continue doing so. Can I?<span id="choice1"> <<link "Yes,">> <<replace "#choice1">> <br><br>"Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>." - <<set $OverallTradeShowAttendance += 1>> - <<set $CurrentTradeShowAttendanceGranted = 1>> - <<set $TradeShowAttendanceGranted = 1>> + <<set $OverallTradeShowAttendance += 1, $CurrentTradeShowAttendanceGranted = 1, $TradeShowAttendanceGranted = 1>> <</replace>> <</link>> @@ -33,7 +22,6 @@ <</link>> </span> - <<elseif $OverallTradeShowAttendance >= 1>> The (bi-yearly) security trade show has finally come around and even though you've already granted The Colonel permission to attend, she's decided to come and ask for the leave personally. @@ -144,4 +132,4 @@ The (bi-yearly) security trade show has finally come around and even though you' </span> -<</if>> +<</if>> \ No newline at end of file diff --git a/src/pregmod/SimpleWorldEcomonyCheck.tw b/src/pregmod/SimpleWorldEcomonyCheck.tw new file mode 100644 index 0000000000000000000000000000000000000000..3654587682954cb5e124bdb5cfba70830218d870 --- /dev/null +++ b/src/pregmod/SimpleWorldEcomonyCheck.tw @@ -0,0 +1,12 @@ +:: SimpleWorldEcomonyCheck +<<silently>> +<<set _N1 = 7, _N2 = 5, _N3 = 3>> + <<switch $economy>> + <<case .5>> + <<set $Env = _N1>> + <<case 1>> + <<set $Env = _N2>> + <<case 1.5>> + <<set $Env = _N3>> + <</switch>> +<</silently>> diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw index 3781d0708e6a09187b7840eec5116a243d1c6bdf..034e8e2c7e270a44c60c625fda2364f55688e9bb 100644 --- a/src/pregmod/saAgent.tw +++ b/src/pregmod/saAgent.tw @@ -109,7 +109,7 @@ <</if>> <<if ($slaves[$i].preg > 0)>> /*EFFECTS OF PREGNANCY*/ - <<if $slaves[$i].preg == 5>> + <<if $slaves[$i].preg == 5>> /* bad condition logic - with pregnancy control drugs can be not triggered. Or may be trigged by broodmother several times. Need to be revorked. */ <<if $slaves[$i].pregSource == -1>> <<set $PC.slavesKnockedUp++>> <<elseif $slaves[$i].pregSource > 0>> @@ -363,17 +363,16 @@ <<if ($slaves[$i].preg > 37) && ($slaves[$i].broodmother == 0) && (random(1,100) > 90)>> <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 35), WombBirth($slaves[$i], 35), WombFlush($slaves[$i]), $slaves[$i].preg = 0, $slaves[$i].pregWeek = -4, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0 >> - <<SetBellySize $slaves[$i]>> <<elseif ($slaves[$i].preg > 41) && ($slaves[$i].broodmother == 0)>> <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 35), WombBirth($slaves[$i], 35), WombFlush($slaves[$i]), $slaves[$i].preg = 0, $slaves[$i].pregWeek = -4, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0>> - <<SetBellySize $slaves[$i]>> <<elseif ($slaves[$i].preg > 37) && ($slaves[$i].broodmother > 0)>> <<if $slaves[$i].broodmother > 0>> - <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 37), WombBirth($slaves[$i], 37), $slaves[$i].preg = 37>> + <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 37), WombBirth($slaves[$i], 37), $slaves[$i].preg = WombMaxPreg($slaves[$i])>> <</if>> - <<SetBellySize $slaves[$i]>> <</if>> +<<SetBellySize $slaves[$i]>> /*Actually it's now better to set belly size without checking of any conditions. Just to be sure. Should correct forgotten variables too. */ + <<if ($slaves[$i].hStyle != "shaved" && $slaves[$i].bald != 1 && $slaves[$i].haircuts == 0) && ($slaves[$i].hLength < 150)>> <<set $slaves[$i].hLength += 1>> <</if>> \ No newline at end of file diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 353784e9697bdba59a599ffa6a88c3f47e37128b..d0a03b4cd312401be600de3acb28236834e7c935 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -1,21 +1,21 @@ :: SFM Barracks [nobr] <<HSM>> -<<set _N1 = 2, _N2 = 2, _N3 = 2>> <<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">> <<if ndef $ColonelRelationship>> <<set $ColonelRelationship = 0>> /* 0 - Employee and boss, 100 - Friend, 200 - Close friend, 300 - Girlfriend, 400 - Lover */ <</if>> -<<set _RelationshipTitle = "<<if $ColonelRelationship == 0>> boss <<elseif $ColonelRelationship >= 100>> friend <<elseif $ColonelRelationship >= 200>> close friend <<elseif $ColonelRelationship >= 300>> <<if $PC.title == 1>> boyfriend <<elsei>> girlfriend <</if>> <<elseif $ColonelRelationship >= 400>> lover <</if>> - -<<if $economy == .5>> - <<set $Env = _N1, $EnvCash2 = 450, $EnvCash3 = 200, $EnvCash4 = 100, $EnvProsp = 3, _BaseDiscount = _BaseDiscount-.005>> -<<elseif $economy == 1>> - <<set $Env = _N2, $EnvCash2 = 500, $EnvCash3 = 250, $EnvCash4 = 150, $EnvProsp = 5, _BaseDiscount = _BaseDiscount>> -<<elseif $economy == 1.5>> - <<set $Env = _N3, $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>> -<</if>> +<<set _RelationshipTitle = "<<if $ColonelRelationship = 0>> boss <<elseif $ColonelRelationship >= 100>> friend <<elseif $ColonelRelationship >= 200>> close friend <<elseif $ColonelRelationship >= 300>> <<if $PC.title = 1>> boyfriend <<else>> $PC.title = 0>> girlfriend <</if>> <<elseif $ColonelRelationship >= 400>> lover <</if> +<<include "SimpleWorldEcomonyCheck">> +<<switch $Env>> + <<case "_N1">> + <<set $EnvCash2 = 450, $EnvCash3 = 200, $EnvCash4 = 100, $EnvProsp = 3, _BaseDiscount = _BaseDiscount-.005>> + <<case "_N2">> + <<set $EnvCash2 = 500, $EnvCash3 = 250, $EnvCash4 = 150, $EnvProsp = 5, _BaseDiscount = _BaseDiscount>> + <<case "_N3">> + <<set $Env = , $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>> +<</switch>> <<if ndef $TierTwoUnlock>> <<set $TierTwoUnlock = 0>> <</if>> <<include "SpecialForceUpgradeTree">> @@ -121,8 +121,8 @@ <<if $securityForceUpgradeToken == 1 && ($SFAO < _max)>> <br>//_Name is working to improve $securityForceName this week.// -<<elseif $TierTwoUnlock == 1>> - <br>//You receive a message from The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now?"// +<<elseif $TierTwoUnlock == 1 && $TradeShowAttendanceGranted == 0>> + <br>//You receive a message from The Colonel "There is a trade show coming up soon with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now."// <<elseif $SFAO >= _max>> <br>//$securityForceName is fully equipped and upgraded - nothing else can be done.// <</if>> @@ -148,7 +148,7 @@ <</link>> <br>It will cost 5% of your currently displayed cash, which is <<print cashFormat(Math.trunc(_securityForceUpgradeResetTokenCurrentCost))>>. <</if>> <<if $securityForceUpgradeTokenReset >= 1>> - <br>Total multi week $securityForceName upgrades: $securityForceUpgradeTokenReset + <br>Total multi week $securityForceName upgrades: $securityForceUpgradeTokenReset <br><br> <</if>> <<include "SpecialForceUpgradeOptions">> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index 60a71092505c774b3bcbe515c4d258d036fb7234..4020af322dced560c0783aeadad07e5825b48ea6 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -655,8 +655,10 @@ On formal occasions, you are announced as $PCTitle. <</if>> <</if>> -<<set $rep -= $repLoss>> -<<set $rep += $repGain>> +<<if !isNaN($repLoss) && !isNaN($repGain)>> + <<set $rep -= $repLoss>> + <<set $rep += $repGain>> +<</if>> <br> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index 8e9f36ec79550f358c2b160ec085499c1d669a8a..103c11366ab5922d322970b019b47c6c4c3a5d0e 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -856,7 +856,11 @@ serves you this week. <<set _multiplier += 0.05>> <</if>> -<<set $repGain += Math.trunc(($beauty*$FResult)*_multiplier)>> +<<if $beauty>> + <<set $repGain += Math.trunc(($beauty*$FResult)*_multiplier)>> +<<else>> + <b>@@.red;Error: slaves' beauty undefined, report this issue!@@</b> +<</if>> Keeping $object as nothing but your personal <<if ($slaves[$i].toyHole == "pussy")>>