diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 31d3d21995a6ae8ccbd6192220e3f04812c428db..7bd55f0a814523f743472d578e9ce80598b870e5 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,12 @@ 12/22/17 + 223 + -SFanon's stuff (mostly comma'd numbers) + + 222 + -SFanon's stuff + 221 -fixed servants quarters bugs diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw index 3dd08aadb9e03c481051eaf4df96cfd007986f33..cb3954220c9ae8b0997f4f15e96889ee2057525d 100644 --- a/src/pregmod/managePersonalAffairs.tw +++ b/src/pregmod/managePersonalAffairs.tw @@ -392,7 +392,7 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref <br> <span id="nameResult"> -<<link "Rename yourself">> //Will cost you some reputation// +<<link "Rename yourself">> <<replace "#nameResult">> New name: <<textbox "_PCNamet" $PC.name>> <<link "Apply">> @@ -403,7 +403,7 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref <</replace>> <</link>> <</replace>> -<</link>> +<</link>>//Will cost you some reputation// </span> <<if $PC.degeneracy > 0>> @@ -494,17 +494,17 @@ In total, you have given birth to: <<if $PC.slavesKnockedUp > 0>> <br> <<if $PC.dick == 1>> - You've knocked up $PC.slavesKnockedUp fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far. + You've knocked up commaNum($PC.slavesKnockedUp) fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far. <<else>> - Before your sex change, you knocked up $PC.slavesKnockedUp fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>>. + Before your sex change, you knocked up commaNum($PC.slavesKnockedUp) fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>>. <</if>> <<else>> <<if $PC.slavesFathered > 0>> <br> <<if $PC.dick == 1>> - You've fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far. + You've fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far. <<else>> - Before your sex change, you fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>>. + Before your sex change, you fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>>. <</if>> <</if>> <</if>> @@ -584,37 +584,37 @@ In total, you have given birth to: <br><br> Before your sex change, you had given birth to: <<if $PC.birthElite > 0>> - <br><<print $PC.birthElite>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite. + <br><<print commaNum($PC.birthElite)>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite. <</if>> <<if $PC.birthMaster > 0>> - <br><<print $PC.birthMaster>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master. + <br><<print commaNum($PC.birthMaster)>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master. <</if>> <<if $PC.birthClient > 0>> - <br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with. + <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with. <</if>> <<if $PC.birthDegenerate > 0>> - <br><<print $PC.birthDegenerate>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves. + <br><<print commaNum($PC.birthDegenerate)>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves. <</if>> <<if $PC.birthArcOwner > 0>> - <br><<print $PC.birthArcOwner>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner. + <br><<print commaNum($PC.birthArcOwner)>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner. <</if>> <<if $PC.birthCitizen > 0>> - <br><<print $PC.birthCitizen>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens. + <br><<print commaNum($PC.birthCitizen)>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens. <</if>> <<if $PC.birthOther > 0>> - <br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall. + <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall. <</if>> <<if $PC.birthSelf > 0>> - <br><<print $PC.birthSelf>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you. + <br><<print commaNum($PC.birthSelf)>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you. <</if>> <</if>> <<if $PC.slavesKnockedUp > 0>> <br><br> - You've knocked up $PC.slavesKnockedUp fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far. + You've knocked up <<print commaNum($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far. <<else>> <<if $PC.slavesFathered > 0>> <br><br> - You've fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far. + You've fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far. <</if>> <</if>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 1cdef4784b6601004e0a82e9e2df615f24ff0cca..3756341201d65f5005b44d3aa0e2517667829b51 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -178,7 +178,7 @@ This week, <<if _flux > 0>>few to none<<else>>many<</if>> of $arcologies[0].name <br>@@.red;Error: ASlaves is outside accepted range, please report this issue@@ <</if>> -$ACitizens citizens and <<print $ASlaves+$helots+$slaves.length>> slaves now live in your arcology. +<<print commaNum($ACitizens)>> citizens and <<print commaNum($ASlaves+$helots+$slaves.length)>> slaves now live in your arcology. <<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>> <<if $arcologies[0].FSRomanRevivalistLaw == 1>>The citizens take pride in their martial duties, preferring to wear utilitarian clothing even when off duty.<</if>> <<if $arcologies[0].FSGenderRadicalistDecoration == 100>>Every single one of the slaves is female by virtue of her fuckable asshole. @@ -312,18 +312,18 @@ You own <<set _earnings += $helots*10>> <</if>> <</if>> - <<if $helots > 1>>$helots menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>> + <<if $helots > 1>> <<print commaNum($helots)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>> <</if>> <<if $menialBioreactors > 0>> <<set _earnings += $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>> <<if $dairy>><<if $dairyUpgradeMenials>><<set _earnings += $menialBioreactors*5>><</if>><</if>> - <<if $menialBioreactors > 1>>$menialBioreactors standard bioreactors,<<else>>one standard bioreactor,<</if>> + <<if $menialBioreactors > 1>> <<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>> <<if $fuckdolls > 0>>and<</if>> <</if>> <<if $fuckdolls > 0>> <<set _earnings += $fuckdolls*(15+(10*$arcologies[0].FSDegradationistLaw))>> <<if $arcade>><<if $arcadeUpgradeMenials>><<set _earnings += $fuckdolls*5>><</if>><</if>> - <<if $fuckdolls > 1>>$fuckdolls standard fuckdolls,<<else>>one fuckdoll,<</if>> + <<if $fuckdolls > 1>> <<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>> <</if>> <<set _earnings += random(1,10)>> diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw index fbef38bc0206f32886de206f6607fe34cef8f290..f75351cbdc71f8b2b2a059ba4d5ea40a1937c019 100644 --- a/src/uncategorized/arcologyDescription.tw +++ b/src/uncategorized/arcologyDescription.tw @@ -629,7 +629,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el The noise in the thriving open space is almost oppressive, with the sounds of drunken merriment, traditional music, and distant intercourse forming an omnipresent hum. <</if>> -$ACitizens citizens and <<print $ASlaves+$helots+$slaves.length>> slaves live in $arcologies[0].name. +<<print commaNum($ACitizens)>> citizens and <<print commaNum($ASlaves+$helots+$slaves.length)>> slaves live in $arcologies[0].name. <<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>> <<if $arcologies[0].FSRomanRevivalistLaw == 1>>Every citizen has military responsibilities, which are a point of pride to many, with most opting to wear utilitarian clothing even when off duty.<</if>> <<if $arcologies[0].FSAztecRevivalistLaw == 1>>Most citizens wear satin loincloths and cloaks, distinguished from those of slaves by the richness of their adornments.<</if>> diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw index 6f771501d3bbd127987832b18458d39047b754c6..678c6fc54bebb46fcf3984ad6500979056612886 100644 --- a/src/uncategorized/manageArcology.tw +++ b/src/uncategorized/manageArcology.tw @@ -174,7 +174,7 @@ She also has charge of all smart piercings in the arcology, and is using her ada <br><br> -Your slaves have participated in approximately <<print $oralTotal+$vaginalTotal+$analTotal>> sexual encounters: $oralTotal primarily oral, $vaginalTotal vanilla, $mammaryTotal mammary, $analTotal anal, and $penetrativeTotal with the slave penetrating another. They have produced about $milkTotal liters of marketable milk, <<if $seeDicks != 0>>about $cumTotal deciliters of marketable cum, <</if>>and have given birth $birthsTotal times. +Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print commaNum($birthsTotal)>> times. <<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>> <<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>> @@ -182,19 +182,19 @@ Your slaves have participated in approximately <<print $oralTotal+$vaginalTotal+ <<if $secExp == 1 && $battlesEnabled == 1>> <br><br> <<if $securityForceCreate == 0>> - Your army counts <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower>> total soldiers. + Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers. <<else>> - Your army counts <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel>> total soldiers of which $securityForcePersonnel under the security force command and the rest under your direct control. + Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel)>> total soldiers of which <<print commaNum($securityForcePersonnel)>> under the security force command and the rest under your direct control. <</if>> <<if $hasFoughtOnce == 1>> - Your troops were involved in <<print $battlesCount>> battles of which <<print $majorBattlesCount>> major engagements. You won <<print $PCvictories>> of them, while the enemy managed to gain the upper hand in the other <<print $PClosses>>. + Your troops were involved in <<print commaNum($battlesCount)>> battles of which <<print commaNum($majorBattlesCount)>> major engagements. You won <<print commaNum($PCvictories)>> of them, while the enemy managed to gain the upper hand in the other <<print commaNum($PClosses)>>. <</if>> <<if $rebellionsCount >= 1>> - Your arcology was involved in <<print $rebellionsCount>> rebellions. You won <<print $PCrebWon>> of them, while the rebels defeated your forces in <<print $PCrebLoss>>. + Your arcology was involved in <<print commaNum($rebellionsCount)>> rebellions. You won <<print commaNum($PCrebWon)>> of them, while the rebels defeated your forces in <<print commaNum($PCrebLoss)>>. <</if>> -During all battles you lost a total of <<print $militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties>> men, while scoring a total of <<print $totalKills>> kills. +During all battles you lost a total of <<print commaNum($militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties)>> men, while scoring a total of <<print commaNum($totalKills)>> kills. <</if>> <br><br> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 7f27220382002924b09d311214b55f8e13363a1a..b45e694ef2c0681a0c812d4f5498cb09ca09eae1 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -128,7 +128,7 @@ <<else>> <br>Upkeep | <</if>><<print cashFormat($costs)>> -<br>@@.pink;Total Sex Slaves@@ | _SL +<br>@@.pink;Total Sex Slaves@@ | <<print commaNum(_SL)>> <br>@@.pink;Penthouse Beds@@ | <<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>> <br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>> @@ -194,7 +194,7 @@ <<else>> @@color:rgb(0,255,0);unknown@@ <</if>> -($rep) +(<<print commaNum($rep)>>) </span> <<if (_Pass == "Main")>> <<if ($cheatMode) && ($cheatModeM)>> @@ -300,7 +300,7 @@ <<else>> @@color:rgb(211,0,204);harmless@@ <</if>> -(<<print $authority>>) +(<<print commaNum($authority)>>) </span> <<if (_Pass == "Main")>> <<if ($cheatMode) && ($cheatModeM)>> diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw index 6ee3f988fc7dbab211460edd1536103431913a48..0d56ef8d48a0c1151e4d70ffedd3848159947b9a 100644 --- a/src/utility/assignWidgets.tw +++ b/src/utility/assignWidgets.tw @@ -57,6 +57,12 @@ <<set $args[0].livingRules = "normal">> <<case "work as a servant" "servants' quarters" "servantsquarters">> <<set $args[0].assignment = "work as a servant", $args[0].assignmentVisible = 0, $servantsQuartersSlaves++, $ServQiIDs.push(_wID)>> + <<switch $servantsQuartersDecoration>> + <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Supremacist" "Subjugationist" "Degradationist" "Arabian Revivalist" "Egyptian Revivalist">> + <<set $args[0].livingRules = "spare">> + <<default>> + <<set $args[0].livingRules = "normal">> + <</switch>> <<case "rest in the spa" "spa">> <<set $args[0].assignment = "rest in the spa", $args[0].assignmentVisible = 0, $spaSlaves++, $SpaiIDs.push(_wID)>> <<switch $spaDecoration>> @@ -67,8 +73,9 @@ <<default>> <<set $args[0].livingRules = "luxurious">> <</switch>> - <<case "be the attendant" "be your concubine" "be the dj" "be the madam" "be the milkmaid" "be the nurse" "be the schoolteacher" "be the stewardess" "be the wardeness">> + <<case "be the Attendant" "be your Concubine" "be the DJ" "be the Madam" "be the Milkmaid" "be the Nurse" "be the Schoolteacher" "be the Stewardess" "be the Wardeness">> <<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0>> /* non-visible leadership roles */ + <<set $args[0].livingRules = "luxurious">> <<case "be your agent" "live with your agent">> <<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0, $args[0].useRulesAssistant = 0>> /* non-visible roles exempt from Rules Assistant */ <<case "choose her own job">>