From ec5c9130ef542a35e0b613069e2fa669e2d50cc8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 4 Jul 2018 18:25:13 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++
src/events/intro/pcExperienceIntro.tw | 40 +++++++---------
src/events/intro/pcRumorIntro.tw | 4 +-
src/init/storyInit.tw | 1 +
src/pregmod/fFeet.tw | 8 ++--
src/uncategorized/RESS.tw | 4 +-
src/uncategorized/barracks.tw | 2 +-
src/uncategorized/corporationDevelopments.tw | 50 ++++++++++----------
src/uncategorized/pRivalryActions.tw | 2 +-
src/uncategorized/reRecruit.tw | 2 +-
src/uncategorized/saBeYourHeadGirl.tw | 6 +--
src/uncategorized/saHormoneEffects.tw | 2 +-
src/uncategorized/scheduledEvent.tw | 7 +++
13 files changed, 70 insertions(+), 63 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d97d68ce860..03a762ff7ca 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,11 @@
7/03/2018
+ 16
+ -fixes
+ -more widget to JS conversions
+ -nipple vectors
+
15
-fixes and typo corrections
-Deepmurk's Battlearmor, Biyelgee Costume, Dirndl, Lederhosen, Long Qipao/Qipao (Nice), and Mounty Outfit
diff --git a/src/events/intro/pcExperienceIntro.tw b/src/events/intro/pcExperienceIntro.tw
index 35d181c21c8..80d1115abd7 100644
--- a/src/events/intro/pcExperienceIntro.tw
+++ b/src/events/intro/pcExperienceIntro.tw
@@ -10,21 +10,21 @@
<br>[[Idle wealth|PC Rumor Intro][$PC.career = "wealth"]]
<br> //Start with @@.yellowgreen;extra money@@.
<<if $showSecExp == 1>>
- However you will find it @@.red;harder to maintain authority@@ and @@.yellowgreen;propaganda hub upgrades will be cheaper@@ .
+ However, you will find it @@.red;harder to maintain authority,@@ but @@.yellowgreen;propaganda hub upgrades will be cheaper.@@
<</if>>
Your starting slaves will have two free levels of @@.cyan;sex skills@@ available.//
<br>[[Venture capitalism|PC Rumor Intro][$PC.career = "capitalist"]]
- <br> //You will be more @@.green;effective at business pursuits@@ .
+ <br> //You will be more @@.green;effective at business pursuits.@@
<<if $showSecExp == 1>>
- In addition @@.yellowgreen;propaganda hub upgrades will be cheaper@@ .
+ In addition, @@.yellowgreen;propaganda hub upgrades will be cheaper.@@
<</if>>
Your starting slaves will have a free level of @@.cyan;prostitution skill@@ available.//
<br>[[Private military work|PC Rumor Intro][$PC.career = "mercenary"]]
<br> //You retain mercenary contacts
<<if $showSecExp == 1>>
- and your security skills will make it @@.green;easier to keep the arcology safe@@. Also @@.yellowgreen;security HQ upgrades will be cheaper@@ .
+ and your security skills will make it @@.green;easier to keep the arcology safe.@@ Also, @@.yellowgreen;security HQ upgrades will be cheaper.@@
<<else>>
and security skills.
<</if>>
@@ -33,48 +33,42 @@
<br>[[Slaving|PC Rumor Intro][$PC.career = "slaver"]]
<br> //Your slave breaking experience will be useful.
<<if $showSecExp == 1>>
- You will find that authority will be @@.green;easier to maintain@@ and @@.yellowgreen;security HQ upgrades will be cheaper@@.
+ You will find that authority will be @@.green;easier to maintain@@ and @@.yellowgreen;security HQ upgrades will be cheaper.@@
<</if>>
Your starting slaves will have free @@.hotpink;devotion@@ available.//
<br>[[Arcology engineering|PC Rumor Intro][$PC.career = "engineer"]]
- <br> //@@.yellowgreen;Upgrading the arcology will be cheaper@@. Also, the arcology will start with @@.yellowgreen;basic economic upgrades@@ already installed.//
+ <br> //@@.yellowgreen;Upgrading the arcology will be cheaper.@@ Also, the arcology will start with @@.yellowgreen;basic economic upgrades@@ already installed.//
<br>[[Slave surgery|PC Rumor Intro][$PC.career = "medicine"]]
- <br> //Surgery will be @@.yellowgreen;cheaper@@ and @@.green;healthier@@ and @@.yellowgreen;drug upgrades will be cheaper@@. Your starting slaves will have free implants available.//
+ <br> //Surgery will be @@.yellowgreen;cheaper@@ and @@.green;healthier@@ and @@.yellowgreen;drug upgrades will be cheaper.@@ Your starting slaves will have free implants available.//
<br>[[Minor celebrity|PC Rumor Intro][$PC.career = "celebrity"]]
- <br> //Start with @@.green;extra reputation@@.
+ <br> //Start with @@.green;extra reputation.@@
<<if $showSecExp == 1>>
- In addition @@.yellowgreen;propaganda hub upgrades will be cheaper@@.
+ In addition, @@.yellowgreen;propaganda hub upgrades will be cheaper.@@
<</if>>
Your starting slaves will have a free level of @@.cyan;entertainment skill@@ available.//
<br>[[High class escort|PC Rumor Intro][$PC.career = "escort"]]
- <br> //As an ex-whore, you will find it @@.red;hard to maintain reputation@@.
- <<if $showSecExp == 1>>
- @@.red;In addition to authority@@.
- <</if>>
- Your starting slaves will have a free level of @@.cyan;sex skills@@ available, along with a free level of @@.cyan;entertainment and prostitution@@ .//
+ <br> //As an ex-whore, you will find it @@.red;hard to maintain reputation@@<<if $showSecExp == 1>>, @@.red;in addition to authority@@<</if>>.
+ Your starting slaves will have a free level of @@.cyan;sex skills@@ available, along with a free level of @@.cyan;entertainment and prostitution.@@//
<br>[[Servant|PC Rumor Intro][$PC.career = "servant"]]
- <br> //As an ex-servant, you will find it @@.red;hard to maintain reputation@@.
- <<if $showSecExp == 1>>
- @@.red;In addition to authority.@@
- <</if>>
- You know how to @@.yellowgreen;lower your upkeep@@, but @@.red;not conduct business@@. Your starting slaves will have free @@.mediumaquamarine;trust@@ and @@.hotpink;devotion@@.//
+ <br> //As an ex-servant, you will find it @@.red;hard to maintain reputation@@<<if $showSecExp == 1>>, @@.red;in addition to authority@@<</if>>.
+ You know how to @@.yellowgreen;lower your upkeep@@, but @@.red;not much else@@. Your starting slaves will have free @@.mediumaquamarine;trust@@ and @@.hotpink;devotion.@@//
<br>[[Gang Leader|PC Rumor Intro][$PC.career = "gang"]]
<br> //As an ex-gang leader, you know how to haggle slaves.
<<if $showSecExp == 1>>
- In addition asserting your authority @@.green;will be easier@@ and @@.yellowgreen;security HQ upgrades will be cheaper@@.
+ In addition, asserting your authority @@.green;will be easier@@ and @@.yellowgreen;security HQ upgrades will be cheaper@@.
<</if>>
- However you will @@.red;find reputation quite hard@@ to maintain. Your starting slaves will be @@.green;fitter@@ and posses a free level of @@.cyan;combat skill@@ .//
+ However, you will @@.red;find reputation quite hard@@ to maintain. Your starting slaves will be @@.green;fitter@@ and possess a free level of @@.cyan;combat skill.@@//
<br>[[Incursion Specialist|PC Rumor Intro][$PC.career = "BlackHat"]]
- <br> //As an ex-hacker for hire, you know how to gain access computer systems and other devices. @@.green;Certain upgrades may be cheaper@@ , and you may find alternative approaches to problems.
+ <br> //As an ex-hacker for hire, you know how to gain access computer systems and other devices. @@.green;Certain upgrades will be cheaper@@ and you may find alternative approaches to problems.
<<if $showSecExp == 1>>
- However you will @@.red;find authority quite hard@@ to maintain.
+ However, you will @@.red;find authority quite hard@@ to maintain.
<</if>>
Your starting slaves will have a free level of @@.cyan;intelligence@@.//
diff --git a/src/events/intro/pcRumorIntro.tw b/src/events/intro/pcRumorIntro.tw
index bb5b050720e..d01cad0f242 100644
--- a/src/events/intro/pcRumorIntro.tw
+++ b/src/events/intro/pcRumorIntro.tw
@@ -5,9 +5,9 @@ Who you are is something that you will have to define for yourself through your
[[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.//
+ //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.//
+ //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"]]
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 507711362ab..5afea7f20ac 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1178,6 +1178,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $fcnn.push("...this year's Goat.cx award for outstanding orifice innovation goes to...")>>
<<set $fcnn.push("...public controversy over cannibalism. Decadence taken too far or an acceptable next step...")>>
<<set $fcnn.push("...sixth day of street cleaners' strike. Spokesman for the strikers: 'It's getting too nasty...")>>
+<<set $fcnn.push("...debuts new book, 'So Long, And Thanks For All The Dicks', in which the recently retired sex slaves tell-all about...")>>
/* HACKY EVENT WORKAROUNDS */
<<set $eventID = -1>>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index ce4b3d05878..20a1f2d9d02 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -234,7 +234,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
<<elseif ($activeSlave.devotion < -50)>>
$He strongly refuses, and you have to restrain $him to get $him to obey.
<<elseif ($activeSlave.devotion < -20)>>
- $He tries to refuse
+ $He tries to refuse, but decides it will just be easier to comply than risk punishment.
<<elseif ($activeSlave.devotion < 20)>>
$He doesn't seem eager to comply, but fears being punished enough to obey.
<<elseif ($activeSlave.devotion < 60)>>
@@ -425,9 +425,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even _belly belly with your massive load<<elseif $PC.balls >=1>> and _legs legs with your large load<</if>>.
<<elseif !canWalk($activeSlave)>>
<<if ($activeSlave.devotion < -50)>>
- You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp. $He is furious $his is now covered in cum $he can't easily reach to clean.
+ You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp. $He is furious that $he is now covered in cum $he can't easily reach to clean.
<<elseif ($activeSlave.devotion < -20)>>
- You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled as you started to orgasm and now shows a conflicted expression, as you are done using $he, but $his is now covered in cum $he can't easily reach to clean.
+ You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, but you are done using $him for now. $He is left covered in cum $he can't easily reach to clean.
<<elseif ($activeSlave.devotion < 20)>>
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief.
<<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>>
@@ -442,7 +442,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
<<elseif ($activeSlave.devotion < -50)>>
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp with a look of disgust.
<<elseif ($activeSlave.devotion < -20)>>
- You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled as you started to orgasm and now shows a conflicted expression, as you are done using $he, but $his is now covered in cum.
+ You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, as well as your cum, but you are done using $him for now.
<<elseif ($activeSlave.devotion < 20)>>
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief.
<<elseif ($activeSlave.devotion < 60 || $activeSlave.attrXY < 16 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index c1ebc733c99..0aec94238d0 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5452,9 +5452,9 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<</if>>
for a while, until you sense that she's on the edge of climax. Without warning, you lift the edge of the blankets and send a gust of cool air down her front and <<if $activeSlave.dick > 0>>right onto her cock<<else>>across her <<if $activeSlave.nipples != "fuckable">>hard<<else>>engorged<</if>> nipples<</if>>. She gasps at the sudden overstimulation and then orgasms very strongly, jerking against you
<<if !canTalk($activeSlave)>>
- and panting in lieu of an exclamation
+ and panting in lieu of an exclamation.
<<else>>
- and <<say>>ing "Oh" over and over again
+ and <<say>>ing "Oh" over and over again.
<</if>>
<<if $PC.dick == 1>>She clenches against your dick,<<if $PC.vagina == 1>> so hard that you can feel the rush of blood into your cunt,<</if>><<else>>She works your pussy harder,<</if>> getting you off in turn, and then rolls over to plant a whole-hearted kiss on your lips.
<<set $activeSlave.devotion += 4>>
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index 18d5b97f269..563371de212 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -8,7 +8,7 @@ The mercenaries you retain to protect $arcologies[0].name are housed in this sec
<<else>>
they don't resent an unannounced visit from their employer.
<</if>>
-As you enter the main bay of the armory, lined with modern arms and armor and a few muscular, scarred men and women looking after their gear or suiting up to stand post, you're greeted respectfully, with<<if $personalArms > 0 && $invasionVictory > 0>> jaunty salutes and<</if>> formal <<if $PC.title == 1>>"Sir"s.<<else>>"Ma'am"s<</if>><<if $personalArms > 0 && $invasionVictory > 0>>, but also with smiles and nods<</if>>.
+As you enter the main bay of the armory, lined with modern arms and armor and a few muscular, scarred men and women looking after their gear or suiting up to stand post, you're greeted respectfully, with<<if $personalArms > 0 && $invasionVictory > 0>> jaunty salutes and<</if>> formal <<if $PC.title == 1>>"Sir"s<<else>>"Ma'am"s<</if>><<if $personalArms > 0 && $invasionVictory > 0>>, but also with smiles and nods<</if>>.
<<if $mercenaries >= 3>>
Though few of the mercenaries are visible,
<<if $mercenaries >= 5>>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 5a8719724f1..1c0e5369f4c 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -165,7 +165,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 1000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<<if $personalShares-5000 > $publicShares>>
@@ -175,7 +175,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 5000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -185,7 +185,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 10000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(10000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(10000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -196,7 +196,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 15000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat."
+ <br>You sold <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat.
<</replace>>
<</link>>
<</if>>
@@ -207,7 +207,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 20000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly."
+ <br>You sold <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly.
<</replace>>
<</link>>
<</if>>
@@ -222,7 +222,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 1000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<<if $personalShares-5000 > $publicShares>>
@@ -231,7 +231,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 5000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -241,7 +241,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 10000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(10000)>> new shares for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@ driving the share price down slightly."
+ <br>The corporation issued <<print commaNum(10000)>> new shares for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@ driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -251,7 +251,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 15000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*random(96,98)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(15000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat."
+ <br>The corporation issued <<print commaNum(15000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat.
<</replace>>
<</link>>
<</if>>
@@ -260,7 +260,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 20000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(20000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly."
+ <br>The corporation issued <<print commaNum(20000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly.
<</replace>>
<</link>>
<</if>>
@@ -280,7 +280,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 1000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, from the corporation driving the share price down slightly."
+ <br>You purchased <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, from the corporation driving the share price down slightly.
<</replace>>
<</link>>
<<if $cash > 5000*$sharePrice>>
@@ -290,7 +290,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 5000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>You purchased <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, from the corporation driving the share price down slightly."
+ <br>You purchased <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, from the corporation driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -301,7 +301,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 10000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, from the corporation driving the share price down slightly."
+ <br>You purchased <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, from the corporation driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -312,7 +312,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 15000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, from the corporation driving the share price down somewhat."
+ <br>You purchased <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, from the corporation driving the share price down somewhat.
<</replace>>
<</link>>
<</if>>
@@ -323,7 +323,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 20000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, from the corporation driving the share price down significantly."
+ <br>You purchased <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, from the corporation driving the share price down significantly.
<</replace>>
<</link>>
<</if>>
@@ -339,7 +339,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 1000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly."
+ <br>You bought <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<<if $publicShares > 5000 && $cash >= 5000*$sharePrice>>
@@ -348,7 +348,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 5000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly."
+ <br>You bought <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -358,7 +358,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 10000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly."
+ <br>You bought <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -368,7 +368,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 15000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat."
+ <br>You bought <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat.
<</replace>>
<</link>>
<</if>>
@@ -378,7 +378,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 20000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly."
+ <br>You bought <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly.
<</replace>>
<</link>>
<</if>>
@@ -395,7 +395,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 1000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(1000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly."
+ <br>The corporation bought back <<print commaNum(1000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<<if $publicShares > 5000 && $corpCash >= 5000*$sharePrice>>
@@ -404,7 +404,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 5000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(5000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly."
+ <br>The corporation bought back <<print commaNum(5000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -414,7 +414,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 10000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(10000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly."
+ <br>The corporation bought back <<print commaNum(10000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -424,7 +424,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 15000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(15000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat."
+ <br>The corporation bought back <<print commaNum(15000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat.
<</replace>>
<</link>>
<</if>>
@@ -434,7 +434,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 20000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(20000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly."
+ <br>The corporation bought back <<print commaNum(20000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly.
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 21543ecdebd..705a07c2f4c 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3915,7 +3915,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<<if $mercenaries >= 3>>
<br><<link "Lock your rival down and let your mercs walk right in.">>
<<replace "#result">>
- While you hold your rival's arcology's system under your complete control. $assistantName finally reports to you in <<if $assistant == 0>>its<<else>>her<</if>> normal tones, "Team One reports
+ While you hold your rival's arcology's system under your complete control, $assistantName finally reports to you in <<if $assistant == 0>>its<<else>>her<</if>> normal tones, "Team One reports
<<switch $rivalryFS>>
<<case "Racial Subjugationism">>Racemixer
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index ea6a8e8e3c4..4d0c1b23309 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1771,7 +1771,7 @@ As you are heading back to your penthouse from inspecting a new line of sex shop
<<else>>
her body is ill-suited for childbirth and the unfortunate thing has lodged in her pelvis.
<</if>>
-Every push, every desperate contraction must be agonizing to her. Fortunately you know what to do, however, it will not come cheap. Hour after hour you work with the girl, her debt to you growing ever higher, until you finally manage to coax the newborn from her battered body. She smiles at her baby before losing consciousness, she is in really bad shape. Odds are her child will grow up an orphan, even if you call in her debt.
+Every push, every desperate contraction must be agonizing to her. Fortunately you know what to do, however, it will not come cheap. Hour after hour you work with the girl, her debt to you growing ever higher, until you finally manage to coax the newborn from her battered body. She smiles at her baby before losing consciousness; she is in really bad shape. Odds are her child will grow up an orphan, even if you call in her debt.
<<case "overwhelmed farmgirl">>
diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw
index 7ac54d3bcb1..24747489f9c 100644
--- a/src/uncategorized/saBeYourHeadGirl.tw
+++ b/src/uncategorized/saBeYourHeadGirl.tw
@@ -135,12 +135,12 @@
<<set $slaves[$i].fetishStrength += 4>>
<</if>>
<</if>>
- <<elseif $slaves[$i].fetishStrength <= random(20,60)>>
- The sheer variety of sexual situations she sees and participates in @@.pink;broaden her sexual interests@@ and incline her to take a dominant sexual role.
- <<set $slaves[$i].fetishStrength -= 4>>
<<elseif $slaves[$i].fetishStrength < 20>>
Having all the slaves look up to and obey her affects her sexuality, turning her into a @@.lightcoral;bit of a dominatrix.@@
<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishStrength = 20, $slaves[$i].fetishKnown = 1>>
+ <<elseif $slaves[$i].fetishStrength <= random(20,60)>>
+ The sheer variety of sexual situations she sees and participates in @@.pink;broaden her sexual interests@@ and incline her to take a dominant sexual role.
+ <<set $slaves[$i].fetishStrength -= 4>>
<</if>>
<<else>>
<<if random(1,3) == 1>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 6fe34e0608e..b7631b69971 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -71,7 +71,7 @@
<</if>>
<</if>>
-<<if $slaves[$i].physicalAge >= 18 || $loliGrow == 1>>
+<<if $slaves[$i].physicalAge >= 18 || $loliGrow == 1 || $slaves[$i].inducedNCS == 1>>
<<if Math.abs($slaves[$i].hormoneBalance) >= 50>>
<<if $slaves[$i].hormoneBalance >= 350>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 994b3e2f348..4234a2d2d6d 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -74,18 +74,25 @@
<<set $fcnn.push("...construction of shelters accelerated last quarter, due to fears...")>>
<<set $fcnn.push("...major drought across the entire hemisphere shows no signs of...")>>
<<set $fcnn.push("...medical organization offered no explanation, stating that...")>>
+ <<set $fcnn.push("...just ahead, FCNN Special Report: Immortality and You - Breakthroughs in 'Bodyswapping' technology and what they mean for...")>>
<<elseif $week == 50>>
<<set $fcnn.push("...tested a thermonuclear device of some five megatons last night...")>>
<<set $fcnn.push("...heavy fighting for the third week in the capital city of...")>>
<<set $fcnn.push("...economic recovery looking increasingly unlikely in the event of...")>>
<<set $fcnn.push("...complete exhaustion of safe water reserves across...")>>
<<set $fcnn.push("...climate refugees streamed across the border despite...")>>
+ <<set $fcnn.push("...released a statement today, explaining their refusal to intervene against the pillaging of several Free Cities in Northern...")>>
+ <<set $fcnn.push("...denies allegations of ordering last week's combined arms assault on the arcology known as...")>>
+ <<set $fcnn.push("...Coming Up: Ghost Cities - The truth about recent surge of depopulated metropolitan areas in...")>>
<<elseif $week == 70>>
<<set $fcnn.push("...second low-order nuclear detonation in the city of...")>>
<<set $fcnn.push("...total societal collapse induced by rising sea levels declared today in...")>>
<<set $fcnn.push("...likelihood of containing Influenza-M was downgraded to a lower...")>>
<<set $fcnn.push("...threatened immediate use of chemical weapons should those forces not withdraw...")>>
<<set $fcnn.push("...relief organizations unable to deal with casualties from nuclear exchange between...")>>
+ <<set $fcnn.push("...guerilla fighting intensifies in escalating proxy war between 'Paternalist' and 'Degredationist' Free Cities in the region of...")>>
+ <<set $fcnn.push("...Coming Up- FCNN Special Report about the unpreceded scale of slave insurrections across...")>>
+ <<set $fcnn.push("...invasive plant growth epidemic contested by persistent droughts in eastern...")>>
<<elseif $week == 90>>
<<set $fcnn = ["FCNN service has been temporarily suspended. Please stand by."]>>
<</if>>
--
GitLab