From 88d623c7c64fd9a0590e38caa4dca6c24a081530 Mon Sep 17 00:00:00 2001
From: StuffedAnon <stuffedgame@gmail.com>
Date: Fri, 22 Mar 2019 13:30:47 +0900
Subject: [PATCH] Undo spaces to tabs in the middle of the code
---
sanityCheck | 8 +-
src/npc/startingGirls/startingGirls.tw | 124 ++++++++++++-------------
2 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/sanityCheck b/sanityCheck
index 50c71e27f7f..e7cb57edda8 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -92,10 +92,10 @@ $GREP '<<\s*\$' -- 'src/*' | myprint "VarSignAtMacroStart"
# check our custom option macro is either options,option,optionlt,optionlte,optiongt,optiongte,optiondefault
$GREP -e '<<option' --and --not -e "<<option\(\|s\|lt\|lte\|gt\|gte\|default\)[ >]" -- 'src/*' | myprint "OptionUnrecognized"
# check our custom option macro is: <<option variable "somestring"
-$GREP -e "<<option[lg]te\? " --and --not -e "<<option[lg]te\? *-\?[0-9]\+ *-\?[0-9]\+ *[\'\"].*[\'\"]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments"
-$GREP -e "<<optiondefault " --and --not -e "<<optiondefault *\(-\?[0-9]\+\|[\'\"].*[\'\"]\|false\|true\) *[\'\"].*[\'\"]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments"
-$GREP -e "<<option\([lg]t\?\|default\) *>" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments"
-$GREP -e "<<option " --and --not -e "<<option *\(-\?[0-9]\+\|[\'\"].*[\'\"]\|false\|true\) *[\`\'\"].*[\'\"\`]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments"
+$GREP -e "<<option[lg]te\? " --and --not -e "<<option[lg]te\?\s\+-\?[0-9]\+\s\+-\?[0-9]\+\s\+[\'\"].*[\'\"]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments1"
+$GREP -e "<<optiondefault " --and --not -e "<<optiondefault\s\+\(-\?[0-9]\+\|[\'\"].*[\'\"]\|false\|true\)\s\+[\'\"].*[\'\"]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments2"
+$GREP -e "<<option\([lg]t\?\|default\) *>" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments3"
+$GREP -e "<<option " --and --not -e "<<option\s\+\(-\?[0-9]\+\|[\'\"].*[\'\"]\|false\|true\)\s\+[\`\'\"].*[\'\"\`]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments4"
# check for missing ; before statement
$GREP 'if $ ' -- 'src/*' | myprint "missing ; before statement"
$GREP 'elseif $ ' -- 'src/*' | myprint "missing ; before statement"
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index eee471ca160..9b6d3a42b54 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -716,18 +716,18 @@ __You are customizing this slave:__
<br>
<<options $activeSlave.race>>
''Ethnicity:'' $activeSlave.race
- <<option "white" "White">>
- <<option "black" "Black">>
- <<option "latina" "Latina">>
- <<option "asian" "Asian">>
- <<option "middle eastern" "Middle Eastern">>
- <<option "amerindian" "Amerindian">>
+ <<option "white" "White">>
+ <<option "black" "Black">>
+ <<option "latina" "Latina">>
+ <<option "asian" "Asian">>
+ <<option "middle eastern" "Middle Eastern">>
+ <<option "amerindian" "Amerindian">>
<<option "southern european" "Southern European">>
- <<option "semitic" "Semitic">>
- <<option "malay" "Malay">>
- <<option "indo-aryan" "Indo-Aryan">>
+ <<option "semitic" "Semitic">>
+ <<option "malay" "Malay">>
+ <<option "indo-aryan" "Indo-Aryan">>
<<option "pacific islander" "Pacific Islander">>
- <<option "mixed race" "Mixed Race">>
+ <<option "mixed race" "Mixed Race">>
<<option>>
<<textbox2 "$activeSlave.race" $activeSlave.race "Starting Girls">>
<</options>>
@@ -736,28 +736,28 @@ __You are customizing this slave:__
<br>
<<options $activeSlave.skin>>
''Skin color:'' $activeSlave.skin
- <<option "pure white" "Pure White">>
+ <<option "pure white" "Pure White">>
<<option "extremely pale" "Extremely Pale">>
- <<option "pale" "Pale">>
+ <<option "pale" "Pale">>
<<option "extremely fair" "Extremely Fair">>
- <<option "very fair" "Very Fair">>
- <<option "fair" "Fair">>
- <<option "white" "White">>
- <<option "light" "Light">>
- <<option "lightened" "Lightened">>
- <<option "light olive" "Light Olive">>
- <<option "olive" "Olive">>
- <<option "natural" "Natural">>
- <<option "tanned" "Tanned">>
- <<option "bronzed" "Bronzed">>
- <<option "dark olive" "Dark Olive">>
- <<option "dark" "Dark">>
- <<option "light brown" "Light Brown">>
- <<option "brown" "Brown">>
- <<option "dark brown" "Dark Brown">>
- <<option "black" "Black">>
- <<option "ebony" "Ebony">>
- <<option "pure black" "Pure Black">>
+ <<option "very fair" "Very Fair">>
+ <<option "fair" "Fair">>
+ <<option "white" "White">>
+ <<option "light" "Light">>
+ <<option "lightened" "Lightened">>
+ <<option "light olive" "Light Olive">>
+ <<option "olive" "Olive">>
+ <<option "natural" "Natural">>
+ <<option "tanned" "Tanned">>
+ <<option "bronzed" "Bronzed">>
+ <<option "dark olive" "Dark Olive">>
+ <<option "dark" "Dark">>
+ <<option "light brown" "Light Brown">>
+ <<option "brown" "Brown">>
+ <<option "dark brown" "Dark Brown">>
+ <<option "black" "Black">>
+ <<option "ebony" "Ebony">>
+ <<option "pure black" "Pure Black">>
<<option>>
<<textbox2 "$activeSlave.skin" $activeSlave.skin "Starting Girls">>
<</options>>
@@ -930,11 +930,11 @@ __You are customizing this slave:__
<br>
<<options $activeSlave.nipples>>
''Nipples:'' $activeSlave.nipples
- <<option "tiny" "Tiny">>
- <<option "cute" "Cute">>
- <<option "puffy" "Puffy">>
+ <<option "tiny" "Tiny">>
+ <<option "cute" "Cute">>
+ <<option "puffy" "Puffy">>
<<option "inverted" "Inverted">>
- <<option "huge" "Huge">>
+ <<option "huge" "Huge">>
<</options>>
<<options $activeSlave.areolae>>
@@ -1287,16 +1287,16 @@ __You are customizing this slave:__
<<else>>
@@.lightcoral;$activeSlave.fetish.@@
<</if>>
- <<option "" "Unknown" "$activeSlave.fetish=either('boobs', 'buttslut', 'cumslut', 'dom', 'humiliation', 'masochist', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'pregnancy', 'sadist', 'submissive'),$activeSlave.fetishKnown=0">>
- <<option "none" "None">>
+ <<option "" "Unknown" "$activeSlave.fetish=either('boobs', 'buttslut', 'cumslut', 'dom', 'humiliation', 'masochist', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'pregnancy', 'sadist', 'submissive'),$activeSlave.fetishKnown=0">>
+ <<option "none" "None">>
<<option "submissive" "Sub">>
- <<option "dom" "Dom">>
- <<option "cumslut" "Cumslut">>
+ <<option "dom" "Dom">>
+ <<option "cumslut" "Cumslut">>
<<option "humiliation" "Humiliation">>
- <<option "buttslut" "Buttslut">>
- <<option "boobs" "Breasts">>
+ <<option "buttslut" "Buttslut">>
+ <<option "boobs" "Breasts">>
<<option "pregnancy" "Pregnancy">>
- <<option "sadist" "Sadism">>
+ <<option "sadist" "Sadism">>
<<option "masochist" "Masochism">>
<</options>>
<<else>>
@@ -1307,16 +1307,16 @@ __You are customizing this slave:__
<<else>>
@@.lightcoral;$activeSlave.fetish.@@
<</if>>
- <<option "" "Unknown" "$activeSlave.fetish=either('boobs', 'buttslut', 'cumslut', 'dom', 'humiliation', 'masochist', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'pregnancy', 'sadist', 'submissive'),$activeSlave.fetishKnown=0">>
- <<option "none" "None">>
+ <<option "" "Unknown" "$activeSlave.fetish=either('boobs', 'buttslut', 'cumslut', 'dom', 'humiliation', 'masochist', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'none', 'pregnancy', 'sadist', 'submissive'),$activeSlave.fetishKnown=0">>
+ <<option "none" "None">>
<<option "submissive" "Sub">>
- <<option "dom" "Dom">>
- <<option "cumslut" "Cumslut">>
+ <<option "dom" "Dom">>
+ <<option "cumslut" "Cumslut">>
<<option "humiliation" "Humiliation">>
- <<option "buttslut" "Buttslut">>
- <<option "boobs" "Breasts">>
+ <<option "buttslut" "Buttslut">>
+ <<option "boobs" "Breasts">>
<<option "pregnancy" "Pregnancy">>
- <<option "sadist" "Sadism">>
+ <<option "sadist" "Sadism">>
<<option "masochist" "Masochism">>
<<option "mindbroken" "Mindbroken" "$activeSlave.sexualFlaw = 'none', $activeSlave.behavioralFlaw = 'none', $activeSlave.sexualQuirk = 'none', $activeSlave.sexualFlaw = 'none'">>
<</options>>
@@ -1435,15 +1435,15 @@ __You are customizing this slave:__
<<else>>
@@.red;$activeSlave.behavioralFlaw.@@
<</if>>
- <<option "none" "None">>
- <<option "arrogant" "Arrogant">>
- <<option "bitchy" "Bitchy">>
- <<option "odd" "Odd">>
+ <<option "none" "None">>
+ <<option "arrogant" "Arrogant">>
+ <<option "bitchy" "Bitchy">>
+ <<option "odd" "Odd">>
<<option "hates men" "Men">>
<<option "hates women" "Women">>
- <<option "anorexic" "Anorexic">>
+ <<option "anorexic" "Anorexic">>
<<option "gluttonous" "Gluttonous">>
- <<option "devout" "Devout">>
+ <<option "devout" "Devout">>
<<option "liberated" "Liberated">>
<</options>>
<br>
@@ -1454,16 +1454,16 @@ __You are customizing this slave:__
<<else>>
@@.green;$activeSlave.behavioralQuirk.@@
<</if>>
- <<option "none" "None" >>
- <<option "confident" "Confident" >>
- <<option "cutting" "Cutting" >>
- <<option "funny" "Funny" >>
+ <<option "none" "None" >>
+ <<option "confident" "Confident" >>
+ <<option "cutting" "Cutting" >>
+ <<option "funny" "Funny" >>
<<option "adores men" "Men" >>
<<option "adores women" "Women" >>
- <<option "insecure" "Insecure" >>
- <<option "fitness" "Fitness" >>
- <<option "sinful" "Sinful" >>
- <<option "advocate" "Advocate" >>
+ <<option "insecure" "Insecure" >>
+ <<option "fitness" "Fitness" >>
+ <<option "sinful" "Sinful" >>
+ <<option "advocate" "Advocate" >>
<</options>>
<br>
<<options $activeSlave.sexualFlaw>>
--
GitLab