Skip to content
Snippets Groups Projects
Commit 88d623c7 authored by Stuffed's avatar Stuffed
Browse files

Undo spaces to tabs in the middle of the code

parent ad729d5d
No related branches found
No related tags found
1 merge request!4010Undo spaces to tabs in the middle of the code
Hide whitespace changes
Inline Side-by-side
sanityCheck
+ 4
− 4
View file @ 88d623c7
...@@ -92,10 +92,10 @@ $GREP '<<\s*\$' -- 'src/*' | myprint "VarSignAtMacroStart" ...@@ -92,10 +92,10 @@ $GREP '<<\s*\$' -- 'src/*' | myprint "VarSignAtMacroStart"
# check our custom option macro is either options,option,optionlt,optionlte,optiongt,optiongte,optiondefault # 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" $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" # 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 "<<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 *\(-\?[0-9]\+\|[\'\"].*[\'\"]\|false\|true\) *[\'\"].*[\'\"]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments" $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 "OptionBadArguments" $GREP -e "<<option\([lg]t\?\|default\) *>" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments3"
$GREP -e "<<option " --and --not -e "<<option *\(-\?[0-9]\+\|[\'\"].*[\'\"]\|false\|true\) *[\`\'\"].*[\'\"\`]" -- 'src/*' | grep -v src/js | myprint "OptionBadArguments" $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 # check for missing ; before statement
$GREP 'if $ ' -- 'src/*' | myprint "missing ; before statement" $GREP 'if $ ' -- 'src/*' | myprint "missing ; before statement"
$GREP 'elseif $ ' -- 'src/*' | myprint "missing ; before statement" $GREP 'elseif $ ' -- 'src/*' | myprint "missing ; before statement"
......
src/npc/startingGirls/startingGirls.tw
+ 62
− 62
View file @ 88d623c7
...@@ -716,18 +716,18 @@ __You are customizing this slave:__ ...@@ -716,18 +716,18 @@ __You are customizing this slave:__
<br> <br>
<<options $activeSlave.race>> <<options $activeSlave.race>>
''Ethnicity:'' $activeSlave.race ''Ethnicity:'' $activeSlave.race
<<option "white" "White">> <<option "white" "White">>
<<option "black" "Black">> <<option "black" "Black">>
<<option "latina" "Latina">> <<option "latina" "Latina">>
<<option "asian" "Asian">> <<option "asian" "Asian">>
<<option "middle eastern" "Middle Eastern">> <<option "middle eastern" "Middle Eastern">>
<<option "amerindian" "Amerindian">> <<option "amerindian" "Amerindian">>
<<option "southern european" "Southern European">> <<option "southern european" "Southern European">>
<<option "semitic" "Semitic">> <<option "semitic" "Semitic">>
<<option "malay" "Malay">> <<option "malay" "Malay">>
<<option "indo-aryan" "Indo-Aryan">> <<option "indo-aryan" "Indo-Aryan">>
<<option "pacific islander" "Pacific Islander">> <<option "pacific islander" "Pacific Islander">>
<<option "mixed race" "Mixed Race">> <<option "mixed race" "Mixed Race">>
<<option>> <<option>>
<<textbox2 "$activeSlave.race" $activeSlave.race "Starting Girls">> <<textbox2 "$activeSlave.race" $activeSlave.race "Starting Girls">>
<</options>> <</options>>
...@@ -736,28 +736,28 @@ __You are customizing this slave:__ ...@@ -736,28 +736,28 @@ __You are customizing this slave:__
<br> <br>
<<options $activeSlave.skin>> <<options $activeSlave.skin>>
''Skin color:'' $activeSlave.skin ''Skin color:'' $activeSlave.skin
<<option "pure white" "Pure White">> <<option "pure white" "Pure White">>
<<option "extremely pale" "Extremely Pale">> <<option "extremely pale" "Extremely Pale">>
<<option "pale" "Pale">> <<option "pale" "Pale">>
<<option "extremely fair" "Extremely Fair">> <<option "extremely fair" "Extremely Fair">>
<<option "very fair" "Very Fair">> <<option "very fair" "Very Fair">>
<<option "fair" "Fair">> <<option "fair" "Fair">>
<<option "white" "White">> <<option "white" "White">>
<<option "light" "Light">> <<option "light" "Light">>
<<option "lightened" "Lightened">> <<option "lightened" "Lightened">>
<<option "light olive" "Light Olive">> <<option "light olive" "Light Olive">>
<<option "olive" "Olive">> <<option "olive" "Olive">>
<<option "natural" "Natural">> <<option "natural" "Natural">>
<<option "tanned" "Tanned">> <<option "tanned" "Tanned">>
<<option "bronzed" "Bronzed">> <<option "bronzed" "Bronzed">>
<<option "dark olive" "Dark Olive">> <<option "dark olive" "Dark Olive">>
<<option "dark" "Dark">> <<option "dark" "Dark">>
<<option "light brown" "Light Brown">> <<option "light brown" "Light Brown">>
<<option "brown" "Brown">> <<option "brown" "Brown">>
<<option "dark brown" "Dark Brown">> <<option "dark brown" "Dark Brown">>
<<option "black" "Black">> <<option "black" "Black">>
<<option "ebony" "Ebony">> <<option "ebony" "Ebony">>
<<option "pure black" "Pure Black">> <<option "pure black" "Pure Black">>
<<option>> <<option>>
<<textbox2 "$activeSlave.skin" $activeSlave.skin "Starting Girls">> <<textbox2 "$activeSlave.skin" $activeSlave.skin "Starting Girls">>
<</options>> <</options>>
...@@ -930,11 +930,11 @@ __You are customizing this slave:__ ...@@ -930,11 +930,11 @@ __You are customizing this slave:__
<br> <br>
<<options $activeSlave.nipples>> <<options $activeSlave.nipples>>
''Nipples:'' $activeSlave.nipples ''Nipples:'' $activeSlave.nipples
<<option "tiny" "Tiny">> <<option "tiny" "Tiny">>
<<option "cute" "Cute">> <<option "cute" "Cute">>
<<option "puffy" "Puffy">> <<option "puffy" "Puffy">>
<<option "inverted" "Inverted">> <<option "inverted" "Inverted">>
<<option "huge" "Huge">> <<option "huge" "Huge">>
<</options>> <</options>>
<<options $activeSlave.areolae>> <<options $activeSlave.areolae>>
...@@ -1287,16 +1287,16 @@ __You are customizing this slave:__ ...@@ -1287,16 +1287,16 @@ __You are customizing this slave:__
<<else>> <<else>>
@@.lightcoral;$activeSlave.fetish.@@ @@.lightcoral;$activeSlave.fetish.@@
<</if>> <</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 "" "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 "none" "None">>
<<option "submissive" "Sub">> <<option "submissive" "Sub">>
<<option "dom" "Dom">> <<option "dom" "Dom">>
<<option "cumslut" "Cumslut">> <<option "cumslut" "Cumslut">>
<<option "humiliation" "Humiliation">> <<option "humiliation" "Humiliation">>
<<option "buttslut" "Buttslut">> <<option "buttslut" "Buttslut">>
<<option "boobs" "Breasts">> <<option "boobs" "Breasts">>
<<option "pregnancy" "Pregnancy">> <<option "pregnancy" "Pregnancy">>
<<option "sadist" "Sadism">> <<option "sadist" "Sadism">>
<<option "masochist" "Masochism">> <<option "masochist" "Masochism">>
<</options>> <</options>>
<<else>> <<else>>
...@@ -1307,16 +1307,16 @@ __You are customizing this slave:__ ...@@ -1307,16 +1307,16 @@ __You are customizing this slave:__
<<else>> <<else>>
@@.lightcoral;$activeSlave.fetish.@@ @@.lightcoral;$activeSlave.fetish.@@
<</if>> <</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 "" "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 "none" "None">>
<<option "submissive" "Sub">> <<option "submissive" "Sub">>
<<option "dom" "Dom">> <<option "dom" "Dom">>
<<option "cumslut" "Cumslut">> <<option "cumslut" "Cumslut">>
<<option "humiliation" "Humiliation">> <<option "humiliation" "Humiliation">>
<<option "buttslut" "Buttslut">> <<option "buttslut" "Buttslut">>
<<option "boobs" "Breasts">> <<option "boobs" "Breasts">>
<<option "pregnancy" "Pregnancy">> <<option "pregnancy" "Pregnancy">>
<<option "sadist" "Sadism">> <<option "sadist" "Sadism">>
<<option "masochist" "Masochism">> <<option "masochist" "Masochism">>
<<option "mindbroken" "Mindbroken" "$activeSlave.sexualFlaw = 'none', $activeSlave.behavioralFlaw = 'none', $activeSlave.sexualQuirk = 'none', $activeSlave.sexualFlaw = 'none'">> <<option "mindbroken" "Mindbroken" "$activeSlave.sexualFlaw = 'none', $activeSlave.behavioralFlaw = 'none', $activeSlave.sexualQuirk = 'none', $activeSlave.sexualFlaw = 'none'">>
<</options>> <</options>>
...@@ -1435,15 +1435,15 @@ __You are customizing this slave:__ ...@@ -1435,15 +1435,15 @@ __You are customizing this slave:__
<<else>> <<else>>
@@.red;$activeSlave.behavioralFlaw.@@ @@.red;$activeSlave.behavioralFlaw.@@
<</if>> <</if>>
<<option "none" "None">> <<option "none" "None">>
<<option "arrogant" "Arrogant">> <<option "arrogant" "Arrogant">>
<<option "bitchy" "Bitchy">> <<option "bitchy" "Bitchy">>
<<option "odd" "Odd">> <<option "odd" "Odd">>
<<option "hates men" "Men">> <<option "hates men" "Men">>
<<option "hates women" "Women">> <<option "hates women" "Women">>
<<option "anorexic" "Anorexic">> <<option "anorexic" "Anorexic">>
<<option "gluttonous" "Gluttonous">> <<option "gluttonous" "Gluttonous">>
<<option "devout" "Devout">> <<option "devout" "Devout">>
<<option "liberated" "Liberated">> <<option "liberated" "Liberated">>
<</options>> <</options>>
<br> <br>
...@@ -1454,16 +1454,16 @@ __You are customizing this slave:__ ...@@ -1454,16 +1454,16 @@ __You are customizing this slave:__
<<else>> <<else>>
@@.green;$activeSlave.behavioralQuirk.@@ @@.green;$activeSlave.behavioralQuirk.@@
<</if>> <</if>>
<<option "none" "None" >> <<option "none" "None" >>
<<option "confident" "Confident" >> <<option "confident" "Confident" >>
<<option "cutting" "Cutting" >> <<option "cutting" "Cutting" >>
<<option "funny" "Funny" >> <<option "funny" "Funny" >>
<<option "adores men" "Men" >> <<option "adores men" "Men" >>
<<option "adores women" "Women" >> <<option "adores women" "Women" >>
<<option "insecure" "Insecure" >> <<option "insecure" "Insecure" >>
<<option "fitness" "Fitness" >> <<option "fitness" "Fitness" >>
<<option "sinful" "Sinful" >> <<option "sinful" "Sinful" >>
<<option "advocate" "Advocate" >> <<option "advocate" "Advocate" >>
<</options>> <</options>>
<br> <br>
<<options $activeSlave.sexualFlaw>> <<options $activeSlave.sexualFlaw>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment