diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 76f2b5d4b53d8fc3f034dcbaf36a3d6e235ed91a..ea8f905cf6a0ba9743e5ad4f06c7bc4384140ab1 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4889,7 +4889,7 @@ Pregmod 0.10.3.0
201
-SFanons stuff
- 12/11/17
+ 12/12/17
202
-fixes
@@ -4898,4 +4898,15 @@ Pregmod 0.10.3.0
-fxied bad if in saRules
204
- -saRules now applies to the clinic
\ No newline at end of file
+ -saRules now applies to the clinic
+
+ 205
+ -git contributed fixes and muscle range expansion to custom slave/starting girls
+
+ 12/13/17
+
+ 206
+ -git contributed fixes
+
+ 207
+ -git contributed code simplification and fixes
\ No newline at end of file
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 6d80818f98963150ad7fc89c80813429a396bab7..c461826fd46ee68d192657570e52a32aad4e5407 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -235,6 +235,9 @@ Custom eye color: <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor>>
<br>Eyes: <<textbox "$activeSlave.eyes" $activeSlave.eyes>>
<<radiobutton "$activeSlave.eyes" 1>> Normal
<<radiobutton "$activeSlave.eyes" -1>> Nearsighted
+<<if $seeExtreme == 1>>
+<<radiobutton "$activeSlave.eyes" -2>> Blind
+<</if>>
<br><br>
@@ -336,13 +339,17 @@ Unskilled.
<br><br>
-''Muscles (0 to 100): $activeSlave.muscles |''
+''Muscles (-100 to 100): $activeSlave.muscles |''
<<textbox "$activeSlave.muscles" $activeSlave.muscles>>
<br>
-<<radiobutton "$activeSlave.muscles" 0>> None
-<<radiobutton "$activeSlave.muscles" 20>> Tone
-<<radiobutton "$activeSlave.muscles" 50>> Muscular
-<<radiobutton "$activeSlave.muscles" 100>> Hugely Muscular
+<<radiobutton "$activeSlave.muscles" -98>> Frail
+<<radiobutton "$activeSlave.muscles" -46>> Very weak
+<<radiobutton "$activeSlave.muscles" -16>> Weak
+<<radiobutton "$activeSlave.muscles" 0>> Soft
+<<radiobutton "$activeSlave.muscles" 15>> Toned
+<<radiobutton "$activeSlave.muscles" 45>> Well built
+<<radiobutton "$activeSlave.muscles" 62>> Quite muscular
+<<radiobutton "$activeSlave.muscles" 97>> Extremely muscular
<br>
@@ -446,7 +453,7 @@ Plush.
<br>
<<radiobutton "$activeSlave.shoulders" -2>> Very narrow
<<radiobutton "$activeSlave.shoulders" -1>> Narrow
-<<radiobutton "$activeSlave.shoulders" -0>> Normal
+<<radiobutton "$activeSlave.shoulders" 0>> Normal
<<radiobutton "$activeSlave.shoulders" 1>> Broad
<<radiobutton "$activeSlave.shoulders" 2>> Very broad
@@ -457,7 +464,7 @@ Plush.
<br>
<<radiobutton "$activeSlave.shouldersImplant" -2>> Adv. Narrowed
<<radiobutton "$activeSlave.shouldersImplant" -1>> Narrowed
-<<radiobutton "$activeSlave.shouldersImplant" -0>> None
+<<radiobutton "$activeSlave.shouldersImplant" 0>> None
<<radiobutton "$activeSlave.shouldersImplant" 1>> Broadened
<<radiobutton "$activeSlave.shouldersImplant" 2>> Adv. Broadened
@@ -479,7 +486,7 @@ Plush.
<br>
<<radiobutton "$activeSlave.hipsImplant" -2>> Adv. Narrowed
<<radiobutton "$activeSlave.hipsImplant" -1>> Narrowed
-<<radiobutton "$activeSlave.hipsImplant" -0>> None
+<<radiobutton "$activeSlave.hipsImplant" 0>> None
<<radiobutton "$activeSlave.hipsImplant" 1>> Broadened
<<radiobutton "$activeSlave.hipsImplant" 2>> Adv. Broadened
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index a2b54c832ed7b76177f6373b7ad38a305f3d0d32..cfa45342174b96ed086f29b80d114b5904578067 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1464,13 +1464,13 @@
<<switch $tempSlave.shoulders>>
<<case -2>>@@.yellow;Very narrow@@
<<case -1>>@@.yellow;Narrow@@
- <<case -0>>@@.yellow;Normal@@
+ <<case 0>>@@.yellow;Normal@@
<<case 1>>@@.yellow;Broad@@
<<case 2>>@@.yellow;Very broad@@
<</switch>>
<<radiobutton "$tempSlave.shoulders" -2>> Very narrow
<<radiobutton "$tempSlave.shoulders" -1>> Narrow
- <<radiobutton "$tempSlave.shoulders" -0>> Normal
+ <<radiobutton "$tempSlave.shoulders" 0>> Normal
<<radiobutton "$tempSlave.shoulders" 1>> Broad
<<radiobutton "$tempSlave.shoulders" 2>> Very broad
@@ -1485,7 +1485,7 @@
<</switch>>
<<radiobutton "$tempSlave.shouldersImplant" -2>> Adv. Narrowed
<<radiobutton "$tempSlave.shouldersImplant" -1>> Narrowed
- <<radiobutton "$tempSlave.shouldersImplant" -0>> None
+ <<radiobutton "$tempSlave.shouldersImplant" 0>> None
<<radiobutton "$tempSlave.shouldersImplant" 1>> Broadened
<<radiobutton "$tempSlave.shouldersImplant" 2>> Adv. Broadened
@@ -1494,13 +1494,13 @@
<<switch $tempSlave.hips>>
<<case -2>>@@.yellow;Very narrow@@
<<case -1>>@@.yellow;Narrow@@
- <<case -0>>@@.yellow;Normal@@
+ <<case 0>>@@.yellow;Normal@@
<<case 1>>@@.yellow;Broad@@
<<case 2>>@@.yellow;Very broad@@
<</switch>>
<<radiobutton "$tempSlave.hips" -2>> Very narrow
<<radiobutton "$tempSlave.hips" -1>> Narrow
- <<radiobutton "$tempSlave.hips" -0>> Normal
+ <<radiobutton "$tempSlave.hips" 0>> Normal
<<radiobutton "$tempSlave.hips" 1>> Broad
<<radiobutton "$tempSlave.hips" 2>> Very broad
@@ -1515,7 +1515,7 @@
<</switch>>
<<radiobutton "$tempSlave.hipsImplant" -2>> Adv. Narrowed
<<radiobutton "$tempSlave.hipsImplant" -1>> Narrowed
- <<radiobutton "$tempSlave.hipsImplant" -0>> None
+ <<radiobutton "$tempSlave.hipsImplant" 0>> None
<<radiobutton "$tempSlave.hipsImplant" 1>> Broadened
<<radiobutton "$tempSlave.hipsImplant" 2>> Adv. Broadened
<br>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 5bb9b85f0b5d055e90d2afacb4228619dd78b84a..594304f73c794d9fc4eaba8cf0b91fd3067e7a9d 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -47,6 +47,7 @@
<<elseif $PC.rumor == "social engineering">>
<<set $FSAnnounced = 1>>
<<set $FSCredits = 1>>
+ <<set $FSGotRepCredits = 1>>
<<elseif $PC.rumor == "luck">>
<<set $rep += 4000>>
<</if>>
@@ -528,6 +529,7 @@
<<set $activeArcology.FSSupremacistDecoration = 20, $activeArcology.FSSubjugationistDecoration = 20, $activeArcology.FSGenderRadicalistDecoration = 20, $activeArcology.FSGenderFundamentalistDecoration = 20, $activeArcology.FSPaternalistDecoration = 20, $activeArcology.FSDegradationistDecoration = 20, $activeArcology.FSBodyPuristDecoration = 20, $activeArcology.FSTransformationFetishistDecoration = 20, $activeArcology.FSYouthPreferentialistDecoration = 20, $activeArcology.FSMaturityPreferentialistDecoration = 20, $activeArcology.FSSlimnessEnthusiastDecoration = 20, $activeArcology.FSAssetExpansionistDecoration = 20, $activeArcology.FSPastoralistDecoration = 20, $activeArcology.FSPhysicalIdealistDecoration = 20, $activeArcology.FSChattelReligionistDecoration = 20, $activeArcology.FSRomanRevivalistDecoration = 20, $activeArcology.FSAztecRevivalistDecoration = 20, $activeArcology.FSEgyptianRevivalistDecoration = 20, $activeArcology.FSEdoRevivalistDecoration = 20, $activeArcology.FSArabianRevivalistDecoration = 20, $activeArcology.FSChineseRevivalistDecoration = 20, $activeArcology.FSRepopulationFocusDecoration = 20, $activeArcology.FSRestartDecoration = 20, $activeArcology.FSHedonisticDecadenceDecoration = 20, $activeArcology.FSCummunismDecoration = 20>>
<<if $targetArcology.type != "New">>
<<set $FSAnnounced = 1>>
+ <<set $FSGotRepCredits = 1>>
<<set $activeArcology.name = $targetArcology.name, $activeArcology.prosperity = $targetArcology.prosperity, $ACitizens += $targetArcology.citizens*500>>
<<set _decoration = $targetArcology.FSProgress + 10>>
<<switch $targetArcology.type>>
@@ -583,7 +585,7 @@
<<set $activeArcology.FSNull = 20>>
<</switch>>
<<if $PC.rumor == "social engineering">>
- <<set $FSGotRepCreditOne = 1>>
+ <<set $FSGotRepCredits += 1>>
<</if>>
<</if>>
<<else>>
diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index d1c81160e5f09b53e9190e7cf597f281dd917345..78c3f7932a002826a40c560589b868e5c5935fa7 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -249,6 +249,7 @@ span.zeroButton > a:hover { text-decoration: none; }
div.output{
width: 100%;
width: 100vw;
+max-width: 100%;
word-break: break-all;
white-space: normal;
}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index adb42830deb937fab2f80ca01c6d85407de760b4..8dcd97a9037c8a74a1e7ac319bc6b2c6e9e6c8a1 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -561,12 +561,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $FSCredits = 0>>
<<set $FSCreditCount = 5>>
<<set $FSCreditCountString = "five">>
-<<set $FSGotRepCreditOne = 0>>
-<<set $FSGotRepCreditTwo = 0>>
-<<set $FSGotRepCreditThree = 0>>
-<<set $FSGotRepCreditFour = 0>>
-<<set $FSGotRepCreditFive = 0>>
-<<set $FSGotRepCreditSix = 0>>
+<<set $FSGotRepCredits = 0>>
<<set $FSSingleSlaveRep = 10>>
<<set $FSSpending = 0>>
<<set $FSLockinLevel = 100>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 10719fa46e69f8c5941b77aa6bec6fd8fd367dab..dcb092271d1bdce83a04ed78dcdd5905c06ff16f 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -536,14 +536,33 @@ __You are customizing this slave:__
<br>''Muscles:''
<span id="muscles">
-<<if $activeSlave.muscles <= 5>>Normal.
-<<elseif $activeSlave.muscles <= 30>>Toned.
-<<else>>Ripped.
+<<if $activeSlave.muscles > 95>>
+ Ripped.
+<<elseif $activeSlave.muscles > 50>>
+ Quite muscular.
+<<elseif $activeSlave.muscles > 30>>
+ Well built.
+<<elseif $activeSlave.muscles > 5>>
+ Toned.
+<<elseif $activeSlave.muscles > -6>>
+ Normal.
+<<elseif $activeSlave.muscles > -31>>
+ Weak.
+<<elseif $activeSlave.muscles > -96>>
+ Very weak.
+<<else>>
+ Frail.
<</if>>
+
</span>
+<<link "Frail">><<set $activeSlave.muscles = -97>><<replace "#muscles">>Frail.<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Very weak">><<set $activeSlave.muscles = -66>><<replace "#muscles">>Very weak.<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Weak">><<set $activeSlave.muscles = -41>><<replace "#muscles">>Rather weak.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Normal">><<set $activeSlave.muscles = 0>><<replace "#muscles">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Toned">><<set $activeSlave.muscles = 20>><<replace "#muscles">>Toned.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Ripped">><<set $activeSlave.muscles = 50>><<replace "#muscles">>Ripped.<</replace>><<StartingGirlsCost>><</link>>
+<<link "Well built">><<set $activeSlave.muscles = 40>><<replace "#muscles">>Well built.<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Muscular">><<set $activeSlave.muscles = 65>><<replace "#muscles">>Muscular.<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Ripped">><<set $activeSlave.muscles = 96>><<replace "#muscles">>Ripped.<</replace>><<StartingGirlsCost>><</link>>
''Waist:''
<span id="waist">
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5d7b046d7c6ec5c296ed2eaf094e964979773e6c..60c09881a93c095f2f8563b70781a5e09d7a259c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -503,11 +503,42 @@
<<if ndef $FSCreditCountString>>
<<set $FSCreditCountString = "five">>
<</if>>
-<<if ndef $FSGotRepCreditFive>>
- <<set $FSGotRepCreditFive = 0>>
+<<if ndef $FSGotRepCredits>>
+ <<if $FSGotRepCreditSix == 1>>
+ <<set $FSGotRepCredits = 7>>
+ <<elseif $FSGotRepCreditFive == 1>>
+ <<set $FSGotRepCredits = 6>>
+ <<elseif $FSGotRepCreditFour == 1>>
+ <<set $FSGotRepCredits = 5>>
+ <<elseif $FSGotRepCreditThree == 1>>
+ <<set $FSGotRepCredits = 4>>
+ <<elseif $FSGotRepCreditTwo == 1>>
+ <<set $FSGotRepCredits = 3>>
+ <<elseif $FSGotRepCreditOne == 1>>
+ <<set $FSGotRepCredits = 2>>
+ <<elseif $FSAnnounced == 1>>
+ <<set $FSGotRepCredits = 1>>
+ <<else>>
+ <<set $FSGotRepCredits = 0>>
+ <</if>>
+<</if>>
+<<if def $FSGotRepCreditSix>>
+ <<unset $FSGotRepCreditSix>>
+<</if>>
+<<if def $FSGotRepCreditFive>>
+ <<unset $FSGotRepCreditFive>>
+<</if>>
+<<if def $FSGotRepCreditFour>>
+ <<unset $FSGotRepCreditFour>>
+<</if>>
+<<if def $FSGotRepCreditThree>>
+ <<unset $FSGotRepCreditThree>>
+<</if>>
+<<if def $FSGotRepCreditTwo>>
+ <<unset $FSGotRepCreditTwo>>
<</if>>
-<<if ndef $FSGotRepCreditSix>>
- <<set $FSGotRepCreditSix = 0>>
+<<if def $FSGotRepCreditOne>>
+ <<unset $FSGotRepCreditOne>>
<</if>>
<<if ndef $makeDicks>>
<<set $makeDicks = 0>>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index 0a56f2c299ea266b1f4eb9aaefe562ed7733b9fb..f6acbb84699f3879892299c5d49f987bfb435ee2 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -101,11 +101,39 @@
<br>
<span id = "muscles">
-<<if $customSlave.muscles <= 5>>Normal musculature.
-<<elseif $customSlave.muscles <= 30>>Toned.
-<<else>>Ripped.
+<<if $customSlave.muscles > 95>>
+ Ripped.
+<<elseif $customSlave.muscles > 50>>
+ Muscular.
+<<elseif $customSlave.muscles > 30>>
+ Well built.
+<<elseif $customSlave.muscles > 5>>
+ Toned.
+<<elseif $customSlave.muscles > -6>>
+ Soft.
+<<elseif $customSlave.muscles > -31>>
+ Weak.
+<<elseif $customSlave.muscles > -96>>
+ Very weak.
+<<else>>
+ Frail.
<</if>>
</span>
+<<link "Frail">>
+ <<set $customSlave.muscles = -97>>
+ <<CustomSlaveMuscles>>
+<</link>>
+|
+<<link "Verk weak">>
+ <<set $customSlave.muscles = -51>>
+ <<CustomSlaveMuscles>>
+<</link>>
+|
+<<link "Weak">>
+ <<set $customSlave.muscles = -21>>
+ <<CustomSlaveMuscles>>
+<</link>>
+|
<<link "Normal">>
<<set $customSlave.muscles = 0>>
<<CustomSlaveMuscles>>
@@ -116,18 +144,37 @@
<<CustomSlaveMuscles>>
<</link>>
|
+<<link "Well built">>
+ <<set $customSlave.muscles = 45>>
+ <<CustomSlaveMuscles>>
+<</link>>
+|
+<<link "Muscular">>
+ <<set $customSlave.muscles = 65>>
+ <<CustomSlaveMuscles>>
+<</link>>
+|
<<link "Ripped">>
- <<set $customSlave.muscles = 50>>
+ <<set $customSlave.muscles = 96>>
<<CustomSlaveMuscles>>
<</link>>
<br>
<span id = "lips">
-<<if $customSlave.lips == 15>>Normal lips.
-<<elseif $customSlave.lips == 35>>Plush lips.
+<<if $customSlave.lips <= 10>>Thin lips.
+<<elseif $customSlave.lips <= 20>>Normal lips.
+<<elseif $customSlave.lips <= 40>>Plush lips.
+<<elseif $customSlave.lips <= 70>>Big lips.
+<<elseif $customSlave.lips <= 95>>Huge lips.
+<<else>>Facepussy.
<</if>>
</span>
+<<link "Thin">>
+ <<set $customSlave.lips = 5>>
+ <<CustomSlaveLips>>
+<</link>>
+|
<<link "Normal">>
<<set $customSlave.lips = 15>>
<<CustomSlaveLips>>
@@ -137,6 +184,21 @@
<<set $customSlave.lips = 35>>
<<CustomSlaveLips>>
<</link>>
+|
+<<link "Big">>
+ <<set $customSlave.lips = 65>>
+ <<CustomSlaveLips>>
+<</link>>
+|
+<<link "Enormous">>
+ <<set $customSlave.lips = 85>>
+ <<CustomSlaveLips>>
+<</link>>
+|
+<<link "Facepussy">>
+ <<set $customSlave.lips = 100>>
+ <<CustomSlaveLips>>
+<</link>>
<br>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 9df3f0ce8ba7916503e9199ef7d4523a9f8e5106..1bb592667f629150ef321d742f3d69e5b52dfb0a 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -6,134 +6,133 @@
<<if $FSCredits > 0>>
@@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@
<</if>>
-
<<if $FSCreditCount == 4>>
- <<if ($FSGotRepCreditOne != 1)>>
+ <<if ($FSGotRepCredits == 1)>>
<<if ($rep > 7000)>>
@@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@
- <<set $FSGotRepCreditOne = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditTwo != 1)>>
+ <<if ($FSGotRepCredits == 2)>>
<<if ($rep > 11000)>>
@@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@
- <<set $FSGotRepCreditTwo = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditThree != 1)>>
+ <<if ($FSGotRepCredits == 3)>>
<<if ($rep > 15000)>>
@@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a fourth and final societal direction.@@
- <<set $FSGotRepCreditThree = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<elseif $FSCreditCount == 5>>
- <<if ($FSGotRepCreditOne != 1)>>
+ <<if ($FSGotRepCredits == 1)>>
<<if ($rep > 6000)>>
@@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@
- <<set $FSGotRepCreditOne = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditTwo != 1)>>
+ <<if ($FSGotRepCredits == 2)>>
<<if ($rep > 9000)>>
@@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@
- <<set $FSGotRepCreditTwo = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditThree != 1)>>
+ <<if ($FSGotRepCredits == 3)>>
<<if ($rep > 12000)>>
@@.yellow;Your reputation is so great that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@
- <<set $FSGotRepCreditThree = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditFour != 1)>>
+ <<if ($FSGotRepCredits == 4)>>
<<if ($rep > 15000)>>
@@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a fifth and final societal direction.@@
- <<set $FSGotRepCreditFour = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<elseif $FSCreditCount == 6>>
- <<if ($FSGotRepCreditOne != 1)>>
+ <<if ($FSGotRepCredits == 1)>>
<<if ($rep > 6000)>>
@@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@
- <<set $FSGotRepCreditOne = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditTwo != 1)>>
+ <<if ($FSGotRepCredits == 2)>>
<<if ($rep > 9000)>>
@@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@
- <<set $FSGotRepCreditTwo = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditThree != 1)>>
+ <<if ($FSGotRepCredits == 3)>>
<<if ($rep > 12000)>>
@@.yellow;Your reputation is so great that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@
- <<set $FSGotRepCreditThree = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditFour != 1)>>
+ <<if ($FSGotRepCredits == 4)>>
<<if ($rep > 15000)>>
@@.yellow;Your reputation is so excellent that $arcologies[0].name's society is ready to begin accepting a fifth societal direction.@@
- <<set $FSGotRepCreditFour = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditFive != 1)>>
+ <<if ($FSGotRepCredits == 5)>>
<<if ($rep > 18000)>>
@@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a sixth and final societal direction.@@
- <<set $FSGotRepCreditFive = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<elseif $FSCreditCount == 7>>
- <<if ($FSGotRepCreditOne != 1)>>
+ <<if ($FSGotRepCredits == 1)>>
<<if ($rep > 6000)>>
@@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@
- <<set $FSGotRepCreditOne = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditTwo != 1)>>
+ <<if ($FSGotRepCredits == 2)>>
<<if ($rep > 9000)>>
@@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@
- <<set $FSGotRepCreditTwo = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditThree != 1)>>
+ <<if ($FSGotRepCredits == 3)>>
<<if ($rep > 12000)>>
@@.yellow;Your reputation is so remarkable that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@
- <<set $FSGotRepCreditThree = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditFour != 1)>>
+ <<if ($FSGotRepCredits == 4)>>
<<if ($rep > 15000)>>
@@.yellow;Your reputation is so great that $arcologies[0].name's society is ready to begin accepting a fifth societal direction.@@
- <<set $FSGotRepCreditFour = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditFive != 1)>>
+ <<if ($FSGotRepCredits == 5)>>
<<if ($rep > 17000)>>
@@.yellow;Your reputation is so excellent that $arcologies[0].name's society is ready to begin accepting a sixth societal direction.@@
- <<set $FSGotRepCreditFive = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
- <<if ($FSGotRepCreditSix != 1)>>
+ <<if ($FSGotRepCredits == 6)>>
<<if ($rep > 19000)>>
@@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a seventh and final societal direction.@@
- <<set $FSGotRepCreditSix = 1>>
+ <<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw
index 38aaf165344626995ad366d6eabb6e424a4f68e4..daf35e0da94bd96fe74fda914dda0fb0435a492e 100644
--- a/src/uncategorized/futureSocities.tw
+++ b/src/uncategorized/futureSocities.tw
@@ -173,7 +173,7 @@
<<if $FSCredits > 0>>
@@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@
-<<elseif $FSGotRepCreditTwo == 1>>
+<<elseif $FSGotRepCredits >= 3>>
Your society is so radically changed that it is starting to take on a life of its own. The major decisions about its direction have been made.
<<else>>
You must develop your reputation further for $arcologies[0].name's society to be ready for a new societal direction.
@@ -430,17 +430,17 @@
<</if>>
You have unlocked
-<<if ($FSGotRepCreditSix == 1)>>
+<<if ($FSGotRepCredits == 7)>>
__seven of <<print $FSCreditCountString>>__
-<<elseif ($FSGotRepCreditFive == 1)>>
+<<elseif ($FSGotRepCredits == 6)>>
__six of <<print $FSCreditCountString>>__
-<<elseif ($FSGotRepCreditFour == 1)>>
+<<elseif ($FSGotRepCredits == 5)>>
__five of <<print $FSCreditCountString>>__
-<<elseif ($FSGotRepCreditThree == 1)>>
+<<elseif ($FSGotRepCredits == 4)>>
__four of <<print $FSCreditCountString>>__
-<<elseif ($FSGotRepCreditTwo == 1)>>
+<<elseif ($FSGotRepCredits == 3)>>
__three of <<print $FSCreditCountString>>__
-<<elseif ($FSGotRepCreditOne == 1)>>
+<<elseif ($FSGotRepCredits == 2)>>
__two of <<print $FSCreditCountString>>__
<<else>>
__one of <<print $FSCreditCountString>>__
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index e231437fa678622897805737877d741c2bca1bf8..28bfdbb804365a07b0eafee3761b6b752d8aff91 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -160,13 +160,17 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i
<<if $HGtraining == "obedience">>
<<set _effectiveness -= $activeSlave.intelligence*15>>
-<<set $activeSlave.trust -= Math.ceil(_effectiveness/4)>>
-<<if $activeSlave.devotion < -50>>
- She helps watch and restrain the rebellious $activeSlave.slaveName, helping wear her down, @@.gold;breaking $activeSlave.slaveName's rebelliousness.@@
-<<elseif $activeSlave.devotion < -20>>
- She keeps $activeSlave.slaveName constantly aware of her slavery, @@.gold;breaking $activeSlave.slaveName's resistance.@@
+<<if _effectiveness <= 0>>
+ $activeSlave.slaveName is smart enough to complicate things; she manages to outwit her this week and makes no progress.
<<else>>
- She acts as another pair of eyes watching $activeSlave.slaveName and metes out punishments, @@.gold;improving $activeSlave.slaveName's servitude.@@
+ <<set $activeSlave.devotion += Math.ceil(_effectiveness/4)>>
+ <<if $activeSlave.devotion < -50>>
+ She helps watch and restrain the rebellious $activeSlave.slaveName, helping wear her down, @@.gold;breaking $activeSlave.slaveName's rebelliousness.@@
+ <<elseif $activeSlave.devotion < -20>>
+ She keeps $activeSlave.slaveName constantly aware of her slavery, @@.gold;breaking $activeSlave.slaveName's resistance.@@
+ <<else>>
+ She acts as another pair of eyes watching $activeSlave.slaveName and metes out punishments, @@.gold;improving $activeSlave.slaveName's servitude.@@
+ <</if>>
<</if>>
<<elseif $HGtraining == "paraphilia">>
diff --git a/src/uncategorized/pFSAnnouncement.tw b/src/uncategorized/pFSAnnouncement.tw
index 849b0258248cf5a307df852f12e9a36d210e3ceb..1b6708a5fd8a8f69f411353869e69a1f4391e482 100644
--- a/src/uncategorized/pFSAnnouncement.tw
+++ b/src/uncategorized/pFSAnnouncement.tw
@@ -4,6 +4,7 @@
<<set $FSAnnounced = 1>>
<<set $FSCredits += 1>>
+<<set $FSGotRepCredits = 1>>
The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> knows to allow you these moments of peace.
<br><br>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index cfe97dc34044163f36e491f64a9fee6acc7fcadf..9c96f66ecc5e52227d8d78c7b74df0bb0eff9510 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -8,7 +8,17 @@
''One of the following eligible slaves would have been selected for an individual random event:''
<br>
<<for $i = 0; $i < $eligibleSlaves.length; $i++>>
- <br><<print "[[$eligibleSlaves[$i].slaveName|Random Individual Event][$eventSlave = $eligibleSlaves[" + $i + "]]]">>
+ <<if $eligibleSlaves[$i].slaveSurname>>
+ <<switch $eligibleSlaves[$i].nationality>>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+ <<set _slaveName = $eligibleSlaves[$i].slaveSurname + " " + $eligibleSlaves[$i].slaveName>>
+ <<default>>
+ <<set _slaveName = $eligibleSlaves[$i].slaveName + " " + $eligibleSlaves[$i].slaveSurname>>
+ <</switch>>
+ <<else>>
+ <<set _slaveName = $eligibleSlaves[$i].slaveName>>
+ <</if>>
+ <br><<print "[[_slaveName|Random Individual Event][$eventSlave = $eligibleSlaves[" + $i + "]]]">>
<</for>>
<br><br>[[Switch to Random Nonindividual Event|Random Nonindividual Event][$activeSlave = 0, $eventSlave = 0]]
<<else>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 1a6334983e4c7ea01ad7e7b8b27f918cc9ee7fdb..e84fd0ea6d3d8910c541cdc1f05c2451a17e6f41 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -8,7 +8,17 @@
''Any one of your slaves would have been selected for a random non-individual event:''
<br>
<<for $i = 0; $i < $slaves.length; $i++>>
- <br><<print "[[$slaves[$i].slaveName|Random Nonindividual Event][$eventSlave = $slaves[" + $i + "]]]">>
+ <<if $slaves[$i].slaveSurname>>
+ <<switch $slaves[$i].nationality>>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+ <<set _slaveName = $slaves[$i].slaveSurname + " " + $slaves[$i].slaveName>>
+ <<default>>
+ <<set _slaveName = $slaves[$i].slaveName + " " + $slaves[$i].slaveSurname>>
+ <</switch>>
+ <<else>>
+ <<set _slaveName = $slaves[$i].slaveName>>
+ <</if>>
+ <br><<print "[[_slaveName|Random Nonindividual Event][$eventSlave = $slaves[" + $i + "]]]">>
<</for>>
<br><br>[[Switch to RIE Eligibility Check|RIE Eligibility Check][$activeSlave = 0, $eventSlave = 0]]
<<else>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index bb4c743581ae435c5f6f884cb883a776d5b9259a..9919ad3825c9a0a68b2d9270377690704d59729c 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -654,7 +654,7 @@
<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
<<elseif ($nickname == "southern european")>>
- <<set $nickname = either("'Aphrodite'", "'Doña'", "'Fine Wine'", "'Garlic Breath'", "'Greaseball'", "'Grecian'", "'Infamis'", "'Lupa'", "'Mediterranean'", "'Meretrix'", "'Odalisque'", "'Olive Oil'", "'Riviera'", "'Roman Nose'", "'Venus'", "'Wog'", "Bella'")>>
+ <<set $nickname = either("'Aphrodite'", "'Doña'", "'Fine Wine'", "'Garlic Breath'", "'Greaseball'", "'Grecian'", "'Infamis'", "'Lupa'", "'Mediterranean'", "'Meretrix'", "'Odalisque'", "'Olive Oil'", "'Riviera'", "'Roman Nose'", "'Venus'", "'Wog'", "'Bella'")>>
<<set $situationDesc = "is southern european, which is not uncommon given the endemic corruption and political collapse in that part of the world. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 55b6268a66544a808bb244ffc2a75663f83e15fe..74566befd4fb730bd3863a757fe765e8adb6ed0d 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -2455,7 +2455,7 @@ Relationship rules: <span id="relation">''$currentRule.relationshipRules.''</spa
<br><br>
-<<if _length >= 10>>''@@.red;ATTENTION! Current rules count is 10 or above. High rules count can dramaticaly slow down game speed (especially if slaves count is high too), or even cause freeze of game page/browser. Use at you own risk!@@''
+<<if _length >= 10>>''@@.red;ATTENTION! Current rules count is 10 or above. High rules count can dramaticaly slow down game speed (especially if slaves count is high too), or even cause freeze of game page/browser. Use at your own risk!@@''
<br><br>
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 45b3c92ead3288d1121cf9633167d985506e81b7..662fd0c5d787d7e3ef6553d64c5ea58e2cf66ee2 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4081,7 +4081,7 @@ $pronounCap has
<</if>>
<<if $activeSlave.teeth != "normal">>
<<if $activeSlave.teeth == "crooked">>
- $possessiveCap teeth are crooked, detracting from $possessive beauty whenever $pronoun opens $possessive mouth.
+ $possessiveCap teeth are @@.yellow;crooked@@, detracting from $possessive beauty whenever $pronoun opens $possessive mouth.
<<elseif $activeSlave.teeth == "straightening braces">>
$pronounCap has braces,
<<if $activeSlave.visualAge > 35>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 711c9982416f1b851c0230fe19b56e6d9353431d..7d65a78c600371997f4855b8e47fc390c03d0114 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1500,9 +1500,24 @@
%/
<<widget "CustomSlaveMuscles">>
<<replace #muscles>>
- <<if $customSlave.muscles <= 5>>Normal musculature.
- <<elseif $customSlave.muscles <= 30>>Toned.
- <<else>>Ripped.
+ <<if $customSlave.muscles > 95>>
+ Ripped.
+ <<elseif $customSlave.muscles > 50>>
+ Muscular.
+ <<elseif $customSlave.muscles > 30>>
+ Well built.
+ <<elseif $customSlave.muscles > 5>>
+ Toned.
+ <<elseif $customSlave.muscles > -6>>
+ Soft.
+ <<elseif $customSlave.muscles > -31>>
+ Quite weak.
+ <<elseif $customSlave.muscles > -51>>
+ Rather weak.
+ <<elseif $customSlave.muscles > -96>>
+ Very weak.
+ <<else>>
+ Frail.
<</if>>
<</replace>>
<</widget>>