From b43998748a7876f2d0a50c3ac8309f1daafd8373 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 14 Mar 2019 20:23:48 -0500
Subject: [PATCH] StuffNThings
---
src/events/intro/introSummary.tw | 130 ++++++++++++-------------
src/gui/css/optionsMacro.tw | 88 ++++++++---------
src/js/optionsMacro.js | 6 +-
src/uncategorized/pSchoolSuggestion.tw | 2 +-
4 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index cd091e42dc4..57d99769486 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -43,13 +43,13 @@ __''World Settings''__
<<options $econRate>>
Economic forecast:
<<option 0 "Vanilla" "$difficultySwitch = 0">>
- ''no change.'' //Vanilla -- Some economic content requires this to be set to harder than vanilla//
+ ''no change.'' //Vanilla -- Some economic content requires this to be set to harder than vanilla//
<<option 1 "Easy" "$difficultySwitch = 1">>
- ''slow decline''. //Easy//
+ ''slow decline''. //Easy//
<<option 2 "Default" "$difficultySwitch = 1">>
- ''noticeable deterioration'' //Default Difficulty//
+ ''noticeable deterioration'' //Default Difficulty//
<<option 4 "Hard" "$difficultySwitch = 1">>
- ''going to hell in a handbasket''. //Hard//
+ ''going to hell in a handbasket''. //Hard//
<</options>>
/* Not functional yet
@@ -98,10 +98,10 @@ $customWA = 0]]
<<if $internationalTrade == 1>>
<<options $internationalVariety>>
International slave variety is
- <<option 0 "Semi-realistic national variety">>
- ''semi-realistic,'' so more populous nations will be more common.
- <<option 1 "Normalized national variety">>
- ''normalized,'' so small nations will appear nearly as much as large ones.
+ <<option 0 "Semi-realistic national variety">>
+ ''semi-realistic,'' so more populous nations will be more common.
+ <<option 1 "Normalized national variety">>
+ ''normalized,'' so small nations will appear nearly as much as large ones.
<</options>>
<</if>>
<br>
@@ -205,8 +205,8 @@ __''General slave settings''__
<<option 0 "Disable extended families">>
Slaves ''cannot'' have extended families, just a single relative. //Vanilla Mode.//
<<option 1 "Enable extended families">>
- Slaves ''can'' have extended families instead of just a single relative.
- //May cause lag.//
+ Slaves ''can'' have extended families instead of just a single relative.
+ //May cause lag.//
<<comment>>
Extended family mode must be on for the incubation facility to be enabled.
<</options>>
@@ -271,7 +271,7 @@ __''Slave age settings''__
<<option 1 "Enable aging">>
Slaves will ''age naturally.''
<<option 2 "Semi aging">>
- Slaves ''will'' celebrate birthdays, but ''not age.''
+ Slaves ''will'' celebrate birthdays, but ''not age.''
<<comment>>
This option cannot be changed during the game
<</options>>
@@ -511,26 +511,26 @@ __''The Free City''__
The Free City is located in ''$continent''.
<<option "North America" "North America" "$language = 'English'">>
<<option "South America" "South America" "$language = 'Spanish'">>
- <<option "Brazil" "Brazil" "$language = 'Portuguese'">>
- <<option "Europe" "Europe" "$language = 'English'">>
+ <<option "Brazil" "Brazil" "$language = 'Portuguese'">>
+ <<option "Europe" "Europe" "$language = 'English'">>
<<option "the Middle East" "the Middle East" "$language = 'Arabic'">>
- <<option "Africa" "Africa" "$language = 'Arabic'">>
- <<option "Asia" "Asia" "$language = 'Chinese'">>
- <<option "Australia" "Australia" "$language = 'English'">>
- <<option "Japan" "Japan" "$language = 'Japanese', $PC.race = 'asian', $PC.nationality = 'Japanese', $PC.hColor = 'black', $PC.eyeColor = 'brown'">>
+ <<option "Africa" "Africa" "$language = 'Arabic'">>
+ <<option "Asia" "Asia" "$language = 'Chinese'">>
+ <<option "Australia" "Australia" "$language = 'English'">>
+ <<option "Japan" "Japan" "$language = 'Japanese', $PC.race = 'asian', $PC.nationality = 'Japanese', $PC.hColor = 'black', $PC.eyeColor = 'brown'">>
<</options>>
<<else>>
<<options $continent>>
The Free City is located in ''$continent''.
<<option "North America" "North America" "$language = 'English'">>
<<option "South America" "South America" "$language = 'Spanish'">>
- <<option "Brazil" "Brazil" "$language = 'Portuguese'">>
- <<option "Europe" "Europe" "$language = 'English'">>
+ <<option "Brazil" "Brazil" "$language = 'Portuguese'">>
+ <<option "Europe" "Europe" "$language = 'English'">>
<<option "the Middle East" "the Middle East" "$language = 'Arabic'">>
- <<option "Africa" "Africa" "$language = 'Arabic'">>
- <<option "Asia" "Asia" "$language = 'Chinese'">>
- <<option "Australia" "Australia" "$language = 'English'">>
- <<option "Japan" "Japan" "$language = 'Japanese'">>
+ <<option "Africa" "Africa" "$language = 'Arabic'">>
+ <<option "Asia" "Asia" "$language = 'Chinese'">>
+ <<option "Australia" "Australia" "$language = 'English'">>
+ <<option "Japan" "Japan" "$language = 'Japanese'">>
<</options>>
<</if>>
<</if>>
@@ -643,7 +643,7 @@ __''Player Character''__
<<option 0 "Disable aging">>
and you will ''not age,'' nor experience birthdays.
<<comment>>
- This option cannot be changed during the game
+ This option cannot be changed during the game
<</options>>
<br>
<<if def $PC.customTitle>>
@@ -681,46 +681,46 @@ __''Player Character''__
<br>
<<options $PC.race>>
Your race is:
- <<option "white" "White">>
- <<option "asian" "Asian">>
- <<option "latina" "Latina">>
- <<option "middle eastern" "Middle Eastern">>
- <<option "black" "Black">>
- <<option "semitic" "Semitic">>
+ <<option "white" "White">>
+ <<option "asian" "Asian">>
+ <<option "latina" "Latina">>
+ <<option "middle eastern" "Middle Eastern">>
+ <<option "black" "Black">>
+ <<option "semitic" "Semitic">>
<<option "southern european" "Southern European">>
- <<option "indo-aryan" "Indo-Aryan">>
- <<option "amerindian" "Amerindian">>
+ <<option "indo-aryan" "Indo-Aryan">>
+ <<option "amerindian" "Amerindian">>
<<option "pacific islander" "Pacific Islander">>
- <<option "malay" "Malay">>
- <<option "mixed race" "Mixed Race">>
+ <<option "malay" "Malay">>
+ <<option "mixed race" "Mixed Race">>
<<option>>
<<textbox "$PC.race" $PC.race "Intro Summary">>
<</options>>
<br>
<<options $PC.skin>>
Your skin tone is:
- <<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>>
<<textbox "$PC.skin" $PC.skin "Intro Summary">>
<</options>>
@@ -742,7 +742,7 @@ __''Player Character''__
<</options>>
<br>
<<options>>
- Your hair is:
+ Your hair is:
<<option>>
<<textbox "$PC.hColor" $PC.hColor "Intro Summary">>
<</options>>
@@ -823,27 +823,27 @@ __''Player Character''__
<<else>>
<<options $PC.career>>
Before you came to the Free Cities, you were ''_PCCreationCareer'':
- <<option "wealth" "member of the idle wealthy">>
+ <<option "wealth" "member of the idle wealthy">>
<<option "capitalist" "business leader">>
<<option "mercenary" "mercenary">>
- <<option "slaver" "slaver">>
+ <<option "slaver" "slaver">>
<<option "engineer" "engineer">>
<<option "medicine" "doctor">>
<<option "BlackHat" "hacker">>
<<option "celebrity" "minor celebrity">>
- <<option "escort" "escort">>
- <<option "servant" "servant">>
- <<option "gang" "gang leader">>
+ <<option "escort" "escort">>
+ <<option "servant" "servant">>
+ <<option "gang" "gang leader">>
<</options>>
<</if>>
<br>
<<options $PC.rumor>>
It is rumored that you acquired your arcology through ''$PC.rumor'':
- <<option "wealth" "wealth">>
- <<option "diligence" "hard work">>
- <<option "force" "force">>
+ <<option "wealth" "wealth">>
+ <<option "diligence" "hard work">>
+ <<option "force" "force">>
<<option "social engineering" "social engineering">>
- <<option "luck" "blind luck">>
+ <<option "luck" "blind luck">>
<</options>>
<br>
@@ -1003,7 +1003,7 @@ __''Player Character''__
<<option 0 "Disable aging">>
and you will ''not age,'' nor experience birthdays.
<<comment>>
- This option cannot be changed during the game
+ This option cannot be changed during the game
<</options>>
<br>
diff --git a/src/gui/css/optionsMacro.tw b/src/gui/css/optionsMacro.tw
index 95e2e766efe..89631c9b9f6 100644
--- a/src/gui/css/optionsMacro.tw
+++ b/src/gui/css/optionsMacro.tw
@@ -1,93 +1,93 @@
:: Options Macro [stylesheet]
.optionMacro {
- margin-top: 8px;
- display: inline-block;
+ margin-top: 8px;
+ display: inline-block;
}
.optionDescription {
- display: inline-block;
- width: 500px;
- margin-right: 10px;
- line-height: 1.2;
+ display: inline-block;
+ width: 500px;
+ margin-right: 10px;
+ line-height: 1.2;
}
@media only screen and (max-width: 1200px) {
- .optionDescription {
- display: block;
- width: unset;
- }
+ .optionDescription {
+ display: block;
+ width: unset;
+ }
- .optionMacro {
- margin-top: 30px;
- }
+ .optionMacro {
+ margin-top: 30px;
+ }
}
.optionMacroOption {
- border: #555 solid 0.5px;
- border-top-width: 0;
- vertical-align: top;
- background: linear-gradient(transparent,#222);
- -moz-user-select: none;
- padding: 4px;
+ border: #555 solid 0.5px;
+ border-top-width: 0;
+ vertical-align: top;
+ background: linear-gradient(transparent,#222);
+ -moz-user-select: none;
+ padding: 4px;
}
.optionComment {
- vertical-align: top;
- color: gray;
+ vertical-align: top;
+ color: gray;
}
/* But don't add the | after the last one */
.optionMacroOption:last-child {
- border-top-right-radius: 6px;
- border-bottom-right-radius: 6px;
- border-right-width: 0;
+ border-top-right-radius: 6px;
+ border-bottom-right-radius: 6px;
+ border-right-width: 0;
}
.optionMacroOption:first-child {
- border-top-left-radius: 6px;
- border-bottom-left-radius: 6px;
+ border-top-left-radius: 6px;
+ border-bottom-left-radius: 6px;
}
.optionMacroOption a {
- padding: 4px 0;
+ padding: 4px 0;
}
.optionMacroOption:hover {
- background: linear-gradient(#2F2F2F,#111);
+ background: linear-gradient(#2F2F2F,#111);
}
.optionMacroSelected {
- background: linear-gradient(#2F2F2F,#111);
- padding: 4px;
- cursor: pointer;
+ background: linear-gradient(#2F2F2F,#111);
+ padding: 4px;
+ cursor: pointer;
}
.optionValue input {
- padding: 3px;
- background: linear-gradient(transparent,#222);
- border: #555 solid 0.5px;
- border-top-width: 0;
- min-width: reset;
- width: 140px;
+ padding: 3px;
+ background: linear-gradient(transparent,#222);
+ border: #555 solid 0.5px;
+ border-top-width: 0;
+ min-width: reset;
+ width: 140px;
}
.optionValue input:last-child {
- border-top-right-radius: 6px;
- border-bottom-right-radius: 6px;
- border-right-width: 0;
+ border-top-right-radius: 6px;
+ border-bottom-right-radius: 6px;
+ border-right-width: 0;
}
.optionValue input:first-child {
- border-top-left-radius: 6px;
- border-bottom-left-radius: 6px;
+ border-top-left-radius: 6px;
+ border-bottom-left-radius: 6px;
}
.optionMacroSelected.optionMacroEnable {
- /*background-image: linear-gradient(rgba(255, 100, 0, 1), rgba(0, 255, 0, 1));*/
+ /*background-image: linear-gradient(rgba(255, 100, 0, 1), rgba(0, 255, 0, 1));*/
}
.optionMacroSelected.optionMacroDisable {
- /*background-image: linear-gradient(rgba(255, 100, 0, 1), rgba(255, 0, 0, 1));*/
+ /*background-image: linear-gradient(rgba(255, 100, 0, 1), rgba(255, 0, 0, 1));*/
}
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index c11b4694396..2fbf84995e3 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -1,16 +1,16 @@
/* Use like:
<<options $varname "New Passage (defaults to current passage)">>
A title
- <<option "value_to_set_varname_to" "English text to show user" "additional variables to set when clicked" "Extra english text to show, but not as a link">>
+ <<option "value_to_set_varname_to" "English text to show user" "additional variables to set when clicked" "Extra english text to show, but not as a link">>
Text to show if $varname matches this option
<<option ....>>
<<comment>>
- Some comment to add at the end
+ Some comment to add at the end
<</option>>
*/
Macro.add('options', {
skipArgs : false,
- tags : ['option', 'comment'],
+ tags : ['option', 'comment'],
handler : function () {
try {
var currentOption = this.payload[0].args[0];
diff --git a/src/uncategorized/pSchoolSuggestion.tw b/src/uncategorized/pSchoolSuggestion.tw
index c2f1e61c89e..5d0025b8369 100644
--- a/src/uncategorized/pSchoolSuggestion.tw
+++ b/src/uncategorized/pSchoolSuggestion.tw
@@ -20,7 +20,7 @@ An older woman standing across from him sniffs. "St. Claver's knows how to do bo
<</if>>
<<if $seeDicks != 0>>
<br><br>
-"That's what I like about L'École," her neighbor puts in. "Bad French, I know: Le Eycole Dess Encoolees." Less articulate than the others, he makes a vague motion down near his waist, as though he were fucking something, and then stops himself. "Anyway. If you like butts, they're the best. You can train slaves for years and not get them as eager to take it up the ass as that place makes 'em. Their girls come as soon as you stick it in 'em."
+"That's what I like about L'École," her neighbor puts in.<<if $language != "French">> "Bad French, I know: Le Eycole Dess Encoolees."<</if>> Less articulate than the others, he makes a vague motion down near his waist, as though he were fucking something, and then stops himself. "Anyway. If you like butts, they're the best. You can train slaves for years and not get them as eager to take it up the ass as that place makes 'em. Their girls come as soon as you stick it in 'em."
<br><br>
"Eugh." His neighbor rolls his eyes. "If your taste is a bit more refined, the Gymnasium-Academy makes their, ha, //girls// more well-rounded than just that. Not that they aren't delightfully entertaining when it comes to that, either. But they're also fit, well-trained, and even skilled at martial arts. They're perfect if you like hot young things all ready to be your bodyguard."
<br><br>
--
GitLab