From 98449c377388117e75a630d78806579f75a04210 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Mon, 3 Jun 2019 11:11:52 -0500 Subject: [PATCH] Unident --- src/cheats/mod_editSlaveCheatNew.tw | 174 +++++++++++++------------- src/pregmod/analyzePlayerPregnancy.tw | 2 +- src/pregmod/analyzePregnancy.tw | 2 +- src/pregmod/csec.tw | 2 +- src/uncategorized/saRecruitGirls.tw | 2 +- src/uncategorized/slaveSold.tw | 4 +- src/uncategorized/slaveStats.tw | 2 +- src/uncategorized/storyCaption.tw | 2 +- src/uncategorized/walkPastList.tw | 4 +- 9 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index 24ba16abc64..69d88b038fe 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -3276,14 +3276,14 @@ ''Macromastia: '' <<switch $tempSlave.geneticQuirks.macromastia >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.macromastia" 0>> None <<radiobutton "$tempSlave.geneticQuirks.macromastia" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.macromastia" 2>> Active @@ -3292,14 +3292,14 @@ ''Gigantomastia: '' <<switch $tempSlave.geneticQuirks.gigantomastia >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.gigantomastia" 0>> None <<radiobutton "$tempSlave.geneticQuirks.gigantomastia" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.gigantomastia" 2>> Active @@ -3308,14 +3308,14 @@ ''Fertility: '' <<switch $tempSlave.geneticQuirks.fertility >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.fertility" 0>> None <<radiobutton "$tempSlave.geneticQuirks.fertility" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.fertility" 2>> Active @@ -3323,14 +3323,14 @@ ''hyperFertility: '' <<switch $tempSlave.geneticQuirks.hyperFertility >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.hyperFertility" 0>> None <<radiobutton "$tempSlave.geneticQuirks.hyperFertility" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.hyperFertility" 2>> Active @@ -3338,14 +3338,14 @@ ''Superfetation: '' <<switch $tempSlave.geneticQuirks.superfetation >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.superfetation" 0>> None <<radiobutton "$tempSlave.geneticQuirks.superfetation" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.superfetation" 2>> Active @@ -3353,14 +3353,14 @@ ''Gigantism: '' <<switch $tempSlave.geneticQuirks.gigantism >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.gigantism" 0>> None <<radiobutton "$tempSlave.geneticQuirks.gigantism" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.gigantism" 2>> Active @@ -3368,14 +3368,14 @@ ''Dwarfism: '' <<switch $tempSlave.geneticQuirks.dwarfism >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.dwarfism" 0>> None <<radiobutton "$tempSlave.geneticQuirks.dwarfism" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.dwarfism" 2>> Active @@ -3383,14 +3383,14 @@ ''Pretty Face: '' <<switch $tempSlave.geneticQuirks.pFace >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.pFace" 0>> None <<radiobutton "$tempSlave.geneticQuirks.pFace" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.pFace" 2>> Active @@ -3398,14 +3398,14 @@ ''Ugly Face: '' <<switch $tempSlave.geneticQuirks.uFace >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.uFace" 0>> None <<radiobutton "$tempSlave.geneticQuirks.uFace" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.uFace" 2>> Active @@ -3413,14 +3413,14 @@ ''Albinism: '' <<switch $tempSlave.geneticQuirks.albinism >> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.albinism" 0>> None <<radiobutton "$tempSlave.geneticQuirks.albinism" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.albinism" 2>> Active @@ -3433,8 +3433,8 @@ <<else>> @@.yellow;$tempSlave.geneticQuirks.heterochromia@@ | <</if>> - <<radiobutton "$tempSlave.geneticQuirks.heterochromia" 0>> None | - <<radiobutton "$tempSlave.geneticQuirks.heterochromia" 1>> Carrier | + <<radiobutton "$tempSlave.geneticQuirks.heterochromia" 0>> None | + <<radiobutton "$tempSlave.geneticQuirks.heterochromia" 1>> Carrier | <<link "Eye Colors">> <<if (ndef _ecol3R) || (_ecol3R == 0) >> <<replace "#ecol3">> @@ -3465,14 +3465,14 @@ ''rear Lipedema: '' <<switch $tempSlave.geneticQuirks.rearLipedema>> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.rearLipedema" 0>> None <<radiobutton "$tempSlave.geneticQuirks.rearLipedema" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.rearLipedema" 2>> Active @@ -3480,14 +3480,14 @@ ''Well Hung: '' <<switch $tempSlave.geneticQuirks.wellHung>> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.wellHung" 0>> None <<radiobutton "$tempSlave.geneticQuirks.wellHung" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.wellHung" 2>> Active @@ -3495,14 +3495,14 @@ ''Weight Gain: '' <<switch $tempSlave.geneticQuirks.wGain>> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.wGain" 0>> None <<radiobutton "$tempSlave.geneticQuirks.wGain" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.wGain" 2>> Active @@ -3510,14 +3510,14 @@ ''Weight Loss: '' <<switch $tempSlave.geneticQuirks.wLoss>> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.wLoss" 0>> None <<radiobutton "$tempSlave.geneticQuirks.wLoss" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.wLoss" 2>> Active @@ -3525,14 +3525,14 @@ ''Muscle Gain: '' <<switch $tempSlave.geneticQuirks.mGain>> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.mGain" 0>> None <<radiobutton "$tempSlave.geneticQuirks.mGain" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.mGain" 2>> Active @@ -3540,14 +3540,14 @@ ''Muscle Loss: '' <<switch $tempSlave.geneticQuirks.mLoss>> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.mLoss" 0>> None <<radiobutton "$tempSlave.geneticQuirks.mLoss" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.mLoss" 2>> Active @@ -3555,14 +3555,14 @@ ''Androgyny: '' <<switch $tempSlave.geneticQuirks.androgyny>> <<case 0 >> - @@.yellow;none@@ | + @@.yellow;none@@ | <<case 1 >> - @@.yellow;carrier@@ | + @@.yellow;carrier@@ | <<case 2 >> - @@.yellow;active@@ | + @@.yellow;active@@ | <<case 3 >> - @@.yellow;inactive@@ | - <</switch>> + @@.yellow;inactive@@ | + <</switch>> <<radiobutton "$tempSlave.geneticQuirks.androgyny" 0>> None <<radiobutton "$tempSlave.geneticQuirks.androgyny" 1>> Carrier <<radiobutton "$tempSlave.geneticQuirks.androgyny" 2>> Active diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw index de9be5d6759..90ed321a64c 100644 --- a/src/pregmod/analyzePlayerPregnancy.tw +++ b/src/pregmod/analyzePlayerPregnancy.tw @@ -272,7 +272,7 @@ <</if>> <<else>> <br> - Unindefined ova found, no detailed data available.<br> + Unidentified ova found, no detailed data available.<br> Age: too early for scan. <br> <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>> diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index 63c4b643234..eccc684d5af 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -283,7 +283,7 @@ <</if>> <<else>> <br> - Unindefined ova found, no detailed data available.<br> + Unidentified ova found, no detailed data available.<br> Age: too early for scan. <br> <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>> diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 5ba90651106..e7521eed452 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -221,7 +221,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a <</if>> <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination == "individually decided fates">> <<set _lostBabies = 1>> - $His child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $activeSlave.slaveName + sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $activeSlave.slaveName <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>> has few thoughts about the matter. <<elseif $activeSlave.devotion > 95>> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index 17ff7a7f4e8..bb1ea419a20 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -166,7 +166,7 @@ <</if>> <<if $arcologies[0].FSPhysicalIdealist != "unset">> <<if $arcologies[_j].FSPhysicalIdealist != "unset">> - $He advances Physical Idealism there by working out in + $He advances Physical Idealism there by working out in <<if $slaves[$i].muscles >= 50 && $arcologies[0].FSPhysicalIdealistLaw == 0>> public, having physically challenging sex in public, and improving $his already impressive musculature in a publicly documented journey of self-improvement. <<set $arcologies[_j].FSPhysicalIdealist++>> diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw index fcf386e64d4..221c82c5ec0 100644 --- a/src/uncategorized/slaveSold.tw +++ b/src/uncategorized/slaveSold.tw @@ -1111,7 +1111,7 @@ <<if _slaveImpact == 1>> Your less than intelligent slaves are @@.mediumorchid;deeply envious@@ of $activeSlave.slaveName, completely failing to comprehend what they saw were not special effects. <</if>> - + <<case "concert hall">> As $activeSlave.slaveName now spends all $his time backstage, $he's rarely seen again. Occasionally, however, a roadie will bring $him outside as he hauls the equipment, and $he jacks him off. <<for _ss = 0; _ss < $slaves.length; _ss++>> @@ -1124,7 +1124,7 @@ <<if (_slaveImpact == 1)>> Your slaves with hearing problems @@.mediumaquamarine;take some solace@@ in the idea of being bought because of their disability, not in spite of it. <</if>> - + <<case "etiquette coach">> $activeSlave.slaveName's new etiquette trainer sends you courtesy updates on $his progress, as $he learns proper poise and enunciation, the correct locations of silverware, and how to avoid making vulgar comments while performing lascivious acts. <<for _ss = 0; _ss < $slaves.length; _ss++>> diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw index cc94b31fa09..320d6cf5427 100644 --- a/src/uncategorized/slaveStats.tw +++ b/src/uncategorized/slaveStats.tw @@ -213,7 +213,7 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden <br>nails: $activeSlave.nails <br>brand: <<for _brandName, _brand range $activeSlave.brand>> - _brandName: _brand, + _brandName: _brand, <</for>> <br>earPiercing: $activeSlave.earPiercing <br>nosePiercing: $activeSlave.nosePiercing diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 64d70cf3077..deaae9c1ef8 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -690,7 +690,7 @@ <<if $nextButton !== "Continue" || ["attackReport", "rebellionReport", "Slave Assignments Report"].includes(_Pass)>> <br><br> - <<if !["Options", "Summary Options", "Description Options"].includes(_Pass)>> + <<if !["Options", "Summary Options", "Description Options"].includes(_Pass)>> <span id="optionsButton"> <<link "Game Options">> <<set $nextButton = "Back", $nextLink = _Pass>> diff --git a/src/uncategorized/walkPastList.tw b/src/uncategorized/walkPastList.tw index 47548572a52..e1bc182ea4c 100644 --- a/src/uncategorized/walkPastList.tw +++ b/src/uncategorized/walkPastList.tw @@ -16,8 +16,8 @@ Target: <span id="target">$target</span><br> <<link "Vagina">><<set $target = "FVagina">><<replace #target>>$target<</replace>><</link>><br> <<link "Kiss">><<set $target = "FKiss">><<replace #target>>$target<</replace>><</link>><br> <<link "Lips">><<set $target = "FLips">><<replace #target>>$target<</replace>><</link>><br> -<<link "Rival">><<set $target = "FRival">><<replace #target>>$target<</replace>><</link>> //(Will only work for "Summon them both" options)//<br> -<<link "Relation">><<set $target = "FRelation">><<replace #target>>$target<</replace>><</link>> //(Will only work for "Summon them both" options)//<br> +<<link "Rival">><<set $target = "FRival">><<replace #target>>$target<</replace>><</link>> //(Will only work for "Summon them both" options)//<br> +<<link "Relation">><<set $target = "FRelation">><<replace #target>>$target<</replace>><</link>> //(Will only work for "Summon them both" options)//<br> <h2>Walk Past List</h2> <<for _i = 0; _i < $slaves.length; _i++>> -- GitLab