diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 4ead835785c6694ee42ee937095b605f6397e719..3f98f23dfa5263aa6f8a1a3ca8775a09845bb881 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -22,8 +22,8 @@
<<set $PC.origHColor = $PC.hColor>>
<</if>>
-__''UI Settings''__
-<br>
+<h2 align="center">UI Settings</h2>
+
<<options $tooltipsEnabled>>
Help tooltips are
<<option 1 "Enable">>
@@ -44,7 +44,6 @@ __''UI Settings''__
<</options>>
/* Accordion 000-250-006 */
-<br>
<<options $useTabs>>
Economic Tabs on weekly reports are
<<option 1 "Enable">>
@@ -52,10 +51,9 @@ __''UI Settings''__
<<option 0 "Disable">>
@@.red;DISABLED.@@
<</options>>
-<br>
-__''World Settings''__
-<br>
+<h2 align="center">World Settings</h2>
+
<<set $localEcon = $economy>>
<<options $baseDifficulty>>
Economic climate:
@@ -72,9 +70,9 @@ __''World Settings''__
<</options>>
<<if $difficultySwitch == 1>><<set $econAdvantage = -2>><</if>>
<<if $difficultySwitch == 0>><<set $econRate = 0>><</if>>
-<br>
+
<<options $econRate>>
-Economic forecast:
+ Economic forecast:
<<option 0 "Vanilla" "$difficultySwitch = 0">>
''no change.'' //Vanilla -- Some economic content requires this to be set to harder than vanilla//
<<option 1 "Easy" "$difficultySwitch = 1">>
@@ -86,7 +84,7 @@ Economic forecast:
<</options>>
/* Not functional yet
-<br> All the things you need to run your arcology are getting more expensive
+All the things you need to run your arcology are getting more expensive
<<if $incomeMod == 0>>
while all forms of income ''remain static''.
[[Easier|Intro Summary][$incomeMod = 1]]
@@ -105,22 +103,19 @@ Economic forecast:
<<set $modCost = Math.trunc(5000/$economy)>>
<<set $surgeryCost = Math.trunc(30000/$economy)>>
-<br>
-
<<if ndef $customVariety>>
<<options>>
You are using standardized slave trading channels.
<<option>>
[[Customize the slave trade...|Customize Slave Trade][$customVariety = 1, $customWA = 0]]
<</options>>
- <br>
+
<<options $internationalTrade>>
<<option 1 "Allow intercontinental trade">>
The slave trade is ''international,'' so a wider variety of slaves will be available.
<<option 0 "Restrict the trade to continental">>
The slave trade is ''continental,'' so a narrower variety of slaves will be available.
<</options>>
- <br>
<<if $internationalTrade == 1>>
<<options $internationalVariety>>
@@ -131,7 +126,6 @@ Economic forecast:
''semi-realistic,'' so more populous nations will be more common.
<</options>>
<</if>>
- <br>
<<else>>
Current nationality distributions are [[Adjust the slave trade|Customize Slave Trade][$customWA = 0, $customVariety = 1]] | [[Stop customizing|Intro Summary][delete $customVariety]]
<<if ndef $nationalitiescheck>> /* NGP: regenerate $nationalitiescheck from previous game's $nationalities array */
@@ -155,9 +149,8 @@ Economic forecast:
Game mode: ''one-handed''. No non-erotic events concerning the changing world.
<</options>>
-<br><br>
-__''General slave settings''__
-<br>
+<h2 align="center">General slave settings</h2>
+
<<options $verboseDescriptions>>
<<option 1 "Enable">>
Your master suite ''will'' detail slave changes.
@@ -165,7 +158,6 @@ __''General slave settings''__
Your master suite ''will not'' detail slave changes.
<</options>>
-<br>
<<options $newDescriptions>>
<<option 1 "Enable">>
Slaves ''will'' have alternate titles.
@@ -173,7 +165,6 @@ __''General slave settings''__
Slaves ''will not'' have alternate titles.
<</options>>
-<br>
<<options $seeRace>>
<<option 1 "Enable mentions of race">>
Ethnicity will ''occasionally'' be mentioned.
@@ -181,7 +172,6 @@ __''General slave settings''__
Ethnicity will ''almost never'' be mentioned.
<</options>>
-<br>
<<options $seeNationality>>
<<option 1 "Enable mentions of nationality">>
Nationality will ''occasionally'' be mentioned.
@@ -189,7 +179,6 @@ __''General slave settings''__
Nationality will ''almost never'' be mentioned.
<</options>>
-<br>
<<options $realRoyalties>>
<<option 1 "Historical dynasties">>
When getting an event for enslaving the members of the royalty, they will have nationalities and surnames of the real royalties.
@@ -197,17 +186,15 @@ __''General slave settings''__
When getting an event for enslaving the members of the royalty, their nationalities and surnames will be random.
<</options>>
-<br>
<<options $allowMaleSlaveNames>>
<<option false "Only use female names">>
- Slaves will ''always generate with female names'',
+ Slaves will ''always generate with female names''.
<<option true "Allow male names">>
Slaves ''can generate with male names''.
<<comment>>
This only affects slave generation and not your ability to name your slaves.
<</options>>
-<br>
<<options $surnameOrder>>
<<option 0 "Allow nationality name order">>
Order names ''based on country of origin''.
@@ -217,7 +204,6 @@ __''General slave settings''__
Names will always be ''Surname Name''.
<</options>>
-<br>
<<options $familyTesting>>
<<option 1 "Enable extended families">>
Slaves ''can'' have extended families instead of just a single relative.
@@ -229,7 +215,6 @@ __''General slave settings''__
<</options>>
<<if $familyTesting == 1>>
- <br>
<<options $showDistantRelatives>>
<<option 1 "Enable distant relatives">>
Distant relatives ''will'' be tracked.
@@ -237,7 +222,6 @@ __''General slave settings''__
Distant relatives ''will not'' be tracked.
<</options>>
- <br>
<<options $inbreeding>>
<<option 1 "Enable inbreeding damage">>
Successive breeding ''will'' result in sub-average slaves.
@@ -245,7 +229,6 @@ __''General slave settings''__
Successive breeding ''will not'' result in sub-average slaves.
<</options>>
- <br>
<<options $allowFamilyTitles>>
<<option 1 "Enable family titles">>
Your relatives ''will'' use family titles.
@@ -254,8 +237,6 @@ __''General slave settings''__
<</options>>
<</if>>
-<br>
-
<<options $weightAffectsAssets>>
<<option 1 "Enable">>
Interactions between slaves' weight and asset size are ''enabled''.
@@ -263,9 +244,6 @@ __''General slave settings''__
Interactions between slaves' weight and asset size are ''disabled''.
<</options>>
-
-
-<br>
<<options $curativeSideEffects>>
<<option 1 "Enable">>
Curative side effects are ''enabled''.
@@ -273,7 +251,6 @@ __''General slave settings''__
Curative side effects are ''disabled''.
<</options>>
-<br>
/% Begin mod section: toggle whether slaves lisp. %/
<<options $disableLisping>>
@@ -285,11 +262,8 @@ __''General slave settings''__
/% End mod section: toggle whether slaves lisp. %/
-<br><br>
-__''Slave age settings''__
-<br>
+<h2 align="center">Slave age settings</h2>
-<br>
<<options $seeAge>>
<<option 1 "Enable aging">>
Slaves will ''age naturally.''
@@ -301,15 +275,12 @@ __''Slave age settings''__
This option cannot be changed during the game.
<</options>>
-<br>
-
<<options $pedo_mode>>
<<option 1 "Loli mode" "$minimumSlaveAge = 5">>
Nearly all randomly generated slaves will be under the age of 18, although custom slaves and slaves related to specific events may be older.
<<option 0 "Normal mode">>
Randomly generated slaves will generate normally.
<</options>>
-<br>
<<if $minimumSlaveAge < 3>>
<<set $minimumSlaveAge = 3>>
@@ -325,14 +296,13 @@ __''Slave age settings''__
<<textbox2 "$minimumSlaveAge" $minimumSlaveAge "Intro Summary">>
<</options>>
-<br>
<<options $extremeUnderage>>
<<option 1 "Allow">>
Molestation of slaves younger than $minimumSlaveAge is ''permitted''.
<<option 0 "Deny">>
Molestation of slaves younger than $minimumSlaveAge is ''forbidden''.
<</options>>
-<br>
+
<<if $retirementAge <= $minimumSlaveAge>>
<<set $retirementAge = $minimumSlaveAge+1>>
<<elseif $retirementAge <= 120>>
@@ -349,7 +319,6 @@ __''Slave age settings''__
May cause issues with New Game and initial slaves if set below 45.
<</options>>
-<br>
<<if $fertilityAge < 3>>
<<set $fertilityAge = 3>>
<<elseif $fertilityAge < 18>>
@@ -364,7 +333,6 @@ __''Slave age settings''__
<<textbox2 "$fertilityAge" $fertilityAge "Intro Summary">>
<</options>>
-<br>
<<if $potencyAge < 3>>
<<set $potencyAge = 3>>
<<elseif $potencyAge < 18>>
@@ -379,7 +347,6 @@ __''Slave age settings''__
<<textbox2 "$potencyAge" $potencyAge "Intro Summary">>
<</options>>
-<br>
<<options $precociousPuberty>>
<<option 1 "Enable precocious puberty">>
Girls ''can'' experience precocious puberty. (Under certain conditions they can become pregnant or inseminate others younger then normal age - $fertilityAge, though they may also experience delayed puberty).
@@ -387,16 +354,15 @@ __''Slave age settings''__
Girls ''cannot'' experience precocious puberty. (Unable to become pregnant or inseminate others younger than normal puberty age - $fertilityAge).
<</options>>
-<br><br>
-__''Slave age effects''__
-<br>
+<h2 align="center">Slave age effects</h2>
+
<<options $AgePenalty>>
<<option 1 "Enable age penalties">>
Girls ''will'' receive job and career penalties due to age.
<<option 0 "Disable age penalties">>
Girls ''will not'' receive job and career penalties due to age.
<</options>>
-<br>
+
<<options $loliGrow>>
<<option 1 "Enable Growth">>
Children ''will'' grow as they age.
@@ -404,9 +370,8 @@ __''Slave age effects''__
Children ''will not'' grow as they age.
<</options>>
-<br><br>
-__''Content settings''__
-<br>
+<h2 align="center">Content settings</h2>
+
<<options $seeDicks>>
<<option 0 "None" "" "(0%)">>
''None'' of the slave girls will have dicks.
@@ -423,7 +388,7 @@ __''Content settings''__
<<option 100 "All" "" "(100%)">>
''All'' of the slave girls will have dicks.
<</options>>
-<br>
+
<<if $seeDicks == 0>>
<<options $makeDicks>>
Should you be able to surgically attach a penis to your female slaves and starting girls?
@@ -432,7 +397,6 @@ __''Content settings''__
<</options>>
<</if>>
-<br>
<<options $seeIllness>>
<<option 1 "Enable">>
Slaves ''will'' be able to get sick.
@@ -440,7 +404,6 @@ __''Content settings''__
Slaves ''will not'' be able to get sick.
<</options>>
-<br>
<<options $seePreg>>
<<option 1 "Enable">>
Pregnancy related content is ''enabled''.
@@ -448,7 +411,6 @@ __''Content settings''__
Most pregnancy related content is ''disabled''.
<</options>>
-<br>
<<options $seeDicksAffectsPregnancy>>
<<option 1 "Yes">>
Children born in game strictly adhere to dick content settings.
@@ -457,7 +419,6 @@ __''Content settings''__
<</options>>
<<if $seeDicksAffectsPregnancy == 0>>
- <br>
<<options $adamPrinciple>>
<<option 1 "Enable">>
XX slaves only fathering daughters is ''enabled''.
@@ -466,7 +427,6 @@ __''Content settings''__
<</options>>
<</if>>
-<br>
<<options $seeHyperPreg>>
<<option 1 "Enable">>
Extreme pregnancy content like broodmothers is ''enabled''.
@@ -474,7 +434,6 @@ __''Content settings''__
Extreme pregnancy content like broodmothers is ''disabled''.
<</options>>
-<br>
<<options $dangerousPregnancy>>
<<option 1 "Enable">>
Advanced pregnancy complications such as miscarriage and premature birth are currently ''enabled''.
@@ -482,7 +441,6 @@ __''Content settings''__
Advanced pregnancy complications such as miscarriage and premature birth are currently ''disabled''.
<</options>>
-<br>
<<options $seeExtreme>>
<<option 1 "Enable">>
Extreme content like amputation is ''enabled''.
@@ -490,7 +448,6 @@ __''Content settings''__
Extreme content like amputation is ''disabled''.
<</options>>
-<br>
<<options $seeBestiality>>
<<option 1 "Enable">>
Bestiality content is ''enabled''.
@@ -498,7 +455,6 @@ __''Content settings''__
Bestiality content is ''disabled''.
<</options>>
-<br>
<<options $seePee>>
<<option 1 "Enable">>
Watersports content is ''enabled''.
@@ -506,7 +462,6 @@ __''Content settings''__
Watersports content is ''disabled''.
<</options>>
-<br>
<<options $seeIncest>>
<<option 1 "Enable">>
Incest is ''enabled''.
@@ -515,7 +470,6 @@ __''Content settings''__
<</options>>
<<if $seeDicks != 0>>
- <br>
<<options $seeCircumcision>>
<<option 1 "Enable">>
Circumcision is ''enabled''.
@@ -524,9 +478,8 @@ __''Content settings''__
<</options>>
<</if>>
-<br><br>
-__''The Free City''__
-<br>
+<h2 align="center">The Free City</h2>
+
<<options>>
The Free City features ''$neighboringArcologies'' arcologies in addition to your own.
<<option>>
@@ -537,7 +490,6 @@ __''The Free City''__
<</options>>
<<if $targetArcology.type == "New">>
- <br>
<<options $terrain>>
The Free City is located on ''$terrain'' terrain.
<<option "urban" "Urban">>
@@ -546,8 +498,8 @@ __''The Free City''__
<<option "marine" "Marine">>
<<option "oceanic" "Oceanic">>
<</options>>
+
<<if $terrain != "oceanic">>
- <br>
<<if $freshPC == 1 || $saveImported == 0>>
<<options $continent>>
The Free City is located in ''$continent''.
@@ -577,7 +529,7 @@ __''The Free City''__
<</if>>
<</if>>
<</if>>
-<br>
+
<<if !["ArabianRevivalist", "AztecRevivalist", "ChineseRevivalist", "EdoRevivalist", "EgyptianRevivalist", "RomanRevivalist"].includes($targetArcology.type)>>
<<options $language>>
The lingua franca of your arcology is:
@@ -587,7 +539,6 @@ __''The Free City''__
<<option>>
<<textbox2 "$language" $language "Intro Summary">>
<</options>>
- <br>
<</if>>
<<options $FSCreditCount>>
@@ -595,13 +546,11 @@ __''The Free City''__
<<option>>
<<textbox2 "$FSCreditCount" $FSCreditCount "Intro Summary">>
<<comment>>
- <br>
5 is default, 4 behaves the same as pre-patch 0.9.9.0, max is 7.
- This option cannot be changed during the game
+ <div>This option cannot be changed during the game</div>
<</options>>
-<br><br>
-__''Player Character''__
+<h2 align="center">Player Character</h2>
<<if $freshPC == 1 || $saveImported == 0>>
<<if ndef $PCCreationSex>>
@@ -612,22 +561,26 @@ __''Player Character''__
<</if>>
<</if>>
- <br>
<<options $PC.title>>
You are a $PCCreationSex. Change to:
<<option 1 "Masculine Master" "$PC.genes = 'XY', $PCCreationSex = \"masculine ''Master''\"">>
<<option 0 "Feminine Mistress" "$PC.genes = 'XX', $PCCreationSex = \"feminine ''Mistress''\"">>
<</options>>
- <br>
- Everyone calls you ''<<= PlayerName()>>.''
- <br>
+ <div style="display:flex">
+ <span style="flex:50%; text-align:right">
+ Everyone calls you ''<<= PlayerName()>>.''
+ </span>
+ <span style="flex:50%">
+ </span>
+ </div>
+
<<options>>
With your given name as:
<<option>>
<<textbox2 "$PC.slaveName" $PC.slaveName>>
<</options>>
- <br>
+
<<if $PC.slaveSurname == 0>>
<<options $PC.slaveSurname>>
And no surname.
@@ -643,7 +596,7 @@ __''Player Character''__
<<option 0 "Go by a single name">>
<</options>>
<</if>>
- <br>
+
<<set $PC.physicalAge = $PC.actualAge, $PC.visualAge = $PC.actualAge>>
<<options>>
You are ''$PC.actualAge'' years old which is
@@ -659,13 +612,13 @@ __''Player Character''__
<<option>>
<<textbox2 "$PC.actualAge" $PC.actualAge "Intro Summary">>
<</options>>
- <br>
+
<<options>>
Your birthday was ''$PC.birthWeek'' weeks ago.
<<option>>
<<textbox2 "$PC.birthWeek" $PC.birthWeek "Intro Summary">>
<</options>>
- <br>
+
<<options $playerAging>>
<<option 2 "Enable aging">>
and you ''age naturally''.
@@ -676,14 +629,14 @@ __''Player Character''__
<<comment>>
This option cannot be changed during the game
<</options>>
- <br>
+
<<if def $PC.customTitle>>
<<options>>
Your custom title is:
<<option>>
<<textbox2 "$PC.customTitle" $PC.customTitle "Intro Summary">>
<</options>>
- <br>
+
<<options>>
and when lisped it is:
<<option>>
@@ -701,7 +654,7 @@ __''Player Character''__
Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.
<</options>>
<</if>>
- <br>
+
<<options>>
Your nationality is:
<<option>>
@@ -709,7 +662,7 @@ __''Player Character''__
<<comment>>
Capitalize it
<</options>>
- <br>
+
<<options $PC.race>>
Your race is:
<<option "white" "White">>
@@ -727,7 +680,7 @@ __''Player Character''__
<<option>>
<<textbox2 "$PC.race" $PC.race "Intro Summary">>
<</options>>
- <br>
+
<<options $PC.skin>>
Your skin tone is:
<<option "pure white" "Pure White" >>
@@ -758,7 +711,7 @@ __''Player Character''__
<<option>>
<<textbox2 "$PC.skin" $PC.skin "Intro Summary">>
<</options>>
- <br>
+
<<options $PC.markings>>
<<option "none" "None">>
Your body ''is clear of blemishes''.
@@ -768,19 +721,18 @@ __''Player Character''__
Your body ''has heavy freckling''.
<</options>>
- <br>
<<options>>
Your eyes are:
<<option>>
<<textbox2 "$PC.eye.origColor" $PC.eye.origColor "Intro Summary">>
<</options>>
- <br>
+
<<options>>
Your hair is:
<<option>>
<<textbox2 "$PC.hColor" $PC.hColor "Intro Summary">>
<</options>>
- <br>
+
<<options $PC.faceShape>>
<<option "normal" "Normal">>
Your face is ''normal''.
@@ -795,7 +747,7 @@ __''Player Character''__
<<option "exotic" "Exotic">>
Your face is ''exotic''.
<</options>>
- <br>
+
<<options $PC.refreshment>>
Your preferred refreshment is:
<<option "cigar" "Cigars" "$PC.refreshmentType = 0">>
@@ -803,7 +755,7 @@ __''Player Character''__
<<option>>
<<textbox2 "$PC.refreshment" $PC.refreshment "Intro Summary">>
<</options>>
- <br>
+
<<options $PC.refreshmentType>>
Which you
<<option 0 "Smoke">>
@@ -821,7 +773,8 @@ __''Player Character''__
<<option 6 "Orally Dissolve">>
orally dissolve.
<</options>>
- <br>
+
+
<<if ($PC.refreshmentType == 0) && ($PC.refreshmentType != 0) >>//"Smoked" must fit into the following sentence: "I smoked a $PC.refreshment" to fit events properly
<<elseif $PC.refreshmentType == 5>>//"Popped" must fit into the following sentence: "I shook the bottle of $PC.refreshment" to fit events properly
<<elseif $PC.refreshmentType == 6>>//"Orally Dissolved" must fit into the following sentence: "I placed a tab of $PC.refreshment under my tongue" to fit events properly
@@ -862,7 +815,7 @@ __''Player Character''__
<<set _PCCreationCareer = "a member of the idle wealthy">>
<<set _PCSecExpCareer = "@@.red;Harder to maintain authority,@@ but @@.yellowgreen;the propaganda hub's upgrades will be cheaper.@@">>
<</switch>>
- <br>
+
<<if $PC.career == "arcology owner">>
Before you came to the Free Cities, you were ''_PCCreationCareer''.
<<else>>
@@ -881,11 +834,11 @@ __''Player Character''__
<<option "gang" "Gang leader">>
<</options>>
<<if $secExpEnabled > 0>>
- <br>
- Security Expansion bonus: _PCSecExpCareer
+ <div>
+ Security Expansion bonus: _PCSecExpCareer
+ </div>
<</if>>
<</if>>
- <br>
<<options $PC.rumor>>
It is rumored that you acquired your arcology through ''$PC.rumor'':
@@ -895,7 +848,6 @@ __''Player Character''__
<<option "social engineering" "Social engineering">>
<<option "luck" "Blind luck">>
<</options>>
- <br>
<<if $PC.vagina != -1 && $PC.dick != 0>>
<<set _vagina_penis = 2>>
@@ -914,11 +866,8 @@ __''Player Character''__
<<option 2 "Penis and Vagina" "$PC.dick=4, $PC.balls=3, $PC.scrotum=3, $PC.prostate=1, $PC.vagina=1, $PC.ovaries=1">>
''penis and vagina''. Sex scene variations; more difficult reputation maintenance; some unique opportunities, especially with breasts.
<</options>>
- <br>
<<if $PC.vagina != -1>>
-
-
<<if $PC.preg == -1>>
<<options $PC.preg>>
You are taking contraceptives. You ''can't'' get pregnant, however there
@@ -956,10 +905,11 @@ __''Player Character''__
<</if>>
<<if $PC.counter.birthsTotal > 0>>
- <br>You have given birth to ''$PC.counter.birthsTotal'' babies.
+ <div>
+ You have given birth to ''$PC.counter.birthsTotal'' babies.
+ </div>
<</if>>
- <br>
<<options $PC.pregMood>>
Your hormones
<<option 0 "Not affected">>
@@ -972,7 +922,6 @@ __''Player Character''__
<</options>>
<</if>>
- <br>
<<switch $PC.boobs>>
<<case 400>>
<<set _PCCreationBoobSize = "small B-cups">>
@@ -1019,10 +968,9 @@ __''Player Character''__
<</options>>
<</if>>
<</if>>
-
<<else>>
- <br>You are a
+ You are a
<<if $PC.title == 1>>
masculine ''Master''
<<else>>
@@ -1030,7 +978,6 @@ __''Player Character''__
<</if>>
and everyone that matters calls you <<= PlayerName()>>.
- <br>
You are $PC.actualAge years old which is
<<if $PC.actualAge >= 65>>
''old''.
@@ -1042,8 +989,6 @@ __''Player Character''__
''surprisingly young''.
<</if>>
- <br>
-
<<options $playerAging>>
Your birthday will be in $PC.birthWeek weeks
<<option 2 "Enable aging">>
@@ -1055,23 +1000,27 @@ __''Player Character''__
<<comment>>
This option cannot be changed during the game
<</options>>
-
- <br>
- Your custom title is ''<<textbox2 "$PC.customTitle" $PC.customTitle "Intro Summary">>''
- and when lisped it is ''<<textbox2 "$PC.customTitleLisp" $PC.customTitleLisp "Intro Summary">>''.
- //If using a custom title, select Master or Mistress to set the gender of your title.//
- //Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.//
-
- <br>
- You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and <<print App.Desc.eyesColor($PC)>>. You have a $PC.faceShape face.
-
- <br>
- Your preferred refreshment is <<textbox2 "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
-
- and you consume it by ''<<if $PC.refreshmentType == 0>>Smoking<<elseif $PC.refreshmentType == 1>>Drink<<elseif $PC.refreshmentType == 2>>Eating<<elseif $PC.refreshmentType == 3>>Snorting<<elseif $PC.refreshmentType == 4>>Injection<<elseif $PC.refreshmentType == 5>>Popping<<else>>Orally Dissolving<</if>>''.
+ <p>
+ Your custom title is ''<<textbox2 "$PC.customTitle" $PC.customTitle "Intro Summary">>''
+ and when lisped it is ''<<textbox2 "$PC.customTitleLisp" $PC.customTitleLisp "Intro Summary">>''.
+ //If using a custom title, select Master or Mistress to set the gender of your title.//
+ //Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.//
+ </p>
+
+ <p>
+ You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and <<print App.Desc.eyesColor($PC)>>. You have a $PC.faceShape face.
+ </P>
+
+ <p>
+ Your preferred refreshment is <<textbox2 "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
+ </p>
+
+ <p>
+ and you consume it by ''<<if $PC.refreshmentType == 0>>Smoking<<elseif $PC.refreshmentType == 1>>Drink<<elseif $PC.refreshmentType == 2>>Eating<<elseif $PC.refreshmentType == 3>>Snorting<<elseif $PC.refreshmentType == 4>>Injection<<elseif $PC.refreshmentType == 5>>Popping<<else>>Orally Dissolving<</if>>''.
+ </p>
[[Smoked|Intro Summary][$PC.refreshmentType = 0]] | [[Drank|Intro Summary][$PC.refreshmentType = 1]] | [[Eaten|Intro Summary][$PC.refreshmentType = 2]] | [[Snorted|Intro Summary][$PC.refreshmentType = 3]] | [[Injected|Intro Summary][$PC.refreshmentType = 4]] | [[Popped|Intro Summary][$PC.refreshmentType = 5]] | [[Orally Dissolved|Intro Summary][$PC.refreshmentType = 6]]
- <br>
+
<<if $PC.refreshmentType == 0>>//"Smoked" must fit into the following sentence: "I smoked a $PC.refreshment" to fit events properly
<<elseif $PC.refreshmentType == 5>>//"Popped" must fit into the following sentence: "I shook the bottle of $PC.refreshment" to fit events properly
<<elseif $PC.refreshmentType == 6>>//"Orally Dissolved" must fit into the following sentence: "I placed a tab of $PC.refreshment under my tongue" to fit events properly
@@ -1118,7 +1067,6 @@ __''Player Character''__
blind luck.
<</switch>>
- <br>
You have a
<<if $PC.vagina != -1 && $PC.dick != 0>>
penis and vagina
@@ -1170,7 +1118,6 @@ __''Player Character''__
<</if>>
<</if>>
- <br>
<<if $PC.boobs >= 300>>
You have a <<if $PC.title > 0>>masculine<<else>>feminine<</if>> body with
<<if $PC.boobs >= 1400>>
@@ -1197,8 +1144,8 @@ __''Player Character''__
<</if>>
<</if>>
-<br><br>__''Image display''__
-<br>
+<h2 align="center">Image display</h2>
+
<<options $seeImages>>
Currently
<<option 1 "Enable">>
@@ -1206,10 +1153,8 @@ __''Player Character''__
<<option 0 "Disable">>
''Disabled''.
<</options>>
-<br>
<<set _exampleSlave = BaseSlave()>>
-
<<if $seeImages == 1>>
<<options $imageChoice>>
Using
@@ -1217,19 +1162,19 @@ __''Player Character''__
''Rendered imagepack by Shokushu''.
<<option 1 "Vector — embedded">>
''Vector art by NoX/Deepmurk — embedded''.
- <br>@@.red;Git compiled only, no exceptions.@@
+ <br><span class="red">Git compiled only, no exceptions.</span>
<<option 2 "Vector — non-embedded">>
''Vector art by NoX/Deepmurk — non-embedded''.
<<option 3 "Vector revamp">>
''Vector art revamp''.
- <br>@@.red;Git compiled only, no exceptions.@@
+ <br><span class="red">Git compiled only, no exceptions.</span>
+ <<comment>>
+ "Vector — embedded" is the most up to date and supports the most content. Ironically, revamp has not been touched in a long time.
<</options>>
<<if $imageChoice == 1>>
- <br>
<div style="position:relative;width:200px;height:200px;margin:0 auto;">
<<= SlaveArt(_exampleSlave, 0, 0)>>
</div>
- <br>
<<options $seeFaces>>
Face art
<<option 1 "Enable">>
@@ -1237,7 +1182,7 @@ __''Player Character''__
<<option 0 "Disable">>
@@.red;DISABLED.@@
<</options>>
- <br>
+
<<options $seeVectorArtHighlights>>
Highlights on shiny clothing
<<option 1 "Enable">>
@@ -1245,7 +1190,7 @@ __''Player Character''__
<<option 0 "Disable">>
@@.red;DISABLED.@@
<</options>>
- <br>
+
<<options $seeHeight>>
Height scaling
<<option 2 "Enable for all images">>
@@ -1256,16 +1201,13 @@ __''Player Character''__
@@.red;DISABLED.@@
<</options>>
<<elseif $imageChoice == 2>>
- <br>
<div style="position:relative;width:200px;height:200px;margin:0 auto;">
<<= SlaveArt(_exampleSlave, 0, 0)>>
</div>
<<elseif $imageChoice == 3>>
- <br>
<div style="position:relative;width:200px;height:200px;margin:0 auto;">
<<= SlaveArt(_exampleSlave, 0, 0)>>
</div>
- <br>
<<options $seeVectorArtHighlights>>
Highlights on shiny clothing
<<option 1 "Enable">>
@@ -1274,9 +1216,7 @@ __''Player Character''__
@@.red;DISABLED.@@
<</options>>
<<elseif $imageChoice == 0>>
- <br>
<div style="width:200px; height:200px; margin: auto; position: relative;">
- <br>
You need to <a href="https://mega.nz/#!upoAlBaZ!EbZ5wCixxZxBhMN_ireJTXt0SIPOywO2JW9XzTIPhe0">download the image pack</a>
and put the 'renders' folder into the resources/ folder where this
html file is.
@@ -1292,7 +1232,7 @@ __''Player Character''__
''disabled''.
<</options>>
<</if>>
- <br>
+
<<options $seeAvatar>>
PA avatar images are
<<option 1 "Enable">>
@@ -1300,7 +1240,7 @@ __''Player Character''__
<<option 0 "Disable">>
''disabled''.
<</options>>
- <br>
+
<<options $seeSummaryImages>>
Slave images in lists are
<<option 1 "Enable">>
@@ -1308,7 +1248,7 @@ __''Player Character''__
<<option 0 "Disable">>
''disabled''.
<</options>>
- <br>
+
<<options $seeReportImages>>
Slave images in the weekly report are
<<option 1 "Enable">>
@@ -1318,10 +1258,8 @@ __''Player Character''__
<</options>>
<</if>>
-<br><br>
+<h2 align="center">Mods</h2>
-__''Mods''__
-<br>
<<options $SF.Toggle>>
The Special Force Mod is
<<option 1 "Enable">>
@@ -1331,15 +1269,13 @@ __''Mods''__
<<comment>>
This mod is initially from anon1888 but expanded by SFanon offers a lategame special (started out as security but changed to special in order to try and reduce confusion with CrimeAnon's separate Security Expansion (SecExp) mod) force, that is triggered after week 80. It is non-canon where it conflicts with canonical updates to the base game.
<</options>>
- /*<br> The support facility is
+ /*The support facility is
<<if $SF.Facility.Toggle < 1>>
@@.red;DISABLED.@@ [[Enable|Intro Summary][$SF.Facility.Toggle = 1]]
<<else>>
@@.cyan;ENABLED.@@ [[Disable|Intro Summary][$SF.Facility.Toggle = 0]]
<</if>> //Prep for future content.*/
-<br>
-
<<options $secExpEnabled>>
The Security Expansion Mod is
<<option 1 "Enable">>
@@ -1349,11 +1285,7 @@ __''Mods''__
<<comment>>
This mod introduces security and crime in the arcology, as well as attacks and battles.
<</options>>
-<br>
-
-
-<br><br>
<<link "Continue" "init Nationalities">>
<<if $freshPC == 1 || $saveImported == 0>>
<<switch $PC.career>>
@@ -1421,6 +1353,7 @@ __''Mods''__
<<if ($economy != 100) || ($seeDicks != 25) || ($continent != "North America") || ($internationalTrade != 1) || ($internationalVariety != 1) || ($seeRace != 1) || ($seeNationality != 1) || ($seeExtreme != 0) || ($seeCircumcision != 1) || ($seeAge != 1) || ($plot != 1)>>
| [[restore defaults|Intro Summary][$seeDicks = 25, $economy = 100, $continent = "North America", $internationalTrade = 1, $internationalVariety = 1, $seeRace = 1, $seeNationality = 1, $seeExtreme = 0, $seeCircumcision = 1, $seeAge = 1, $plot = 1]]
<</if>>
+<p>
+ [[Cheat Start|init Nationalities][cashX(1000000, "cheating"), $PC.rules.living = "luxurious",repX(20000, "cheating"), $dojo += 1, $cheatMode = 1, $seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion", $sortSlavesOrder = "descending", $sortSlavesMain = 0, $rulesAssistantMain = 1, $abbreviateDevotion = 1, $abbreviateRules = 1, $abbreviateClothes = 2, $abbreviateHealth = 1, $abbreviateDiet = 1, $abbreviateDrugs = 1, $abbreviateRace = 1, $abbreviateNationality = 1, $abbreviateGenitalia = 1, $abbreviatePhysicals = 1, $abbreviateSkills = 1, $abbreviateMental = 2, $PC.skill.trading = 100, $PC.skill.warfare = 100, $PC.skill.slaving = 100, $PC.skill.engineering = 100, $PC.skill.medicine = 100, $PC.skill.hacking = 100, resetEyeColor($PC)]] | //Intended for debugging: may have unexpected effects//
+</p>
-<br><br>
-[[Cheat Start|init Nationalities][cashX(1000000, "cheating"), $PC.rules.living = "luxurious",repX(20000, "cheating"), $dojo += 1, $cheatMode = 1, $seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion", $sortSlavesOrder = "descending", $sortSlavesMain = 0, $rulesAssistantMain = 1, $abbreviateDevotion = 1, $abbreviateRules = 1, $abbreviateClothes = 2, $abbreviateHealth = 1, $abbreviateDiet = 1, $abbreviateDrugs = 1, $abbreviateRace = 1, $abbreviateNationality = 1, $abbreviateGenitalia = 1, $abbreviatePhysicals = 1, $abbreviateSkills = 1, $abbreviateMental = 2, $PC.skill.trading = 100, $PC.skill.warfare = 100, $PC.skill.slaving = 100, $PC.skill.engineering = 100, $PC.skill.medicine = 100, $PC.skill.hacking = 100, resetEyeColor($PC)]] | //Intended for debugging: may have unexpected effects//
diff --git a/src/gui/css/optionsMacro.css b/src/gui/css/optionsMacro.css
index 74e844663820542d00fac19c98e125a5e935b2da..c58a682f4468f906100f0d8c2bf5ce873b4792aa 100644
--- a/src/gui/css/optionsMacro.css
+++ b/src/gui/css/optionsMacro.css
@@ -1,13 +1,12 @@
.optionMacro {
margin-top: 8px;
- display: inline-block;
+ display: flex;
}
.optionDescription {
display: inline-block;
- width: 500px;
+ width: 50%;
margin-right: 10px;
- line-height: 1.2;
text-align: right;
}
@@ -30,6 +29,7 @@
vertical-align: top;
-moz-user-select: none;
min-width: 79px; /* 80px - 1px for border */
+ max-height: 30px;
display: inline-block;
text-align: center;
}
@@ -37,7 +37,6 @@
.optionComment {
vertical-align: top;
color: gray;
- padding-left: 10px;
}
/* But don't add the | after the last one */
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 422d20eda92894e000ecfdd0bb463da152939fac..4773efa44a247cef3ae830331fea7ce7f56eb843 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -255,7 +255,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $seeFaces = 1>>
<<set $seeAvatar = 1>>
<<set $seeHeight = 0>>
- <<set $imageChoice = 0>>
+ <<set $imageChoice = 1>>
<<set $seeVectorArtHighlights = 1>>
<<set $seeMainFetishes = 0>>
<<set $seeSummaryImages = 1>>
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index bc6262c2ee619e17e2cb72bcb2444d99b464c944..6fa1158c0c32ceda31d577b9ec68814017c99321 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -35,12 +35,11 @@ Macro.add('options', {
let hasCurrentOption = this.payload[0].args.full &&
this.payload[0].args.full !== '""' && this.payload[0].args.full !== "''";
- /* Check if we have a first argument - if we do, it should be a
- variable like $foo
- */
+ // Check if we have a first argument - if we do, it should be a variable like $foo
if (hasCurrentOption) {
- if (currentOption === undefined)
+ if (currentOption === undefined) {
currentOption = false;
+ }
if (this.payload[0].args.full.startsWith("State.temporary.")) {
variable = "_" + this.payload[0].args.full.split(' ', 1)[0].substring("State.temporary.".length);
} else if (this.payload[0].args.full.startsWith("State.variables.")) {
@@ -168,12 +167,13 @@ Macro.add('options', {
}
jQuery(this.output).wiki(
'<span class="optionMacro ' + (currentOptionIsNumber ? 'optionMacroNumber' : '') + '">' +
- '<span class="optionDescription">' + title + ' ' + description + "</span>" +
+ '<span class="optionDescription">' + title + ' ' + description +
+ (comment ? '<span class="optionComment"><span class="detail"><br>' + comment + "</span></span>" : '') +
+ "</span>" +
'<span class="optionValue">' + output + "</span>" +
- (comment ? '<span class="optionComment"><span class="detail">' + comment + "</span></span>" : '') +
- '</span>');
- }
- catch (ex) {
+ '</span>'
+ );
+ } catch (ex) {
return this.error('bad options expression: ' + ex.message);
}
}