diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 971d3a5581b20b406c0e030ff785cf8bb89d10cd..2ffe3e448d83f14cd6ccc396564b54ce709dbf1a 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ 2/23/18 + 367 + -filled another braces exploit + -SFanon's SF work + 366 -more support from pregmodfan to his new system -fixes to the facility decoration bug diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index 5ff0b0d48b4264be47e83f98736fc4d988081057..e51a1acae11ec31dac0fb765a0f1d92795585170 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -1,4 +1,5 @@ :: SpecialForceUpgradeOptions + <<HSM>> <<nobr>> <<if ($SFAO < _max) && $securityForceUpgradeToken == 0>> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 2614755104a364dfa173f2c81483ef9b17e46453..115d80b4887d384f18739a5709a458ff5d78e7cd 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -1,4 +1,5 @@ :: 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>>">> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 520b6055ebc7b6e83ccf0f49be8c69154eecaa64..9848980bb507d9b9278a4b183bfea47c53606300 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -208,7 +208,7 @@ $pronounCap has <</if>> <<case "straightening braces">> $possessiveCap crooked teeth are in braces. - [[Remove braces|Remote Surgery][$activeSlave.teeth = "crooked"]] + [[Remove braces|Remote Surgery][$activeSlave.teeth = "crooked",$surgeryType = "removeBraces"]] <<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>> | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "sharp"]] <</if>> diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index bb0eac8dcafdfdf3a6d203608dccbf02be57259e..27454553bec0383894916cb7482c53ea453a9143 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -25,7 +25,7 @@ <<set $seed = $activeSlave.devotion>> -<<if ($activeSlave.health < random(-100,-80)) && ($surgeryType != "braces")>> +<<if ($activeSlave.health < random(-100,-80)) && ($surgeryType != "braces") && ($surgeryType != "removeBraces")>> $activeSlave.slaveName @@.red;has died from complications of surgery.@@ <<include "Remove activeSlave">> <<set $nextLink = "Main">> @@ -1174,16 +1174,31 @@ As the remote surgery's long recovery cycle completes, <<elseif ($activeSlave.teeth == "cosmetic braces")>> Quite aware that her aching teeth are now in braces, <<if ($activeSlave.devotion > 50)>> - She smiles tentatively at <<if canSee($activeSlave)>>herself in the mirror<<else>>you<</if>>. Her teeth are already quite straight, so she doesn't understand why you've done this. She's not unwilling to put up with inexplicable things you command, however, so she resolves to put up with this, too. + she smiles tentatively at <<if canSee($activeSlave)>>herself in the mirror<<else>>you<</if>>. Her teeth are already quite straight, so she doesn't understand why you've done this. She's not unwilling to put up with inexplicable things you command, however, so she resolves to put up with this, too. <<elseif ($activeSlave.devotion > 20)>> - She pulls her lips back to <<if canSee($activeSlave)>>check them out<<else>>feel them<</if>>. The discomfort is limited by the fact that her teeth are already straight. She doesn't understand why you've given her braces anyway, so her reaction is limited to vague confusion. + she pulls her lips back to <<if canSee($activeSlave)>>check them out<<else>>feel them<</if>>. The discomfort is limited by the fact that her teeth are already straight. She doesn't understand why you've given her braces anyway, so her reaction is limited to vague confusion. <<else>> - She pulls her lips back to <<if canSee($activeSlave)>>check them out<<else>>feel them<</if>>. Her teeth are already straight, limiting the discomfort but confusing her greatly. She's not a little relieved that the autosurgery's attention to her mouth only left her with pointless braces, and is only @@.mediumorchid;mildly angered@@ by the strange intrusion. + she pulls her lips back to <<if canSee($activeSlave)>>check them out<<else>>feel them<</if>>. Her teeth are already straight, limiting the discomfort but confusing her greatly. She's not a little relieved that the autosurgery's attention to her mouth only left her with pointless braces, and is only @@.mediumorchid;mildly angered@@ by the strange intrusion. <<set $activeSlave.devotion -= 2>> <</if>> Though unpleasant, orthodontia isn't particularly harmful; her health is unaffected. <</if>> +<<case "removeBraces">> + Quite aware that her teeth are now free of her braces, + <<if ($activeSlave.devotion > 50)>> + she smiles tentatively <<if canSee($activeSlave)>>at herself in the mirror<<else>>and runs her tongue across her teeth<</if>> only to find they are as crooked as ever. She immediately shuts her mouth, @@.mediumorchid;her opinion of you souring,@@ and carries on as if you had never put them on her in the first place. + <<set $activeSlave.devotion -= 4>> + <<elseif ($activeSlave.devotion > 20)>> + she pulls her lips back to <<if canSee($activeSlave)>>check them out<<else>>feel them<</if>> only to find they are as crooked as ever. She immediately shuts her mouth, @@.mediumorchid;her opinion of you souring,@@ and carries on as if you had never put them on her in the first place. + <<set $activeSlave.devotion -= 2>> + <<else>> + she pulls her lips back to <<if canSee($activeSlave)>>check them out<<else>>feel them<</if>>. She knows that straightening teeth is expensive and sighs, feeling that she's @@.mediumorchid;not worth the expense.@@ No matter what she thought of you, she felt she would at least benefit from having nice teeth, and now it's clear to her: @@.gold;You don't care.@@ + <<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>> + <</if>> + Though unpleasant, orthodontia isn't particularly harmful; her health is unaffected. + + <<case "teeth">> <<if ($activeSlave.devotion > 50)>> She clearly feels quite normal except for a vague ache around her jaw. It takes a good while for her to figure out what has happened, but eventually she gets enough sensation in her mouth to realize that she is wearing prosthetic teeth that she can remove. She gasps with shock, but figures out the idea quickly enough by experimentally <<if $activeSlave.amp != 1>>sucking on two fingers.<<else>>simulating oral sex with her own tongue.<</if>> @@.hotpink;She has become more submissive due to your radical reshaping of her body.@@ Since the surgery was invasive, @@.red;her health has been greatly affected.@@ @@ -1929,7 +1944,7 @@ As the remote surgery's long recovery cycle completes, <<if ($PC.medicine >= 100)>> <br><br> Since you @@.springgreen;performed the surgery yourself,@@ and you do artist's work, her health is @@.green;less affected@@ by the surgery than it would have been if you'd paid some hack to do it remotely. - <<if ($surgeryType != "braces")>> + <<if ($surgeryType != "braces") && ($surgeryType != "removeBraces")>> <<set $activeSlave.health += 5>> <</if>> <<if ($activeSlave.fetish != "mindbroken")>> @@ -1944,7 +1959,7 @@ As the remote surgery's long recovery cycle completes, She is @@.mediumorchid;even more hateful@@ of you afterward than she would otherwise be. It must seem to her that she's nothing more than a test subject to you. <<set $activeSlave.devotion -= 5>> <</if>> - <<elseif ($surgeryType != "braces")>> + <<elseif ($surgeryType != "braces") && ($surgeryType != "removeBraces")>> <<if ($activeSlave.devotion > 50)>> Since she's happy with the results, she's almost beside herself with @@.hotpink;gratitude,@@ and filled with @@.mediumaquamarine;admiration@@ of your skill. <<set $activeSlave.devotion += 4, $activeSlave.trust += 4>>