From c03a112cd3077f8a06789f12aaefdab9a45cc519 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 29 Jan 2020 23:37:26 -0500
Subject: [PATCH] more css
---
src/events/intro/introSummary.tw | 5 +-
src/events/intro/pcRumorIntro.tw | 52 +++++--
src/npc/startingGirls/startingGirls.tw | 46 +++---
src/npc/takeoverTarget.tw | 203 ++++++++++++++-----------
4 files changed, 178 insertions(+), 128 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index ab036459fd3..4ead835785c 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -5,9 +5,10 @@
<<set $PC.actualAge = variableAsNumber($PC.actualAge, 14, 80, 35)>>
<<set $PC.birthWeek = variableAsNumber($PC.birthWeek, 0, 51, 0)>>
-You may review your settings before clicking "Continue" to begin.
+<p>
+ You may review your settings before clicking "Continue" to begin.
+</p>
-<br><br>
<<set $minimumSlaveAge = variableAsNumber($minimumSlaveAge, 3, 18, 18)>>
<<set $retirementAge = variableAsNumber($retirementAge, 25, 120, 45)>>
<<set $fertilityAge = variableAsNumber($fertilityAge, 3, 18, 13)>>
diff --git a/src/events/intro/pcRumorIntro.tw b/src/events/intro/pcRumorIntro.tw
index a129aaad350..b4c2716465c 100644
--- a/src/events/intro/pcRumorIntro.tw
+++ b/src/events/intro/pcRumorIntro.tw
@@ -1,16 +1,44 @@
-:: PC Rumor Intro
+:: PC Rumor Intro [nobr]
<<unset $showSecExp>>
+<p>
+ Who you are is something that you will have to define for yourself through your actions. Once you own an arcology, no one will be in a position to apply moral scorekeeping to you. In the brave new world of the Free Cities, you will be free to define yourself as the sum of your actions, rather than as the product of your past. The first decision that will define who you are as an arcology owner is your choice of method in acquiring one.
+ <span class="intro question">
+ What approach will you take?
+ </span>
+</p>
-Who you are is something that you will have to define for yourself through your actions. Once you own an arcology, no one will be in a position to apply moral scorekeeping to you. In the brave new world of the Free Cities, you will be free to define yourself as the sum of your actions, rather than as the product of your past. The first decision that will define who you are as an arcology owner is your choice of method in acquiring one. @@.orange;What approach will you take?@@
+<div>
+ [[A judicious application of funds|Takeover Target][$PC.rumor = "wealth"]]
+</div>
+<div class="indent note">
+ Start with <span class="cash.inc">extra money,</span> since you were wealthy enough to buy an arcology.
+</div>
-[[A judicious application of funds|Takeover Target][$PC.rumor = "wealth"]]
- //Start with @@.yellowgreen;extra money,@@ since you were wealthy enough to buy an arcology.//
-[[Hard work and diligence|Takeover Target][$PC.rumor = "diligence"]]
- //New slaves will @@.hotpink;hate you less,@@ since it will be known that you worked hard to earn your position.//
-[[The remorseless use of force|Takeover Target][$PC.rumor = "force"]]
- //New slaves @@.gold;will fear you more,@@ since rumors about your violent takeover will inevitably circulate.//
-[[Clever social engineering|Takeover Target][$PC.rumor = "social engineering"]]
- //Start with the @@.green;first societal option unlocked,@@ since you manipulated the arcology's citizens.//
-[[Blind luck|Takeover Target][$PC.rumor = "luck"]]
- //Start with a @@.green;good reputation,@@ since the story of your unlikely accession will be famous.//
+<div>
+ [[Hard work and diligence|Takeover Target][$PC.rumor = "diligence"]]
+</div>
+<div class="indent note">
+ New slaves will @@.hotpink;hate you less,@@ since it will be known that you worked hard to earn your position.
+</div>
+
+<div>
+ [[The remorseless use of force|Takeover Target][$PC.rumor = "force"]]
+</div>
+<div class="indent note">
+ New slaves @@.gold;will fear you more,@@ since rumors about your violent takeover will inevitably circulate.
+</div>
+
+<div>
+ [[Clever social engineering|Takeover Target][$PC.rumor = "social engineering"]]
+</div>
+<div class="indent note">
+ Start with the @@.green;first societal option unlocked,@@ since you manipulated the arcology's citizens.
+</div>
+
+<div>
+ [[Blind luck|Takeover Target][$PC.rumor = "luck"]]
+</div>
+<div class="indent note">
+ Start with a @@.green;good reputation,@@ since the story of your unlikely accession will be famous.
+</div>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 91b712e6413..5dfdb71242e 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -1,26 +1,28 @@
:: Starting Girls [nobr]
-<<if $showStartingGirlsExplanation == 1>>
- You're no stranger to the Free Cities, which means you're no stranger to slavery. If you wish, you can bring slaves from your past life with you to your arcology. You have <<print cashFormat($cash)>>; you can spend it on slaves here, or bring it with you to start the game. Slaves created here will be much cheaper than if they were purchased on the market.
- <<if ($PC.dick != 0) && ($PC.vagina != -1) && ($seeDicks != 0 || $makeDicks == 1)>>
- Since you have both a penis and a vagina yourself, you've obviously had access to a source of advanced surgery and organ farming. @@.springgreen;Slaves get a smaller cost increase here for having both penises and vaginas, and for having both testicles and ovaries.@@
- <</if>>
- <<if $PC.career == "slaver">>
- Since you personally saw to the capture, breaking and or training of these slaves, @@.springgreen;they cost half of what they normally would have here.@@
- <</if>>
- <<if $slaves.length == 1>>
- You have one slave already committed.
- <<elseif $slaves.length > 1>>
- You have $slaves.length slaves already committed.
- <</if>>
-<<else>>
- You have <<print cashFormat($cash)>> remaining and have
- <<if $slaves.length == 1>>
- one slave already committed.
- <<elseif $slaves.length > 1>>
- $slaves.length slaves already committed.
+<p>
+ <<if $showStartingGirlsExplanation == 1>>
+ You're no stranger to the Free Cities, which means you're no stranger to slavery. If you wish, you can bring slaves from your past life with you to your arcology. You have <<print cashFormat($cash)>>; you can spend it on slaves here, or bring it with you to start the game. Slaves created here will be much cheaper than if they were purchased on the market.
+ <<if ($PC.dick != 0) && ($PC.vagina != -1) && ($seeDicks != 0 || $makeDicks == 1)>>
+ Since you have both a penis and a vagina yourself, you've obviously had access to a source of advanced surgery and organ farming. @@.springgreen;Slaves get a smaller cost increase here for having both penises and vaginas, and for having both testicles and ovaries.@@
+ <</if>>
+ <<if $PC.career == "slaver">>
+ Since you personally saw to the capture, breaking and or training of these slaves, @@.springgreen;they cost half of what they normally would have here.@@
+ <</if>>
+ <<if $slaves.length == 1>>
+ You have one slave already committed.
+ <<elseif $slaves.length > 1>>
+ You have $slaves.length slaves already committed.
+ <</if>>
+ <<else>>
+ You have <<print cashFormat($cash)>> remaining and have
+ <<if $slaves.length == 1>>
+ one slave already committed.
+ <<elseif $slaves.length > 1>>
+ $slaves.length slaves already committed.
+ <</if>>
<</if>>
-<</if>>
+</p>
<<if $startingGirlCopied == 1>>
<<set _tempSlave = clone($activeSlave), $activeSlave = $slaveWithoutBonuses>>
@@ -135,8 +137,8 @@
<<set $activeSlave.slaveName = $activeSlave.birthName, $archetyped = 0>>
<</if>>
-__You are customizing this slave:__
-<br>
+<h3>You are customizing this slave:</h3>
+
<<if $activeSlave == 0>>
<<StartingGirlsWorkaround>>
<</if>>
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index 3c5cc2cd7e1..52a2a68166a 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -1,39 +1,46 @@
:: Takeover Target [nobr]
-Before you deploy the
-<<if $PC.rumor == "wealth">>
- financial reserves that
-<<elseif $PC.rumor == "diligence">>
- carefully constructed plan that
-<<elseif $PC.rumor == "force">>
- mercenaries and <<if $continent == "Europe">>//maskirovka//<<else>>cover plan<</if>> that
-<<elseif $PC.rumor == "social engineering">>
- clever social manipulation that
-<<else>>
- optimistic plan you hope
-<</if>>
-will allow you to take over an arcology, you need to select a target. There are a number of vulnerable arcologies that you could
-<<if $PC.rumor == "wealth">>
- attempt a hostile takeover of
-<<elseif $PC.rumor == "diligence">>
- work to take over
-<<elseif $PC.rumor == "force">>
- attack
-<<elseif $PC.rumor == "social engineering">>
- infiltrate
-<<else>>
- aspire to take over
-<</if>>
-with a reasonable chance of success. Free Cities are volatile places, even compared to the troubled state of the rest of the world. There are always arcologies whose owners are on the brink of failure, and you could target one of them.
-<<if $PC.career == "arcology owner">>(Since you've @@.springgreen;owned an arcology before,@@ you identify more potential target arcologies than a novice might.)<</if>>
-Alternatively, arcologies are being built every day, and their owners' control is often uncertain. @@.orange;Which arcology will you target?@@
-<br><br>
+<p>
+ Before you deploy the
+ <<if $PC.rumor == "wealth">>
+ financial reserves that
+ <<elseif $PC.rumor == "diligence">>
+ carefully constructed plan that
+ <<elseif $PC.rumor == "force">>
+ mercenaries and <<if $continent == "Europe">>//maskirovka//<<else>>cover plan<</if>> that
+ <<elseif $PC.rumor == "social engineering">>
+ clever social manipulation that
+ <<else>>
+ optimistic plan you hope
+ <</if>>
+ will allow you to take over an arcology, you need to select a target. There are a number of vulnerable arcologies that you could
+ <<if $PC.rumor == "wealth">>
+ attempt a hostile takeover of
+ <<elseif $PC.rumor == "diligence">>
+ work to take over
+ <<elseif $PC.rumor == "force">>
+ attack
+ <<elseif $PC.rumor == "social engineering">>
+ infiltrate
+ <<else>>
+ aspire to take over
+ <</if>>
+ with a reasonable chance of success. Free Cities are volatile places, even compared to the troubled state of the rest of the world. There are always arcologies whose owners are on the brink of failure, and you could target one of them.
+ <<if $PC.career == "arcology owner">>(Since you've @@.springgreen;owned an arcology before,@@ you identify more potential target arcologies than a novice might.)<</if>>
+ Alternatively, arcologies are being built every day, and their owners' control is often uncertain.
+ <span class="intro question">
+ Which arcology will you target?
+ </span>
+</p>
+
[[A newly constructed arcology|Terrain Intro][$targetArcology.type = "New"]]
-<br>
-//With many new arcologies being constructed, you will be able to select which area of the world and type of Free City you'd like your target arcology to be located in.//
-<br>
-//Recommended for new players.//
+<div class="indent note">
+ With many new arcologies being constructed, you will be able to select which area of the world and type of Free City you'd like your target arcology to be located in.
+</div>
+<div class="indent note">
+ Recommended for new players.
+</div>
<hr style="margin:0">
<<set _arcologyTypes = ["ArabianRevivalist", "AssetExpansionist", "AztecRevivalist", "BodyPurist", "ChattelReligionist", "ChineseRevivalist", "EdoRevivalist", "EgyptianRevivalist", "Eugenics", "HedonisticDecadence", "IntellectualDependency", "MaturityPreferentialist", "Multiculturalist", "Pastoralist", "Paternalist", "PetiteAdmiration", "PhysicalIdealist", "Repopulationist", "RomanRevivalist", "SlaveProfessionalism", "SlimnessEnthusiast", "StatuesqueGlorification", "Subjugationist", "Supremacist", "TransformationFetishist", "YouthPreferentialist"]>>
<<if $seeDicks != 0>><<set _arcologyTypes.push("GenderRadicalist")>><</if>>
@@ -147,6 +154,7 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<set $targetArcology.continent = _continents.random()>>
<<set _targetArcologies.push($targetArcology)>>
<</for>>
+
<<for $i = 0; $i < _targetArcologies.length; $i++>>
<<print "[[_targetArcologies[$i].name|Terrain Intro][$targetArcology = _targetArcologies[" + $i + "]]]">> is an established arcology located in a Free City
<<if _targetArcologies[$i].terrain == "urban">>
@@ -161,70 +169,81 @@ Alternatively, arcologies are being built every day, and their owners' control i
in the middle of the ocean.
<</if>>
<<if _targetArcologies[$i].prosperity >= 60>>
- <br>
- It is unusually prosperous for a vulnerable arcology.
+ <div class="indent">
+ It is unusually prosperous for a vulnerable arcology.
+ </div>
<<elseif _targetArcologies[$i].prosperity <= 40>>
- <br>
- It has little economic prosperity and is vulnerable.
+ <div class="indent">
+ It has little economic prosperity and is vulnerable.
+ </div>
<</if>>
<<if _targetArcologies[$i].citizens > 0>>
- <br>
- It has an unusually high ratio of citizens to sex slaves, increasing demand for sexual services.
+ <div class="indent">
+ It has an unusually high ratio of citizens to sex slaves, increasing demand for sexual services.
+ </div>
<<elseif _targetArcologies[$i].citizens < 0>>
- <br>
- It has an unusually low ratio of citizens to sex slaves, reducing demand for sexual services.
+ <div class="indent">
+ It has an unusually low ratio of citizens to sex slaves, reducing demand for sexual services.
+ </div>
<</if>>
- <br>
- Its society
- <<if _targetArcologies[$i].FSProgress >= 50>>
- has advanced towards
- <<elseif _targetArcologies[$i].FSProgress >= 30>>
- has devoted resources to
- <<else>>
- has just begun to adopt
- <</if>>
- <<switch _targetArcologies[$i].type>>
- <<case "Supremacist">>@@.orange;Supremacy of the _targetArcologies[$i].race<<if _targetArcologies[$i].race != "mixed race">> race<</if>>.@@
- <<case "Subjugationist">>@@.orange;Subjugation of the _targetArcologies[$i].race<<if _targetArcologies[$i].race != "mixed race">> race<</if>>.@@
- <<case "GenderRadicalist">>@@.orange;Gender Radicalism,@@ a movement that supports feminization of slavegirls with dicks.
- <<case "GenderFundamentalist">>@@.orange;Gender Fundamentalism,@@ a reaction to modern libertinism that seeks to reinforce gender roles.
- <<case "Paternalist">>@@.orange;Paternalism,@@ an optimistic strain of slavery that protects and improves slaves.
- <<case "Degradationist">>@@.orange;Degradationism,@@ an extreme branch of modern slavery that treats slaves as subhuman.
- <<case "AssetExpansionist">>@@.orange;Asset Expansionism,@@ a societal preoccupation with expansion of body parts, especially breasts.
- <<case "SlimnessEnthusiast">>@@.orange;Slimness Enthusiasm,@@ an aesthetic movement that fetishizes the lithe female form.
- <<case "TransformationFetishist">>@@.orange;Transformation Fetishism,@@ a focus on implants and other kinds of surgical alteration.
- <<case "BodyPurist">>@@.orange;Body Purism,@@ a reaction to extreme surgical fetishism that prefers bodies grown biologically.
- <<case "MaturityPreferentialist">>@@.orange;Maturity Preferentialism,@@ an appetite for mature slaves based on MILF fetishism.
- <<case "YouthPreferentialist">>@@.orange;Youth Preferentialism,@@ which focuses on youth and virginity in slaves.
- <<case "Pastoralist">>@@.orange;Pastoralism,@@ an appetite for products of the human body, especially milk.
- <<case "PhysicalIdealist">>@@.orange;Physical Idealism,@@ an aspirational movement which fetishizes muscle and physical fitness.
- <<case "ChattelReligionist">>@@.orange;Chattel Religionism,@@ a religious revival in the context of modern slavery.
- <<case "RomanRevivalist">>@@.orange;Roman Revivalism,@@ which seeks to recreate the glory that was ancient Rome.
- <br>
- It has an established lingua franca: Latin.
- <<case "AztecRevivalist">>@@.orange;Aztec Revivalism,@@ which aspires to reach the heights of the Aztec Empire at it's peak.
- <br>
- It has an established lingua franca: Nahuatl.
- <<case "EgyptianRevivalist">>@@.orange;Egyptian Revivalism,@@ a movement to rebuild the monuments and greatness of ancient Egypt.
- <br>
- It has an established lingua franca: Ancient Egyptian.
- <<case "EdoRevivalist">>@@.orange;Edo Revivalism,@@ an insular movement with a focus on the cultural superiority of old Japan.
- <br>
- It has an established lingua franca: Japanese.
- <<case "ArabianRevivalist">>@@.orange;Arabian Revivalism,@@ a melding of Arabian history and recent mythology of the Near East.
- <br>
- It has an established lingua franca: Arabic.
- <<case "ChineseRevivalist">>@@.orange;Chinese Revivalism,@@ which modernizes the assumed superiority of the Middle Kingdom.
- <br>
- It has an established lingua franca: Chinese.
- <<case "Repopulationist">>@@.orange;Repopulationism,@@ the belief that the key to humanity's survival is a child in every fertile womb.
- <<case "Eugenics">>@@.orange;Eugenics,@@ the belief that the world's failings were caused by rampant breeding of the inferior, and as such, only society's best should reproduce.
- <<case "HedonisticDecadence">>@@.orange;Decadent Hedonism,@@ a movement to embody life's pleasures, particularly eating and sex.
- <<case "IntellectualDependency">>@@.orange;Intellectual Dependency,@@ an appetite for horny, stupid slaves based on bimbo fetishism.
- <<case "SlaveProfessionalism">>@@.orange;Slave Professionalism,@@ a strain of slavery that seeks smart, skilled, elegant slaves to hone to perfection.
- <<case "PetiteAdmiration">>@@.orange;Petite Admiration,@@ which prefers its slaves to stand heads and shoulders shorter than their masters.
- <<case "StatuesqueGlorification">>@@.orange;Statuesque Glorification,@@ an obsession, both sexual and otherwise, over height.
- <<default>>@@.orange;Multiculturalism,@@ a celebration of the total liberty that was the original purpose of the Free Cities.
- <</switch>>
+ <div class="indent">
+ Its society
+ <<if _targetArcologies[$i].FSProgress >= 50>>
+ has advanced towards
+ <<elseif _targetArcologies[$i].FSProgress >= 30>>
+ has devoted resources to
+ <<else>>
+ has just begun to adopt
+ <</if>>
+ <<switch _targetArcologies[$i].type>>
+ <<case "Supremacist">>@@.orange;Supremacy of the _targetArcologies[$i].race<<if _targetArcologies[$i].race != "mixed race">> race<</if>>.@@
+ <<case "Subjugationist">>@@.orange;Subjugation of the _targetArcologies[$i].race<<if _targetArcologies[$i].race != "mixed race">> race<</if>>.@@
+ <<case "GenderRadicalist">>@@.orange;Gender Radicalism,@@ a movement that supports feminization of slavegirls with dicks.
+ <<case "GenderFundamentalist">>@@.orange;Gender Fundamentalism,@@ a reaction to modern libertinism that seeks to reinforce gender roles.
+ <<case "Paternalist">>@@.orange;Paternalism,@@ an optimistic strain of slavery that protects and improves slaves.
+ <<case "Degradationist">>@@.orange;Degradationism,@@ an extreme branch of modern slavery that treats slaves as subhuman.
+ <<case "AssetExpansionist">>@@.orange;Asset Expansionism,@@ a societal preoccupation with expansion of body parts, especially breasts.
+ <<case "SlimnessEnthusiast">>@@.orange;Slimness Enthusiasm,@@ an aesthetic movement that fetishizes the lithe female form.
+ <<case "TransformationFetishist">>@@.orange;Transformation Fetishism,@@ a focus on implants and other kinds of surgical alteration.
+ <<case "BodyPurist">>@@.orange;Body Purism,@@ a reaction to extreme surgical fetishism that prefers bodies grown biologically.
+ <<case "MaturityPreferentialist">>@@.orange;Maturity Preferentialism,@@ an appetite for mature slaves based on MILF fetishism.
+ <<case "YouthPreferentialist">>@@.orange;Youth Preferentialism,@@ which focuses on youth and virginity in slaves.
+ <<case "Pastoralist">>@@.orange;Pastoralism,@@ an appetite for products of the human body, especially milk.
+ <<case "PhysicalIdealist">>@@.orange;Physical Idealism,@@ an aspirational movement which fetishizes muscle and physical fitness.
+ <<case "ChattelReligionist">>@@.orange;Chattel Religionism,@@ a religious revival in the context of modern slavery.
+ <<case "RomanRevivalist">>@@.orange;Roman Revivalism,@@ which seeks to recreate the glory that was ancient Rome.
+ <div class="indent">
+ It has an established lingua franca: Latin.
+ </div>
+ <<case "AztecRevivalist">>@@.orange;Aztec Revivalism,@@ which aspires to reach the heights of the Aztec Empire at it's peak.
+ <div class="indent">
+ It has an established lingua franca: Nahuatl.
+ </div>
+ <<case "EgyptianRevivalist">>@@.orange;Egyptian Revivalism,@@ a movement to rebuild the monuments and greatness of ancient Egypt.
+ <div class="indent">
+ It has an established lingua franca: Ancient Egyptian.
+ </div>
+ <<case "EdoRevivalist">>@@.orange;Edo Revivalism,@@ an insular movement with a focus on the cultural superiority of old Japan.
+ <div class="indent">
+ It has an established lingua franca: Japanese.
+ </div>
+ <<case "ArabianRevivalist">>@@.orange;Arabian Revivalism,@@ a melding of Arabian history and recent mythology of the Near East.
+ <div class="indent">
+ It has an established lingua franca: Arabic.
+ </div>
+ <<case "ChineseRevivalist">>@@.orange;Chinese Revivalism,@@ which modernizes the assumed superiority of the Middle Kingdom.
+ <div class="indent">
+ It has an established lingua franca: Chinese.
+ </div>
+ <<case "Repopulationist">>@@.orange;Repopulationism,@@ the belief that the key to humanity's survival is a child in every fertile womb.
+ <<case "Eugenics">>@@.orange;Eugenics,@@ the belief that the world's failings were caused by rampant breeding of the inferior, and as such, only society's best should reproduce.
+ <<case "HedonisticDecadence">>@@.orange;Decadent Hedonism,@@ a movement to embody life's pleasures, particularly eating and sex.
+ <<case "IntellectualDependency">>@@.orange;Intellectual Dependency,@@ an appetite for horny, stupid slaves based on bimbo fetishism.
+ <<case "SlaveProfessionalism">>@@.orange;Slave Professionalism,@@ a strain of slavery that seeks smart, skilled, elegant slaves to hone to perfection.
+ <<case "PetiteAdmiration">>@@.orange;Petite Admiration,@@ which prefers its slaves to stand heads and shoulders shorter than their masters.
+ <<case "StatuesqueGlorification">>@@.orange;Statuesque Glorification,@@ an obsession, both sexual and otherwise, over height.
+ <<default>>@@.orange;Multiculturalism,@@ a celebration of the total liberty that was the original purpose of the Free Cities.
+ <</switch>>
+ </div>
<hr style="margin:0">
<</for>>
\ No newline at end of file
--
GitLab