diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d5465cc6ee51a9bd9a6c2de1aacdfa2866e2ea7f..b444044b0d5b90b82002f9b341eae172e66cd550 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,16 @@
0.10.7.1-0.1.x
+4/02/2018
+
+ 21
+ -more nicknames
+ -more names then you'll ever want
+ -added neighber hacking options
+ -fixes
+ -typo corrections
+ -code cleanup
+
4/01/2018
20
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index c53dda0c2b945503a3940f283608f509c1000ba0..100604e003cc95a96a3801d43d1d106769870e5a 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -271,17 +271,17 @@
<<set setup.veryYoungCareers = ["a babysitter", "a beggar", "a beggar", "a cheerleader", "a child actress", "a child prostitute", "a child prostitute", "a child soldier", "a child soldier", "a club recruiter", "a cum dump", "a dropout", "a dropout", "a farmer's daughter", "a girl scout", "a girl scout", "a handmaiden", "a juvenile delinquent", "a juvenile delinquent", "a meat toilet", "a military brat", "a model-UN star", "a model", "a pageant star", "a paper girl", "a part-time farm laborer", "a pick-pocket", "a refugee", "a refugee", "a refugee", "a shrine maiden", "a street thug", "a street urchin", "a street urchin", "a street urchin", "a student council president", "a student from a boarding school", "a student from a private school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "an orphan", "an orphan", "an orphan", "an orphan", "an orphan", "being homeschooled by her parents", "captain of the kendo club", "from a lower class family", "from a lower class family", "from a lower class family", "from a middle class family", "from a middle class family", "from an upper class family", "homeless", "homeless", "homeless"]>> /* pregmod */
-<<set setup.youngCareers = ["a babysitter", "a ballerina", "a barista", "a bartender", "a beggar", "a camgirl", "a camp counselor", "a camwhore", "a cashier", "a cheerleader", "a cocktail waitress", "a cook", "a courier", "a criminal", "a cum dump", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a lifeguard", "a magician's assistant", "a maid", "a meat toilet", "a medical student", "a model", "a nurse", "a paramedic", "a party girl", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a reality show star", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a street performer", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a video game streamer", "a waitress", "a yoga instructor", "an air hostess", "an apprentice", "an arcade attendant", "an aspiring pop star", "an assassin", "an escort", "an exotic dancer", "an intern", "an office worker", "homeless", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.youngCareers = ["an artist", "a babysitter", "a ballerina", "a barista", "a bartender", "a beggar", "a camgirl", "a camp counselor", "a camwhore", "a cashier", "a cheerleader", "a cocktail waitress", "a cook", "a courier", "a criminal", "a cum dump", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a lifeguard", "a magician's assistant", "a maid", "a meat toilet", "a medical student", "a model", "a nurse", "a paramedic", "a party girl", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a reality show star", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a street performer", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a video game streamer", "a waitress", "a yoga instructor", "an air hostess", "an apprentice", "an arcade attendant", "an aspiring pop star", "an assassin", "an escort", "an exotic dancer", "an intern", "an office worker", "homeless", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
-<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a chemist", "a child actress", "a classical dancer", "a classical musician", "a coach", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a painter", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a sculptor", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an animator", "an air hostess", "an archaeologist", "an assassin", "an astronaut", "an economist", "an editor", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
+<<set setup.educatedCareers = ["an artist", "a ballerina", "a banker", "a business owner", "a chemist", "a child actress", "a classical dancer", "a classical musician", "a coach", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a painter", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a sculptor", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an animator", "an air hostess", "an archaeologist", "an assassin", "an astronaut", "an economist", "an editor", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
-<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beekeeper", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camp counselor", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a chiropractor", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a hotel manager", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a roadie", "a rodeo star", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a stuntwoman", "a switchboard operator", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a whaler", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an exterminator", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.uneducatedCareers = ["an artist", "a baker", "a barber", "a barista", "a bartender", "a beekeeper", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camp counselor", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a chiropractor", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a hotel manager", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a roadie", "a rodeo star", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a stuntwoman", "a switchboard operator", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a whaler", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an exterminator", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
<<set setup.gratefulCareers = ["a beggar", "a peddler", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
<<set setup.menialCareers = ["a babysitter", "a bus driver", "a butler", "a cashier", "a chauffeur", "a construction worker", "a cook", "a courier", "a delivery woman", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a messenger", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a producer", "a programmer", "a ride attendant", "a roadie", "a service worker", "a student from a private school", "a student from a public school", "a student", "a taxi driver", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "an intern", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>>
-<<set setup.entertainmentCareers = ["a camgirl", "a camwhore", "a cheerleader", "a child actress", "a cocktail waitress", "a journalist", "a local news anchor", "a magician's assistant", "a party girl", "a racing driver", "a rodeo star", "a stage magician", "a street performer", "a stuntwoman", "a video game streamer", "a waitress", "a weathergirl", "a writer", "an actress"]>>
+<<set setup.entertainmentCareers = ["an artist", "a camgirl", "a camwhore", "a cheerleader", "a child actress", "a cocktail waitress", "a journalist", "a local news anchor", "a magician's assistant", "a party girl", "a racing driver", "a rodeo star", "a stage magician", "a street performer", "a stuntwoman", "a video game streamer", "a waitress", "a weathergirl", "a writer", "an actress"]>>
<<set setup.whoreCareers = ["a child prostitute", "a criminal", "a cum dump", "a Futanari Sister", "a juvenile delinquent", "a meat toilet", "a mistress", "a model", "a pageant star", "a pirate", "a porn star", "a prostitute", "a reality show star", "a saleswoman", "a serial divorcee", "a stripper", "a trophy wife", "an escort", "an exotic dancer"]>>
diff --git a/src/npc/fPCImpreg.tw b/src/npc/fPCImpreg.tw
index 575c5499272c858972fe4734eb676fa5c06cd799..d535f36e62ae618fbbd594af44e1258f64f9bc29 100644
--- a/src/npc/fPCImpreg.tw
+++ b/src/npc/fPCImpreg.tw
@@ -53,7 +53,7 @@ You call her over so you can
<</if>>
<<if ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.vagina == 0 || ($activeSlave.anus == 0 && $activeSlave.mpreg == 1))>>
- She cries with joy and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>, knowing that her first time will always be special to her. She spends the rest of the day cherishing her stomach. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@
+ She cries with joy and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her belly is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>, knowing that her first time will always be special to her. She spends the rest of the day cherishing her stomach. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@
<<if $activeSlave.mpreg == 1>>
<<set $activeSlave.anus = 1>>
<<else>>
@@ -61,10 +61,10 @@ You call her over so you can
<</if>>
<<set $activeSlave.devotion += 15>>
<<elseif ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
- She cries with joy and presents her fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for breeding. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day considering her own stomach with pride. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@
+ She cries with joy and presents her fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for breeding. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her belly is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day considering her own stomach with pride. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@
<<set $activeSlave.devotion += 10>>
<<elseif ($activeSlave.devotion > 20) && ($activeSlave.vagina == 0 || ($activeSlave.anus == 0 && $activeSlave.mpreg == 1))>>
- She accepts your orders without comment and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She gasps in shock when she feels your hot seed<<if $PC.balls == 3>> filling her until her stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day struggling with roiling emotions. Since she is already well broken, this new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@
+ She accepts your orders without comment and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She gasps in shock when she feels your hot seed<<if $PC.balls == 3>> filling her until her belly is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day struggling with roiling emotions. Since she is already well broken, this new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@
<<if $activeSlave.mpreg == 1>>
<<set $activeSlave.anus = 1>>
<<else>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 2ab2fb5c06710dca340f46b2a66472cc984f80f6..f2f53b49ca4b9de347a7d563c5d16009037549b6 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -56,7 +56,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
It looks like the random function chose the FCNN stream channel, and you've started watching in the middle of a news segment.
<<set $randShow = random(0,2)+1>>
<<if $randShow == 1 && $showOne > 3 || $showOne == 1>>
- The segment is being anchored by the middle aged Kirk McMahon, and he's joined by the ever-popular "Anchor Slave", Jules. She's got a nice figure, and the only thing she's wearing to cover her perky breasts is a pair of FCNN pasties. She has on a fine leather collar; the large gold charm hanging from the front seems to be a stylized emblem of a ship's anchor merged with a microphone. The pair seems to be discussing the recent actions and punishment of the reality show slave Slooty.
+ The segment is being anchored by the middle aged Kirk McMahon, and he's joined by the ever-popular "Anchor Slave", Jules. She's got a nice figure, and the only thing she's wearing to cover her perky breasts are a pair of FCNN pasties. She has on a fine leather collar; the large gold charm hanging from the front seems to be a stylized emblem of a ship's anchor merged with a microphone. The pair seem to be discussing the recent actions and punishment of the reality show slave Slooty.
<br><br>Jules seems to be quite passionate about the subject, the animated way she talks is causing her sizable tits to bounce all over the place. "It doesn't matter how famous or valuable that slut thinks she is, her behavior was just wrong on SO many levels. It makes all of us good slaves look bad. If you ask me, her master's choice of punishment fits the attention whore perfectly!"
<br><br>Kirk's face looks more than a little surprised, but you can't quite tell if it's an act or not. "You won't get any argument from me that she deserves to be punished... but getting chained up with an obedience collar and feeder system in the middle of Times Square, free for public use? A slum like Manhattan, she'll never <<if $seeExtreme == 0>><i>like</i><<else>>survive<</if>> the 10 day sentence!"
<br><br>Jules smiles. "That's exactly right Master McMahon, she's going to be <<if $seeExtreme == 0>><i>hugged until she smiles</i><<else>>fucked to death<</if>>. Her precious popularity in the old world will have the locals lined up all the way to New New Jersey waiting for their turn. I'd never question her master's decision, but if it were me, I'd pump her full of curatives and stimulants during the sentence. That way, she doesn't <<if $seeExtreme == 0>><i>smile</i><<else>>die or pass out<</if>> too soon. I think her master is being lenient after the way she badmouthed him in a live broadcast."
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index f9a74eb3de2358c7c608aee7d9f9880a998e7f4f..1a975a8f91a5a80372f4166aea9551ed6adeeb6c 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "The Black Market">>
-You board your VTOL bird for the trip the the current location of the particularly exclusive, and quite lucrative, Black Market knowing full well that the trip may take far longer than anticipated; the market frequently relocates to shake the unwanted attention it inevitably gains. It's far easier than paying off authorities, especially with how outrageous their demands have become with the decline of the Old World. You're greeting by a gruff bouncer, already fully aware of just who you are and your permission to be there. "Check your weapons - No firearms allowed inside.<<if $$Bodyguard != 0>> She may keep her blade, "he gesture to $Bodyguard.slaveName, "but keep in mind. If you cause us trouble, you will not be going home in one piece.<<if $Bodyguard.amp <= -4>>" He taps his clearly bionic arm. "Disable her weapons systems. I know what she is capable of.<</if>><</if>>"
+You board your VTOL bird for the trip the the current location of the particularly exclusive, and quite lucrative, Black Market knowing full well that the trip may take far longer than anticipated; the market frequently relocates to shake the unwanted attention it inevitably gains. It's far easier than paying off authorities, especially with how outrageous their demands have become with the decline of the Old World. You're greeting by a gruff bouncer, already fully aware of just who you are and your permission to be there. "Check your weapons - No firearms allowed inside.<<if $Bodyguard != 0>> She may keep her blade, "he gesture to $Bodyguard.slaveName, "but keep in mind. If you cause us trouble, you will not be going home in one piece.<<if $Bodyguard.amp <= -4>>" He taps his clearly bionic arm. "Disable her weapons systems. I know what she is capable of.<</if>><</if>>"
<br><br>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index a58c59390d1d351ff6f1930745cd3eaad3065370..ed811db0a9216c261e1df9781f74014f3839753c 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5797,6 +5797,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<AnalVCheck>>
<</if>>
<</if>>
+ The amount of air you can pull through the snorkel just isn't enough to facility the throes of your lovemaking, so by the time you're done, she's so exhausted she can barely float to the edge of the pool. Fortunately her lovely tits make for quite the floatation device, so you gently guide her to the shallow end<<if $PC.dick || $activeSlave.balls>>, leaving a trail of cum in your wake<</if>>.
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 7dbc4de068f2f341f20347c9aa7526614456f7d7..a6e2ad8770536ec29e0c116eb35ecd9e43dee835 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -2,11 +2,13 @@
<<set $nextLink = "Manage Arcology", $nextButton = "Back">>
-<<for $i = 0; $i < $arcologies.length; $i++>>
- <<if $arcologies[$i].direction == $activeArcology.direction>>
- <<set $arcologies[$i] = $activeArcology>><<break>>
- <</if>>
-<</for>>
+<<set _nei = $arcologies.findIndex(function(s) { return s.direction == $activeArcology.direction; })>>
+<<if _nei != -1>>
+ <<set $arcologies[_nei] = $activeArcology>>
+<<else>>
+ //Neighbor not found, something has gone wrong!//
+<</if>>
+
<<if $buyArcologyDirection != 0>>
<<for $i = 0; $i < $arcologies.length; $i++>>
@@ -65,6 +67,48 @@
<</for>>
<</if>>
+<<if $PC.hacking > 0>>
+ <br>
+ <<if $arcologies[0].CyberEconomicTarget == -1>>
+ You are not engaged in cyber warfare against a neighboring arcology.
+ <<else>>
+ <<for $i = 0; $i < $arcologies.length; $i++>>
+ <<if $arcologies[$i].direction == $arcologies[0].CyberEconomicTarget>>
+ You have targeted ''$arcologies[$i].name'' for cyber economic warfare.
+ <<break>>
+ <</if>>
+ <</for>>
+ <br> Its planned impacts will be
+ <<if $arcologies[0].CyberEconomic == 3>>
+ ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].CyberEconomic -= 1]]
+ <<elseif $arcologies[0].CyberEconomic == 2>>
+ ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberEconomic += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].CyberEconomic -= 1]]
+ <<else>>
+ ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberEconomic += 1]]
+ <</if>>
+ <</if>>
+
+ <br>
+ <<if $arcologies[0].CyberReputationTarget == -1>>
+ You are not engaged in character assassination against a neighboring arcology.
+ <<else>>
+ <<for $i = 0; $i < $arcologies.length; $i++>>
+ <<if $arcologies[$i].direction == $arcologies[0].CyberReputationTarget>>
+ You have targeted the leadership of ''$arcologies[$i].name'' for character assassination.
+ <<break>>
+ <</if>>
+ <</for>>
+ <br> Its planned impacts will be
+ <<if $arcologies[0].CyberReputation == 3>>
+ ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].CyberReputation -= 1]]
+ <<elseif $arcologies[0].CyberReputation == 2>>
+ ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberReputation += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].CyberReputation -= 1]]
+ <<else>>
+ ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberReputation += 1]]
+ <</if>>
+ <</if>>
+<</if>>
+
<br>
<<set $desc = []>>
@@ -170,9 +214,16 @@
<</if>>
<</for>>
+<br>
+[[Target for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $activeArcology.direction]] |
+<<if $PC.hacking > 0>>
+ [[Target for cyber economic warfare|Neighbor Interact][$arcologies[0].CyberEconomicTarget = $activeArcology.direction]]|
+ [[Target their leadership for character assassination|Neighbor Interact][$arcologies[0].CyberReputationTarget = $activeArcology.direction]]
+<</if>>
+
<br> [[Target for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $activeArcology.direction]]
<<if $desc.length > 0>>
- | [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]]
+ | [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]]
<</if>>
<br> You own ''$activeArcology.PCminority%'' of $activeArcology.name.
<<set $seed = 500*Math.trunc($activeArcology.prosperity*(1+($activeArcology.demandFactor/100)))>>
@@ -310,10 +361,18 @@ A 1% interest in $activeArcology.name is worth <<print cashFormat($seed)>> and w
<</if>>
<<if $arcologies[0].embargoTarget != -1>>
- <br>
- [[Cancel economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = -1]]
+ <br>
+ [[Cancel economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = -1]]
<</if>>
<<if $arcologies[0].influenceTarget != -1>>
- <br>
- [[Stop trying to influence neighboring arcologies|Neighbor Interact][$arcologies[0].influenceTarget = -1]]
+ <br>
+ [[Stop trying to influence neighboring arcologies|Neighbor Interact][$arcologies[0].influenceTarget = -1]]
<</if>>
+<<if $arcologies[0].CyberEconomicTarget != -1>>
+ <br>
+ [[Cancel cyber economic warfare|Neighbor Interact][$arcologies[0].CyberEconomicTarget = -1]]
+<</if>>
+<<if $arcologies[0].CyberReputationTarget != -1>>
+ <br>
+ [[Cancel character assassination|Neighbor Interact][$arcologies[0].CyberReputationTarget = -1]]
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 5f3a3dcf3cd57afe8733a86ee45e8d97568014d2..3b1f0488df670933fefcec32ee70eea4fbb9d0a7 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -490,6 +490,82 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
This week, you made @@.yellowgreen;<<print cashFormat($rents)>>@@ from your holdings in this arcology.
<</if>>
+/* CYBER ECONOMIC WARFARE */
+<<if $arcologies[$i].direction == $arcologies[0].CyberEconomicTarget>>
+ <<if $PC.hacking == -100>>
+ <<set _Catchtchance = 10>>
+ <<elseif $PC.hacking <= -75>>
+ <<set _Catchtchance = 30>>
+ <<elseif $PC.hacking <= -50>>
+ <<set _Catchtchance = 40>>
+ <<elseif $PC.hacking <= -25>>
+ <<set _Catchtchance = 45>>
+ <<elseif $PC.hacking == 0>>
+ <<set _Catchtchance = 50>>
+ <<elseif $PC.hacking <= 25>>
+ <<set _Catchtchance = 60>>
+ <<elseif $PC.hacking <= 50>>
+ <<set _Catchtchance = 70>>
+ <<elseif $PC.hacking <= 75>>
+ <<set _Catchtchance = 85>>
+ <<elseif $PC.hacking >= 100>>
+ <<set _Catchtchance = 100>>
+ <</if>>
+ <<set $arcologies[$i].prosperity -= $arcologies[0].CyberEconomic*2, _WarSpoils = 10+Math.max((500*$arcologies[$i].prosperity*$arcologies[0].CyberEconomic),0)>>
+ <<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 100)>>
+ <<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberEconomic)>>
+ <<set $arcologies[0].prosperity -= $arcologies[0].CyberEconomic*3, $rep -= random(100,200), _redHanded = 1>>
+ <<if $secExp == 1>>
+ <<set $authority -= random(100,500)*$arcologies[0].CyberEconomic, $crime += random(10,25)>>
+ <</if>>
+ <<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 100)>>
+ <</if>>
+ You target $arcologies[$i].name for @@.yellow;digital economic warfare,@@ successfully raiding its coffers for @@.yellowgreen;<<print cashFormat(_WarSpoils)>>@@ this week.
+ <<if _redHanded == 1>>
+ A successful trace back to your arcology has has exposed your actions, @@.red;damaging your reputation@@ and @@.red;scaring away potential investors.@@
+ <<if $secExp == 1>>
+ To add insult to injury, @@.red;your authority has been weakened@@ and your actions have painted your arcology as a @@.red;haven for crime.@@
+ <</if>>
+ <</if>>
+<<elseif $arcologies[$i].direction == $arcologies[0].CyberReputationTarget>> /* REPUTATION WARFARE */
+ <<if $PC.hacking == -100>>
+ <<set _Catchtchance = 10>>
+ <<elseif $PC.hacking <= -75>>
+ <<set _Catchtchance = 30>>
+ <<elseif $PC.hacking <= -50>>
+ <<set _Catchtchance = 40>>
+ <<elseif $PC.hacking <= -25>>
+ <<set _Catchtchance = 45>>
+ <<elseif $PC.hacking == 0>>
+ <<set _Catchtchance = 50>>
+ <<elseif $PC.hacking <= 25>>
+ <<set _Catchtchance = 60>>
+ <<elseif $PC.hacking <= 50>>
+ <<set _Catchtchance = 70>>
+ <<elseif $PC.hacking <= 75>>
+ <<set _Catchtchance = 85>>
+ <<elseif $PC.hacking >= 100>>
+ <<set _Catchtchance = 100>>
+ <</if>>
+ <<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation, $activeArcology.ownership -= $arcologies[0].CyberReputation>>
+ <<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 100)>>
+ <<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberReputation)>>
+ <<set $arcologies[0].prosperity -= $arcologies[0].CyberReputation*3, $rep -= random(100,200), _redHanded = 1>>
+ <<if $secExp == 1>>
+ <<set $authority -= random(100,500)*$arcologies[0].CyberReputation, $crime += random(10,25)>>
+ <</if>>
+ <<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 100)>>
+ <</if>>
+ You target $arcologies[$i].name's leadership for @@.yellow;character assassination@@ in an attempt to destabilize the arcology.
+ <<if _redHanded == 1>>
+ A successful trace back to your arcology has has exposed your actions, @@.red;damaging your reputation@@ and @@.red;scaring away potential investors.@@
+ <<if $secExp == 1>>
+ To add insult to injury, @@.red;your authority has been weakened@@ and your actions have painted your arcology as a @@.red;haven for crime.@@
+ <</if>>
+ <</if>>
+<</if>>
+
+
/* AI ARCOLOGY RENAMING */
<<for $j = 0; $j < $arcologies.length; $j++>>
<<if $arcologies[$i].direction != $arcologies[$j].direction>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index ab33a859163752ed803a37f407b19d5bd0aa205a..3862759cc37411a6feb58e4c09fa127115f27282 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -728,7 +728,7 @@
<<set $slaves[$i].energy++>>
<</if>>
<<elseif $slaves[$i].sexualFlaw == "breeder">>
- Her diet is @@.lime;prepping her to carry multiple fetues,@@ and she feels it. She @@.hotpink;eagerly awaits to swell with children.@@
+ Her diet is @@.lime;prepping her to carry multiple fetuses,@@ and she feels it. She @@.hotpink;eagerly awaits to swell with children.@@
<<set $slaves[$i].devotion += 2>>
<<if $slaves[$i].attrXY < 70>>
She certainly notices @@.green;how much more attractive men are.@@