From f1abbd40de36fc059f1db2b1d3fbb1ffbc64b9bc Mon Sep 17 00:00:00 2001 From: x <okp57855@psoxs.com> Date: Sat, 2 Jun 2018 01:20:22 +1200 Subject: [PATCH] Fixing BC Brothel issue and rebalances --- ...ceBarracksAdditionalColonelInteractions.tw | 40 ++++++++----------- .../SecForceEX/securityForceTradeShow.tw | 20 +++++----- src/uncategorized/BackwardsCompatibility.tw | 2 +- src/uncategorized/SFMBarracks.tw | 10 ++--- 4 files changed, 33 insertions(+), 39 deletions(-) diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw b/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw index 7c4dc2af6f9..769f9a64500 100644 --- a/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw +++ b/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw @@ -4,7 +4,7 @@ <br><br> <span id="result3"> Where do you want to spend time with The Colonel this week? - <<if $ColonelRelationship >= 200>> + <<if $ColonelRelationship >= 25>> <br><<link "Up on the surface, along with an escort of course.">> <<set $securityForceColonelToken = 1>> <<replace "#result3">> @@ -60,7 +60,7 @@ <<elseif $PC.medicine >= 10>> Your basic skill in medicine is sufficient only to stabilize the citizen. <</if>> - <<set $ColonelRelationship += 1>> + <<set $ColonelRelationship += 2>> <</replace>> <</link>> <</if>> @@ -75,7 +75,7 @@ <</link>> <br><<link "Learn">> <<replace "#result10">> - <<set $securityForceColonelToken = 1>> + <<set $securityForceColonelToken = 1, $ColonelRelationship += 1>> <<link "Go back">> <<goto "SFM Barracks">> <<set $securityForceColonelToken = 0>> @@ -98,7 +98,6 @@ <<elseif $PC.medicine >= 10>> //Yes that is a bandage, good job.// <</if>> - <<set $ColonelRelationship += 1>> <</replace>> <</link>> , @@ -117,7 +116,6 @@ <<elseif $PC.trading >= 10>>// //Now Good job you now know what NPV stands for.// <</if>> - <<set $ColonelRelationship += 1>> <</replace>> <</link>> , @@ -136,7 +134,6 @@ <<elseif $PC.slaving >= 10>> //Yes, having your slaves die on you is generally considered a bad thing, unless you are into that kind of thing you sick fuck. But who am I to judge.// <</if>> - <<set $ColonelRelationship += 1>> <</replace>> <</link>> , @@ -155,7 +152,6 @@ <<elseif $PC.engineering >= 10>> //Hammer meet nail.// <</if>> - <<set $ColonelRelationship += 1>> <</replace>> <</link>> , @@ -174,7 +170,6 @@ <<elseif $PC.hacking >= 10>> //You can now somewhat use a mouse.// <</if>> - <<set $ColonelRelationship += 1>> <</replace>> <</link>> , @@ -205,21 +200,20 @@ <<elseif $PC.warfare >= 10>> //Slightly better but you still have a long way to go.// <</if>> - <<set $ColonelRelationship += 1>> <</replace>> <</link>> </span> <</replace>> <</link>> - - <<if $ColonelRelationship >= 300>> + + <<if $ColonelRelationship >= 45>> <br><<link "Have some fun">> <<link "Go back">> <<goto "SFM Barracks">> <<set $securityForceSexedColonel = 0, $securityForceColonelToken = 0>> <</link>> <<replace "#result10">> - <<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1>> + <<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1, $ColonelRelationship += 3>> <span id="result11"> Where should this fun take place? <<link "Go back">> @@ -238,35 +232,35 @@ <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 1>> <</link>> <br><<link "Ass">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 1>> <</link>> <br><<link "Both pussy and ass">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 2, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 2>> <</link>> <br><<link "Mouth">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 1>> <</link>> <br><<link "All three holes">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 3, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 3>> <</link>> </span> <</replace>> @@ -284,35 +278,35 @@ <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 1>> <</link>> <br><<link "Ass">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 1>> <</link>> <br><<link "Both pussy and ass">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 2, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 2>> <</link>> <br><<link "Mouth">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 1>> <</link>> <br><<link "All three holes">> <<replace "#result6">> <<include "SpecialForceColonelSexDec">> <</replace>> - <<set $securityForceSexedColonel += 3, $ColonelRelationship += 1>> + <<set $securityForceSexedColonel += 3>> <</link>> </span> <</replace>> @@ -325,4 +319,4 @@ <</replace>> <</link>> </span> -<</if>> \ No newline at end of file +<</if>> diff --git a/src/pregmod/SecForceEX/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw index 66577898518..9b2365b0024 100644 --- a/src/pregmod/SecForceEX/securityForceTradeShow.tw +++ b/src/pregmod/SecForceEX/securityForceTradeShow.tw @@ -5,7 +5,7 @@ <<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,">> @@ -23,7 +23,7 @@ </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. +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. <span id="choice2"> @@ -33,7 +33,7 @@ The (bi-yearly) security trade show has finally come around and even though you' <br>"Thanks <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>" <<set $CurrentTradeShowAttendanceGranted = 1, _TradeShowAttendes = 150, _BonusProviderPercentage = .15, _MenialSlavesPerAttendee = 15>> - + <<include "SpecialForceUpgradeTree">> <<if $arcologies[0].prosperity < 25>> @@ -95,7 +95,7 @@ The (bi-yearly) security trade show has finally come around and even though you' <<set _SuccesfulPersuationAttempt = 1>> <<set _PersuationBonus = 1.10>> <</if>> - + <<if _SuccesfulPersuationAttempt == 0>> <<set _PersuationBonus = 1>> <</if>> @@ -112,18 +112,18 @@ The (bi-yearly) security trade show has finally come around and even though you' <<set $cash = $cash+_Profit>> <<set $TradeShowIncome += _Profit>> <<set $TotalTradeShowIncome += _Profit>> - - <<if $ColonelRelationship >= 400 && $LieutenantColonel == 1 && $ColonelCore == "brazen">> - <br><br> + + <<if $ColonelRelationship >= 65 && $LieutenantColonel == 1 && $ColonelCore == "brazen">> + <br><br> <<link "Have sex with The Colonel in a bathroom stall">> The crowd are shocked by the loud noises coming from a bathroom stall. <<set $rep -= 150, $securityForceSexedColonel += 1>> <</link>> <</if>> - + <</replace>> <</link>> - + <<link "Request she remain on base">> <<replace "#choice2">> <br>The look of disappointment is barely noticeable on The Colonel's face. @@ -132,4 +132,4 @@ The (bi-yearly) security trade show has finally come around and even though you' </span> -<</if>> \ No newline at end of file +<</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index b13bf0e3f87..720b0ffd62c 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3138,6 +3138,6 @@ Done! <<if $clubAdsSpending > 0 && $club == 0>> <<set $clubAdsSpending = 0>> <</if>> -<<if $brothelAdsSpending > 0 && brothel == 0>> +<<if $brothelAdsSpending > 0 && $brothel == 0>> <<set $brothelAdsSpending = 0>> <</if>> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 5c426fda6aa..fbd00102680 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -3,21 +3,21 @@ <<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 */ + <<set $ColonelRelationship = 0>> /* 0 - Employee and boss, 10 - Friend, 25 - Close friend, 45 - Girlfriend, 65 - Lover */ <</if>> <<if $ColonelRelationship == 0>> <<set _RelationshipTitle = "boss">> -<<elseif $ColonelRelationship >= 100>> +<<elseif $ColonelRelationship >= 10>> <<set _RelationshipTitle = "friend">> -<<elseif $ColonelRelationship >= 200>> +<<elseif $ColonelRelationship >= 25>> <<set _RelationshipTitle = "close friend">> -<<elseif $ColonelRelationship >= 300>> +<<elseif $ColonelRelationship >= 45>> <<if $PC.title == 1>> <<set _RelationshipTitle = "boyfriend">> <<else>> <<set _RelationshipTitle = "girlfriend">> <</if>> -<<elseif $ColonelRelationship >= 400>> +<<elseif $ColonelRelationship >= 65>> <<set _RelationshipTitle = "lover">> <</if>> <<set $Env = simpleWorldEconomyCheck()>> -- GitLab