From 33ec1a603469144396b5665c9ff042364763655b Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 24 Apr 2020 03:50:40 -0400
Subject: [PATCH] Tweaks
---
src/events/intro/introSummary.tw | 13 +-
src/npc/startingGirls/startingGirls.tw | 216 +++++++++++++------------
2 files changed, 122 insertions(+), 107 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 25f164f96db..6940e8908cf 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -589,9 +589,9 @@ You may review your settings before clicking "Continue" to begin.<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.
+ When enslaving Royalty, they will have nationalities and surnames of the real royalties.
<<option 0 "Random dynasties">>
- When getting an event for enslaving the members of the royalty, their nationalities and surnames will be random.
+ When enslaving Royalty, their nationalities and surnames will be random.
<</options>>
<<options $allowMaleSlaveNames>>
@@ -612,6 +612,15 @@ You may review your settings before clicking "Continue" to begin.<br>
Names will always be ''Surname Name''.
<</options>>
+ <<options $limitFamilies>>
+ <<option 1 "Restrict family size">>
+ Vanilla emulation.
+ <<option 0 "Allow extended families">>
+ Extended family mode.
+ <<comment>>
+ Controls acquisition of additional relatives, by means other than birth, for slaves with families.
+ <</options>>
+
<<options $showDistantRelatives>>
<<option 1 "Enable distant relatives">>
Distant relatives ''will'' be tracked.
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index a72ad04ffec..b6360144eb7 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -25,25 +25,122 @@
</p>
<p>
- <span class="major-link">
- <<link "Refresh" "Starting Girls">> <</link>>
- </span>
+ <span id="headerLinks">
+ <span class="major-link">
+ <<link "Refresh" "Starting Girls">> <</link>>
+ </span>
+
+ | <<link "Randomize career" "Starting Girls">>
+ <<set $activeSlave.career = randomCareer($activeSlave)>>
+ <</link>>
+
+ | <<link "Randomize name" "Starting Girls">>
+ <<run nationalityToName($activeSlave)>>
+ <<set $activeSlave.slaveName = $activeSlave.birthName>>
+ <</link>>
- | <<link "Randomize career" "Starting Girls">>
- <<set $activeSlave.career = randomCareer($activeSlave)>>
- <</link>>
+ | <<link "Start over with a random slave" "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate()>>
+ <</link>>
- | <<link "Randomize name" "Starting Girls">>
- <<run nationalityToName($activeSlave)>>
- <<set $activeSlave.slaveName = $activeSlave.birthName>>
- <</link>>
+ | <<link "Start over by selecting an archetype">>
+ <<replace "#headerLinks">>
+ <div class="note">
+ Convenient combinations of slave attributes
+ </div>
+ <div class="indent">
+ <<link "Irish Rose" "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate({ nationality: "Irish", race: "white" })>>
+ <<set $activeSlave.eye.origColor = "green", $activeSlave.origSkin = "fair", $activeSlave.origHColor = "red", $activeSlave.markings = "heavily freckled">>
+ <</link>>
+ <span class="note">
+ A beautiful flower from the Emerald Isle
+ </span>
+ </div>
+
+ <div class="indent">
+ <<link "Cali Girl" "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate({ nationality: "American" })>>
+ <<set $activeSlave.eye.origColor = "blue", $activeSlave.skin = "sun tanned", $activeSlave.override_Skin = 1, $activeSlave.origHColor = "blonde", $activeSlave.markings = "none", $activeSlave.face = 95, $activeSlave.muscles = 20, $activeSlave.weight = -20, $activeSlave.height = Math.round(Height.forAge(190, $activeSlave))>>
+ <</link>>
+ <span class="note">
+ Tall, taut, and tan
+ </span>
+ </div>
+
+ <div class="indent">
+ <<link "Novice" "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate()>>
+ <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0>>
+ <</link>>
+ <span class="note">
+ Train your own and save
+ </span>
+ </div>
+
+ <div class="indent">
+ <<link "Head Girl Prospect" "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate({ minAge: 36, maxAge: 44 })>>
+ <<set $activeSlave.career = setup.HGCareers.random(), $activeSlave.intelligence = 70, $activeSlave.intelligenceImplant = 0>>
+ <</link>>
+ <span class="note">
+ Inexpensive potential to become a great right hand woman
+ </span>
+ </div>
+
+ <<if $seeExtreme != 0>>
+ <div class="indent">
+ <<link "Wellspring" "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate({ minAge: 18, maxAge: 18 })>>
+ <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health.condition = 10, $activeSlave.intelligence = -100, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.prostate = 1, $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
+ <</link>>
+ <span class="note">
+ Capable of producing all kinds of useful fluids
+ </span>
+ </div>
+
+ <div class="indent">
+ <<link "Onahole" "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate()>>
+ <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetish = "mindbroken", $activeSlave.voice = 0, $activeSlave.hears = 0>>
+ <<run removeLimbs($activeSlave, "all"), eyeSurgery($activeSlave, "both", "normal")>>
+ <</link>>
+ <span class="note">
+ A living cocksleeve
+ </span>
+ </div>
+ <</if>>
+
+ <div class="indent">
+ <<link "Back" "Starting Girls">> <</link>>
+ </div>
+ <</replace>>
+ <</link>>
- | <<link "Start over with a random slave" "Starting Girls">>
- <<set $activeSlave = App.StartingGirls.generate()>>
- <</link>>
+ | <<link "Start over by selecting a nationality">>
+ <<replace "#headerLinks">>
+ <div>
+ <<for _sg = 0; _sg < setup.baseNationalities.length; _sg++>>
+ <<set _nation = setup.baseNationalities[_sg]>>
+ <<capture _nation>>
+ <<link _nation "Starting Girls">>
+ <<set $activeSlave = App.StartingGirls.generate({ nationality: _nation })>>
+ <</link>>
+ <</capture>>
+ <<if _sg < setup.baseNationalities.length-1>>
+ |
+ <</if>>
+ <</for>>
+ </div>
- | [[Take control of your arcology|Acquisition]]
+ <div>
+ <<link "Back" "Starting Girls">> <</link>>
+ </div>
+ <</replace>>
+ <</link>>
+ | [[Take control of your arcology|Acquisition]]
+ </span>
<hr>
</p>
@@ -1593,97 +1690,6 @@
</div>
<</if>>
- <h3>Start over by selecting an archetype:</h3>
- <div class="note">
- Convenient combinations of slave attributes
- </div>
- <div class="indent">
- <<link "Irish Rose">>
- <<set $activeSlave = App.StartingGirls.generate({ nationality: "Irish", race: "white" })>>
- <<set $activeSlave.eye.origColor = "green", $activeSlave.origSkin = "fair", $activeSlave.origHColor = "red", $activeSlave.markings = "heavily freckled">>
- <<goto "Starting Girls">>
- <</link>>
- <span class="note">
- A beautiful flower from the Emerald Isle
- </span>
- </div>
-
- <div class="indent">
- <<link "Cali Girl">>
- <<set $activeSlave = App.StartingGirls.generate({ nationality: "American" })>>
- <<set $activeSlave.eye.origColor = "blue", $activeSlave.skin = "sun tanned", $activeSlave.override_Skin = 1, $activeSlave.origHColor = "blonde", $activeSlave.markings = "none", $activeSlave.face = 95, $activeSlave.muscles = 20, $activeSlave.weight = -20, $activeSlave.height = Math.round(Height.forAge(190, $activeSlave))>>
- <<goto "Starting Girls">>
- <</link>>
- <span class="note">
- Tall, taut, and tan
- </span>
- </div>
-
- <div class="indent">
- <<link "Novice">>
- <<set $activeSlave = App.StartingGirls.generate()>>
- <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0>>
- <<goto "Starting Girls">>
- <</link>>
- <span class="note">
- Train your own and save
- </span>
- </div>
-
- <div class="indent">
- <<link "Head Girl Prospect">>
- <<set $activeSlave = App.StartingGirls.generate({ minAge: 36, maxAge: 44 })>>
- <<set $activeSlave.career = setup.HGCareers.random(), $activeSlave.intelligence = 70, $activeSlave.intelligenceImplant = 0>>
- <<goto "Starting Girls">>
- <</link>>
- <span class="note">
- Inexpensive potential to become a great right hand woman
- </span>
- </div>
-
- <<if $seeExtreme != 0>>
- <div class="indent">
- <<link "Wellspring">>
- <<set $activeSlave = App.StartingGirls.generate({ minAge: 18, maxAge: 18 })>>
- <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health.condition = 10, $activeSlave.intelligence = -100, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.prostate = 1, $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
- <<goto "Starting Girls">>
- <</link>>
- <span class="note">
- Capable of producing all kinds of useful fluids
- </span>
- </div>
-
- <div class="indent">
- <<link "Onahole">>
- <<set $activeSlave = App.StartingGirls.generate()>>
- <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetish = "mindbroken", $activeSlave.voice = 0, $activeSlave.hears = 0>>
- <<run removeLimbs($activeSlave, "all"), eyeSurgery($activeSlave, "both", "normal")>>
- <<goto "Starting Girls">>
- <</link>>
- <span class="note">
- A living cocksleeve
- </span>
- </div>
- <</if>>
-
- <p>
- <h3>Start over by selecting a nationality:</h3>
- <div>
- <<for _sg = 0; _sg < setup.baseNationalities.length; _sg++>>
- <<set _nation = setup.baseNationalities[_sg]>>
- <<capture _nation>>
- <<link _nation>>
- <<set $activeSlave = App.StartingGirls.generate({ nationality: _nation })>>
- <<goto "Starting Girls">>
- <</link>>
- <</capture>>
- <<if _sg < setup.baseNationalities.length-1>>
- |
- <</if>>
- <</for>>
- </div>
- </p>
-
</div>
</div>
--
GitLab