diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index b7efcdc9749f0364023d7ba1e9307e3dd20229e5..bf7a059a49bea862938d6bfadbfef50755109cd4 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -129,10 +129,14 @@
<</if>>
<<set _L=0>>
- <<if $attackType == "raiders">> <<set $attackTroops = random(40,80),_L=1>>
- <<elseif $attackType == "free city">> <<set $attackTroops = random(20,40)>>
- <<elseif $attackType == "old world">> <<set $attackTroops = random(25,50)>>
- <<elseif $attackType == "freedom fighters">> <<set $attackTroops = random(30,60)>>
+ <<if $attackType == "raiders">>
+ <<set $attackTroops = random(40,80),_L=1>>
+ <<elseif $attackType == "free city">>
+ <<set $attackTroops = random(20,40)>>
+ <<elseif $attackType == "old world">>
+ <<set $attackTroops = random(25,50)>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set $attackTroops = random(30,60)>>
<</if>>
<<if $week < 30>>
/*<<set $attackTroops *= Math.trunc(random( (1*(1.01+($week/100))), (2*(1.01+($week/100))) ))>>*/ <<set $attackTroops *= random(1,2)>>
diff --git a/src/SecExp/secExpOptions.tw b/src/SecExp/secExpOptions.tw
index 603b421dce070799d7b7c88c7f5f6ef0ee8734cb..afb86b792bce0b9ccf4b6d59e893159aa8a6f1a2 100644
--- a/src/SecExp/secExpOptions.tw
+++ b/src/SecExp/secExpOptions.tw
@@ -11,7 +11,7 @@ __Battles__:
<</link>>
<<else>>
Battles are @@.cyan;ENABLED.@@
- <<link "Disable battles" "secExpOptions">>
+ <<link "Disable battles" "secExpOptions">>
<<set $battlesEnabled = 0>>
<</link>>
<</if>>
@@ -26,7 +26,7 @@ __Battles__:
<</link>>
<<else>>
Major battles are @@.cyan;ENABLED.@@
- <<link "Disable major battles" "secExpOptions">>
+ <<link "Disable major battles" "secExpOptions">>
<<set $majorBattlesEnabled = 0>>
<</link>>
<</if>>
@@ -39,7 +39,7 @@ __Battles__:
<</link>>
<<else>>
Major battles can cause gameover is @@.cyan;TRUE.@@
- <<link "Deactivate game loss in case of major battle defeat" "secExpOptions">>
+ <<link "Deactivate game loss in case of major battle defeat" "secExpOptions">>
<<set $majorBattleGameOver = 0>>
<</link>>
<</if>>
@@ -53,7 +53,7 @@ __Battles__:
<<else>>
Battle guaranteed this week is @@.cyan;TRUE.@@
- <<link "Do not force engagement every week" "secExpOptions">>
+ <<link "Do not force engagement every week" "secExpOptions">>
<<set $forceBattle = 0>>
<<set $forceMajorBattle = 0>>
<</link>>
@@ -84,7 +84,7 @@ __Battles__:
<</link>>
<<else>>
Battles are @@.cyan;ENABLED.@@
- <<link "Disable battles" "secExpOptions">>
+ <<link "Disable battles" "secExpOptions">>
<<set $battlesEnabled = 0>>
<</link>>
<</if>>
@@ -99,7 +99,7 @@ __Battles__:
<</link>>
<<else>>
Major battles are @@.cyan;ENABLED.@@
- <<link "Disable major battles" "secExpOptions">>
+ <<link "Disable major battles" "secExpOptions">>
<<set $majorBattlesEnabled = 0>>
<</link>>
<</if>>
@@ -112,7 +112,7 @@ __Battles__:
<</link>>
<<else>>
Major battles can cause gameover is @@.cyan;TRUE.@@
- <<link "Deactivate game loss in case of major battle defeat" "secExpOptions">>
+ <<link "Deactivate game loss in case of major battle defeat" "secExpOptions">>
<<set $majorBattleGameOver = 0>>
<</link>>
<</if>>
@@ -123,10 +123,9 @@ __Battles__:
<<link "Force engagement every week" "secExpOptions">>
<<set $forceBattle = 1>>
<</link>>
-
<<else>>
Battle guaranteed this week is @@.cyan;TRUE.@@
- <<link "Do not force engagement every week" "secExpOptions">>
+ <<link "Do not force engagement every week" "secExpOptions">>
<<set $forceBattle = 0>>
<</link>>
<</if>>
@@ -158,7 +157,7 @@ __Rebellions__:
<</link>>
<<else>>
Rebellions are @@.cyan;ENABLED.@@
- <<link "Disable rebellions" "secExpOptions">>
+ <<link "Disable rebellions" "secExpOptions">>
<<set $rebellionsEnabled = 0>>
<</link>>
<</if>>
@@ -185,7 +184,7 @@ __Rebellions__:
<</link>>
<<else>>
Rebellions guaranteed this week is @@.cyan;TRUE.@@
- <<link "Do not force engagement every week" "secExpOptions">>
+ <<link "Do not force engagement every week" "secExpOptions">>
<<set $forceRebellion = 0>>
<</link>>
<</if>>
@@ -253,22 +252,26 @@ __Battles/Rebellions Difficulty__:
<<replace "#difficulty">>
@@.green;Very easy@@
<</replace>>
-<</link>> | <<link "Easy">>
+<</link>>
+| <<link "Easy">>
<<set $difficulty = 0.75>>
<<replace "#difficulty">>
@@.limegreen;Easy@@
<</replace>>
-<</link>> | <<link "Normal">>
+<</link>>
+| <<link "Normal">>
<<set $difficulty = 1>>
<<replace "#difficulty">>
@@.yellow;Normal@@
<</replace>>
-<</link>> | <<link "Hard">>
+<</link>>
+| <<link "Hard">>
<<set $difficulty = 1.25>>
<<replace "#difficulty">>
@@.red;Hard@@
<</replace>>
-<</link>> | <<link "Very hard">>
+<</link>>
+| <<link "Very hard">>
<<set $difficulty = 1.5>>
<<replace "#difficulty">>
@@.darkred;Very hard@@
@@ -296,22 +299,26 @@ __Battles frequency__:
<<replace "#battleFrequency">>
@@.green;Very infrequent@@
<</replace>>
-<</link>> | <<link "Infrequent">>
+<</link>>
+| <<link "Infrequent">>
<<set $battleFrequency = 0.75>>
<<replace "#battleFrequency">>
@@.limegreen;Infrequent@@
<</replace>>
-<</link>> | <<link "Normal">>
+<</link>>
+| <<link "Normal">>
<<set $battleFrequency = 1>>
<<replace "#battleFrequency">>
@@.yellow;Normal@@
<</replace>>
-<</link>> | <<link "Frequent">>
+<</link>>
+| <<link "Frequent">>
<<set $battleFrequency = 1.25>>
<<replace "#battleFrequency">>
@@.red;Frequent@@
<</replace>>
-<</link>> | <<link "Very frequent">>
+<</link>>
+| <<link "Very frequent">>
<<set $battleFrequency = 1.5>>
<<replace "#battleFrequency">>
@@.darkred;Very frequent@@
@@ -339,22 +346,26 @@ __Major battle multiplier__:
<<replace "#majorBattleMult">>
@@.green;Very low@@
<</replace>>
-<</link>> | <<link "Low">>
+<</link>>
+| <<link "Low">>
<<set $majorBattleMult = 0.75>>
<<replace "#majorBattleMult">>
@@.limegreen;Low@@
<</replace>>
-<</link>> | <<link "Normal">>
+<</link>>
+| <<link "Normal">>
<<set $majorBattleMult = 1>>
<<replace "#majorBattleMult">>
@@.yellow;Normal@@
<</replace>>
-<</link>> | <<link "High">>
+<</link>>
+| <<link "High">>
<<set $majorBattleMult = 1.25>>
<<replace "#majorBattleMult">>
@@.red;High@@
<</replace>>
-<</link>> | <<link "Very high">>
+<</link>>
+| <<link "Very high">>
<<set $majorBattleMult = 1.5>>
<<replace "#majorBattleMult">>
@@.darkred;Very high@@
@@ -382,22 +393,26 @@ __Rebellions buildup speed__:
<<replace "#rebellionSpeed">>
@@.green;Very slow@@
<</replace>>
-<</link>> | <<link "Slow">>
+<</link>>
+| <<link "Slow">>
<<set $rebellionSpeed = 0.75>>
<<replace "#rebellionSpeed">>
@@.limegreen;Slow@@
<</replace>>
-<</link>> | <<link "Normal">>
+<</link>>
+| <<link "Normal">>
<<set $rebellionSpeed = 1>>
<<replace "#rebellionSpeed">>
@@.yellow;Normal@@
<</replace>>
-<</link>> | <<link "Fast">>
+<</link>>
+| <<link "Fast">>
<<set $rebellionSpeed = 1.25>>
<<replace "#rebellionSpeed">>
@@.red;Fast@@
<</replace>>
-<</link>> | <<link "Very fast">>
+<</link>>
+| <<link "Very fast">>
<<set $rebellionSpeed = 1.5>>
<<replace "#rebellionSpeed">>
@@.darkred;Very fast@@
@@ -423,7 +438,8 @@ __Debug/cheats:__
<<for _i = 0; _i < $mercUnits.length; _i++>>
<<set $mercUnits[_i].loyalty = random(80,100)>>
<</for>>
-<</link>> | <<link "Set loyalty average" "secExpOptions">>
+<</link>>
+| <<link "Set loyalty average" "secExpOptions">>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
<<set $militiaUnits[_i].loyalty = random(40,60)>>
<</for>>
@@ -435,7 +451,8 @@ __Debug/cheats:__
<<for _i = 0; _i < $mercUnits.length; _i++>>
<<set $mercUnits[_i].loyalty = random(40,60)>>
<</for>>
-<</link>> | <<link "Set loyalty low" "secExpOptions">>
+<</link>>
+| <<link "Set loyalty low" "secExpOptions">>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
<<set $militiaUnits[_i].loyalty = random(20)>>
<</for>>
@@ -447,7 +464,8 @@ __Debug/cheats:__
<<for _i = 0; _i < $mercUnits.length; _i++>>
<<set $mercUnits[_i].loyalty = random(20)>>
<</for>>
-<</link>> | <<link "Randomize loyalty" "secExpOptions">>
+<</link>>
+| <<link "Randomize loyalty" "secExpOptions">>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
<<set $militiaUnits[_i].loyalty = random(100)>>
<</for>>
@@ -462,41 +480,48 @@ __Debug/cheats:__
<</link>>
<br><<link "Give Authority" "secExpOptions">>
<<set $authority = Math.clamp($authority + 1000, 0, 20000)>>
-<</link>> | <<link "Remove Authority" "secExpOptions">>
+<</link>>
+| <<link "Remove Authority" "secExpOptions">>
<<set $authority = Math.clamp($authority - 1000, 0, 20000)>>
<</link>>
<br><<link "Raise security" "secExpOptions">>
<<set $security = Math.clamp($security + 5, 0, 100)>>
-<</link>> | <<link "Lower security" "secExpOptions">>
+<</link>>
+| <<link "Lower security" "secExpOptions">>
<<set $security = Math.clamp($security - 5, 0, 100)>>
<</link>>
<br><<link "Raise crime" "secExpOptions">>
<<set $crime = Math.clamp($crime + 5, 0, 100)>>
-<</link>> | <<link "Lower crime" "secExpOptions">>
+<</link>>
+| <<link "Lower crime" "secExpOptions">>
<<set $crime = Math.clamp($crime - 5, 0, 100)>>
<</link>>
<br><<link "Give menial slaves" "secExpOptions">>
<<set $menials = Math.clamp($menials + 30, 0, $PopCap)>>
-<</link>> | <<link "Remove menial slaves" "secExpOptions">>
+<</link>>
+| <<link "Remove menial slaves" "secExpOptions">>
<<set $menials = Math.clamp($menials - 30, 0, $PopCap)>>
<</link>>
<br><<link "Give militia manpower" "secExpOptions">>
<<set $militiaFreeManpower += 30>>
<<recalcManpower>>
-<</link>> | <<link "Remove militia manpower" "secExpOptions">>
+<</link>>
+| <<link "Remove militia manpower" "secExpOptions">>
<<set $militiaFreeManpower = Math.clamp($militiaFreeManpower - 30, 0, $militiaFreeManpower)>>
<<recalcManpower>>
<</link>>
<br><<link "Give mercs manpower" "secExpOptions">>
<<set $mercFreeManpower += 30>>
<<recalcManpower>>
-<</link>> | <<link "Remove mercs manpower" "secExpOptions">>
+<</link>>
+| <<link "Remove mercs manpower" "secExpOptions">>
<<set $mercFreeManpower = Math.clamp($mercFreeManpower - 30, 0, $mercFreeManpower)>>
<<recalcManpower>>
<</link>>
<br><<link "Add citizens" "secExpOptions">> /*Will no longer work as intended due to population changes*/
<<set $lowerClass += 200>>
-<</link>> | <<link "Remove citizens" "secExpOptions">> /*also no longer properly functional*/
+<</link>>
+| <<link "Remove citizens" "secExpOptions">> /*also no longer properly functional*/
<<set $lowerClass -= 200>>
<<if $lowerClass < 0>>
<<set $lowerClass = 0>>
@@ -504,7 +529,8 @@ __Debug/cheats:__
<</link>>
<br><<link "Add slaves" "secExpOptions">> /*Will work to a limited degree, minimums and maximums for slaves are set through population*/
<<set $NPCSlaves += 200>>
-<</link>> | <<link "Remove slaves" "secExpOptions">> /*Will work to a limited degree*/
+<</link>>
+| <<link "Remove slaves" "secExpOptions">> /*Will work to a limited degree*/
<<set $NPCSlaves -= 200>>
<<if $NPCSlaves < 0>>
<<set $NPCSlaves = 0>>
@@ -512,6 +538,7 @@ __Debug/cheats:__
<</link>>
<br><<link "Raise prosperity" "secExpOptions">>
<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity + 10, 0, 1000)>>
-<</link>> | <<link "Lower prosperity" "secExpOptions">>
+<</link>>
+| <<link "Lower prosperity" "secExpOptions">>
<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity - 10, 0, 1000)>>
<</link>>
diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw
index 025c1f00ea5a2868bf4b8d46309f39b6a361c9f0..0803baea96981218a3132a701bb7be73e5a65bea 100644
--- a/src/SecExp/transportHub.tw
+++ b/src/SecExp/transportHub.tw
@@ -172,5 +172,4 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
The hub security is fully upgraded
<</if>>
-<br><br>[[Return this sector to standard markets|Main][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $sectors[$AS].type = "Markets", $transportHub = 0, $hubSecurity = 1]]
- //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
+<br><br>[[Return this sector to standard markets|Main][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $sectors[$AS].type = "Markets", $transportHub = 0, $hubSecurity = 1]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 73aecf7ac19d5469f1df438cbdad65c3dc6d54f5..2794b19672b3fe1e233de19820884478e01f776d 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -326,15 +326,15 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
<<set setup.veryYoungCareers = ["a babysitter", "a beggar", "a beggar", "a bully hunter", "a bully", "a camp counselor", "a cheerleader", "a child actress", "a child prodigy", "a child prostitute", "a child prostitute", "a child soldier", "a child soldier", "a club manager", "a club recruiter", "a club treasurer", "a cum dump", "a dropout", "a dropout", "a drug mule", "a farmer's daughter", "a girl scout", "a girl scout", "a hall monitor", "a handmaiden", "a hospital volunteer", "a housesitter", "a juvenile delinquent", "a juvenile delinquent", "a latchkey kid", "a lemonade stand operator", "a marching band leader", "a meat toilet", "a military brat", "a model-UN star", "a model", "a noblewoman", "a pageant star", "a paper girl", "a part-time farm laborer", "a pick-pocket", "a refugee", "a refugee", "a refugee", "a school nurse's assistant", "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", "a teacher's pet", "an apprentice", "an aspiring pop star", "an idol", "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 blogger", "a butler", "a camgirl", "a camp counselor", "a camwhore", "a cashier", "a cheerleader", "a cocktail waitress", "a comedian", "a con artist", "a cook", "a courier", "a cowgirl", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a dominatrix", "a drug mule", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a florist", "a gang member", "a gang member", "a gardener", "a groomer", "a gymnast", "a handmaiden", "a house DJ", "a housesitter", "a housewife", "a law enforcement officer", "a lifeguard", "a magician's assistant", "a maid", "a mail-order bride", "a masseuse", "a meat toilet", "a mechanic", "a medical student", "a mistress", "a model", "a musician", "a noblewoman", "a nun", "a nurse", "a paramedic", "a party girl", "a personal assistant", "a personal trainer", "a pirate", "a political activist", "a porn star", "a prisoner", "a programmer", "a prostitute", "a racing driver", "a reality show star", "a receptionist", "a refugee", "a ride attendant", "a saleswoman", "a school nurse", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a shut-in", "a soldier", "a street performer", "a street vendor", "a stripper", "a student", "a student", "a student", "a switchboard operator", "a teaching assistant", "a tour guide", "a trophy wife", "a truck driver", "a video game streamer", "a waitress", "a wet nurse", "a yoga instructor", "an actress", "an air hostess", "an apprentice", "an arcade attendant", "an artist", "an aspiring pop star", "an assassin", "an athlete", "an au pair", "an escort", "an exotic dancer", "an idol", "an intern", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.youngCareers = ["a babysitter", "a ballerina", "a barista", "a bartender", "a beggar", "a blogger", "a butler", "a camgirl", "a camp counselor", "a camwhore", "a cashier", "a cheerleader", "a cocktail waitress", "a comedian", "a con artist", "a cook", "a courier", "a cowgirl", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a dominatrix", "a drug mule", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a florist", "a gang member", "a gang member", "a gardener", "a groomer", "a gymnast", "a handmaiden", "a house DJ", "a housesitter", "a housewife", "a law enforcement officer", "a lifeguard", "a magician's assistant", "a maid", "a mail-order bride", "a masseuse", "a meat toilet", "a mechanic", "a medical student", "a mistress", "a model", "a musician", "a noblewoman", "a nun", "a nurse", "a paramedic", "a party girl", "a personal assistant", "a personal trainer", "a pirate", "a political activist", "a porn star", "a prisoner", "a programmer", "a prostitute", "a racing driver", "a reality show star", "a receptionist", "a refugee", "a ride attendant", "a saleswoman", "a school nurse", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a shut-in", "a soldier", "a street performer", "a street vendor", "a stripper", "a student", "a student", "a student", "a switchboard operator", "a teaching assistant", "a tour guide", "a trophy wife", "a truck driver", "a video game streamer", "a waitress", "a wet nurse", "a yoga instructor", "an actress", "an air hostess", "an apprentice", "an arcade attendant", "an artist", "an aspiring pop star", "an assassin", "an athlete", "an au pair", "an escort", "an exotic dancer", "an idol", "an installation technician", "an intern", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
<<set setup.educatedCareers = ["a ballerina", "a banker", "a bureaucrat", "a business owner", "a businessman", "a captain", "a chemist", "a chief of police", "a classical dancer", "a classical musician", "a coach", "a college scout", "a concierge", "a coroner", "a corporate executive", "a cosmetologist", "a counselor", "a criminal", "a critic", "a cult leader", "a dean", "a dentist", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a housekeeper", "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 nanny", "a noblewoman", "a nun", "a painter", "a paramedic", "a personal assistant", "a pharmacist", "a photographer", "a physician", "a pilot", "a poet", "a police detective", "a police negotiator", "a police officer", "a political activist", "a politician", "a practitioner", "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 stockbroker", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a train conductor", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an air hostess", "an animator", "an archaeologist", "an architect", "an artist", "an assassin", "an astronaut", "an economist", "an editor", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "an orchestra conductor", "retired", "unemployed"]>>
-<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beekeeper", "a beggar", "a blacksmith", "a blogger", "a bodyguard", "a bouncer", "a bounty hunter", "a boxer", "a brewer", "a bullfighter", "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 cobbler", "a cocktail waitress", "a comedian", "a con artist", "a construction worker", "a cook", "a cowgirl", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a dominatrix", "a driller", "a drug mule", "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 gravedigger", "a groomer", "a gymnast", "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 mail-order bride", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a midwife", "a milkmaid", "a mime", "a miner", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nanny", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a personal trainer", "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 receptionist", "a referee", "a refugee", "a revolutionary", "a ride attendant", "a roadie", "a rodeo star", "a sailor", "a saleswoman", "a school nurse", "a seamstress", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a street vendor", "a stripper", "a student", "a student athlete", "a stuntwoman", "a switchboard operator", "a tailor", "a talent scout", "a taxi driver", "a teacher", "a tour guide", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a welder", "a wet nurse", "a whaler", "a wrestler", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an artist", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an exterminator", "an innkeeper", "an office worker", "an orderly", "homeless", "in a militia", "retired", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beekeeper", "a beggar", "a blacksmith", "a blogger", "a bodyguard", "a bouncer", "a bounty hunter", "a boxer", "a brewer", "a bullfighter", "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 cobbler", "a cocktail waitress", "a comedian", "a con artist", "a construction worker", "a cook", "a cowgirl", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a dominatrix", "a driller", "a drug mule", "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 gravedigger", "a groomer", "a gymnast", "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 mail-order bride", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a midwife", "a milkmaid", "a mime", "a miner", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nanny", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a personal trainer", "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 receptionist", "a referee", "a refugee", "a repairman", "a revolutionary", "a ride attendant", "a roadie", "a rodeo star", "a sailor", "a saleswoman", "a school nurse", "a seamstress", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a street vendor", "a stripper", "a student", "a student athlete", "a stuntwoman", "a switchboard operator", "a tailor", "a talent scout", "a taxi driver", "a teacher", "a tour guide", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a welder", "a wet nurse", "a whaler", "a wrestler", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an artist", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an exterminator", "an innkeeper", "an installation technician", "an office worker", "an orderly", "homeless", "in a militia", "retired", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
<<set setup.gratefulCareers = ["a beggar", "a drug mule", "a peddler", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "a thief", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
-<<set setup.menialCareers = ["a baker", "a blacksmith", "a bus driver", "a butcher", "a candlestick maker", "a carpenter", "a cashier", "a chauffeur", "a cobbler", "a construction worker", "a courier", "a croupier", "a delivery woman", "a driller", "a dropout", "a factory worker", "a farm laborer", "a firefighter", "a fisherwoman", "a florist", "a gardener", "a gravedigger", "a janitor", "a launderer", "a lumberjack", "a mail carrier", "a mechanic", "a messenger", "a miner", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a plumber", "a private", "a programmer", "a receptionist", "a referee", "a ride attendant", "a roadie", "a sailor", "a seamstress", "a service worker", "a street vendor", "a student from a private school", "a student from a public school", "a student", "a switchboard operator", "a tailor", "a taxi driver", "a terrorist", "a tour guide", "a train conductor", "a truck driver", "a welder", "a whaler", "an apprentice", "an arcade attendant", "an electrician", "an engineer", "an exterminator", "an intern"]>>
+<<set setup.menialCareers = ["a baker", "a blacksmith", "a bus driver", "a butcher", "a candlestick maker", "a carpenter", "a cashier", "a chauffeur", "a cobbler", "a construction worker", "a courier", "a croupier", "a delivery woman", "a driller", "a dropout", "a factory worker", "a farm laborer", "a firefighter", "a fisherwoman", "a florist", "a gardener", "a gravedigger", "a janitor", "a launderer", "a lumberjack", "a mail carrier", "a mechanic", "a messenger", "a miner", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a plumber", "a private", "a programmer", "a receptionist", "a referee", "a repairman", "a ride attendant", "a roadie", "a sailor", "a seamstress", "a service worker", "a street vendor", "a student from a private school", "a student from a public school", "a student", "a switchboard operator", "a tailor", "a taxi driver", "a terrorist", "a tour guide", "a train conductor", "a truck driver", "a welder", "a whaler", "an apprentice", "an arcade attendant", "an electrician", "an engineer", "an exterminator", "an installation technician", "an intern"]>>
<<set setup.entertainmentCareers = ["a ballerina", "a blogger", "a camgirl", "a camwhore", "a cheerleader", "a child actress", "a clown", "a cocktail waitress", "a comedian", "a gymnast", "a journalist", "a local news anchor", "a magician's assistant", "a medium", "a mime", "a painter", "a party girl", "a photographer", "a poet", "a racing driver", "a sculptor", "a stage magician", "a street performer", "a student athlete", "a stuntwoman", "a video game streamer", "a waitress", "a weathergirl", "a wrestler", "a writer", "an acrobat", "an actress", "an animator", "an artist", "an athlete"]>>
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 3c26b059cc366df9d1089f3c7b3865324fbfaeee..2b13cd2b66d9ee1ab67fe31f743395df8618439b 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1138,13 +1138,11 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (State.variables.seeExtreme === 1) {
- if (eventSlave.devotion < -50) {
- if (eventSlave.trust >= -50) {
- if (eventSlave.assignment !== "stay confined") {
- if (eventSlave.heels !== 1) {
- State.variables.RESSevent.push("escapee");
- }
+ if (eventSlave.devotion < -50) {
+ if (eventSlave.trust >= -50) {
+ if (eventSlave.assignment !== "stay confined") {
+ if (eventSlave.heels !== 1) {
+ State.variables.RESSevent.push("escapee");
}
}
}
diff --git a/src/pregmod/seFCTVremote.tw b/src/pregmod/seFCTVremote.tw
index 2d7d9f2c698a31a59ae655268c27805c213664f0..c628247c6c07830f66b8f50308502256485b0acd 100644
--- a/src/pregmod/seFCTVremote.tw
+++ b/src/pregmod/seFCTVremote.tw
@@ -6,8 +6,11 @@
<<set $activeSlaveOneTimeMaxAge = 35>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<if $arcologies[0].FSSupremacistLawME == 1>>
+<<if $arcologies[0].FSSubjugationistLawME == 1>>
+ <<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
+<<elseif $arcologies[0].FSSupremacistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSupremacistRace)>>
+ <<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = 0>>
@@ -27,7 +30,7 @@
<<set $activeSlave.hStyle = "ponytail">>
<</if>>
<<set $activeSlave.origin = "You enslaved $him for poor customer service as an FCTV tech.">>
-<<set $activeSlave.career = "a TV repair tech">>
+<<set $activeSlave.career = "an installation technician">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.markings = "none">>
<<set $activeSlave.hLength = 10>>
@@ -52,9 +55,9 @@
/* 000-250-006 */
</span>
-You have a gap in your schedule in the morning, and decide to watch some FCTV<<if $Concubine != 0>> with your concubine, @@.pink;$Concubine.slaveName@@<</if>>. No sooner do you begin to watch a random show, than you have a notification that someone is here to see you. It seems to be a tech of some sort, complete with a small utility drone. A camera reveals the back of $his shirt, on which is written in block letters "FCTV SERVICE." Incredible. How do these people always find the worst time to stop in. <<if $assistant > 0>>Your assistant shrugs. At a gesture from you, _heA lets $him in.<<else>>You push a button to allow $him to come in.<</if>> This had better be good.
+You have a gap in your schedule in the morning, and decide to watch some FCTV<<if $Concubine != 0>> with your concubine, @@.pink;$Concubine.slaveName@@<</if>>. No sooner do you begin to watch a random show, than you have a notification that someone is here to see you. It seems to be a tech of some sort, complete with a small utility drone. A camera reveals the back of $his shirt, on which is written in block letters "FCTV SERVICE." Incredible. How do these people always find the worst time to stop in? <<if $assistant > 0>>Your assistant shrugs. At a gesture from you, _heA lets $him in.<<else>>You push a button to allow $him to come in.<</if>> This had better be good.
<br>
-Presently, the tech enters the room and asks how your FCTV product is working. You tersely reply that it is fine, <<if $FCTVremote == 1>> although you're annoyed you had to purchase your own remote,<<else>> although you find the random nature of the shows a little annoying,<</if>> then ask the tech to cut to the point. $He shifts from one foot to the other, and then sheepishly admits that the service comes with a free remote that allows you to change the channels. Incredible! Why didn't you receive one? "It's, uh, 8HGG Inc policy to distribute remotes only after a trial period." <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> quietly notifies you that "$He's lying. We've had no notification from 8HGG of a visit. It's definitely the same tech as last time; $he's trying to cover up $his mistake on a big contract. <i>They don't know $he's here.</i>"
+Presently, the tech enters the room and asks how your FCTV product is working. You tersely reply that it is fine, <<if $FCTVremote == 1>> although you're annoyed you had to purchase your own remote,<<else>> although you find the random nature of the shows a little annoying,<</if>> then ask the tech to cut to the point. $He shifts from one foot to the other, and then sheepishly admits that the service comes with a free remote that allows you to change the channels. Incredible! Why didn't you receive one? "It's, uh, 8HGG Inc. policy to distribute remotes only after a trial period." <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> quietly notifies you that "$He's lying. We've had no notification from 8HGG of a visit. It's definitely the same tech as last time; $he's trying to cover up $his mistake on a big contract. <i>They don't know $he's here.</i>"
<br>
$He unboxes the new remote and turns $his back to you, eagerly demonstrating how you can use it to watch any show you want. This could be your chance to turn the tables on FCTV and get some special "customer support" of your own.
<br><br>
@@ -173,11 +176,11 @@ Channel 14 had fascinated you. Thanks to this bumbling tech you hadn't been able
<br>
"Uh, that @@.lime;virgin ass@@!" the customer exclaims. "How's THIS for an upgraded package. Last time I had a billing problem you folks told me where to shove it. Well here. It. Goes!" From the way they collapse over each other, it seems they orgasmed at about the same time.
<</if>>
-<<set $activeSlave.anus = 1, $analTotal++>>
+<<set $activeSlave.anus = 1, $activeSlave.counter.anal++>>
<br><br>
Time passes...
<br><br>
-It seems the aphrodisiacs are wearing off, and the tech is stirring. Sitting up, $he looks confused. Time for a call. Once $he is standing back in your office, you sternly show $him portions of video, explaining how unprofessional $his behavior is and how deeply upset you are at the way your citizen was treated. You tell $him you know $he was on the clock, and you know $he was not supposed to be here, CERTAINLY not while getting fucked with a mockery of $his employer marked on $his back. $He begins to quake, and begs you to help $him. Nice to have the TV company begging you to help <i>$him</i>, for once.
+It seems the aphrodisiacs are wearing off, and the tech is stirring. Sitting up, $he looks confused. Time for a call. Once $he is standing back in your office, you sternly show $him portions of video, explaining how unprofessional $his behavior is and how deeply upset you are at the way your citizen was treated. You tell $him you know $he was on the clock, and you know $he was not supposed to be here, CERTAINLY not while getting fucked with a mockery of $his employer marked on $his back. $He begins to quake, and begs you to help $him. Nice to have the TV company begging you to help <i>them</i>, for once.
<br>
<span id="result">
@@ -185,11 +188,13 @@ It seems the aphrodisiacs are wearing off, and the tech is stirring. Sitting up,
<br><<link "Enslave $him">>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
+ <<set $analTotal++>>
$activeSlave.slaveName knows $he has nowhere to turn. Sobbing, $he complies with the process.
<<include "New Slave Intro">>
<</replace>>
<</link>>
<br><<link "Sentence $him to a day in a wall with a TV, then enslave $him">>
+ <<set $analTotal++>>
<<set $activeSlave.health -= 10>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.sexualFlaw = "hates penetration">>
@@ -237,13 +242,13 @@ It seems the aphrodisiacs are wearing off, and the tech is stirring. Sitting up,
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
Aztec days,
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- Egyptian Revivalism,
+ Ancient Egypt,
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
the Edo period,
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
- Arabian days,
+ the Caliphates,
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
- Chinese days,
+ imperial China,
<<else>>
ancient times,
<</if>>
diff --git a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
index c4ccf06b2681f162f9811bbda8dba9d767dfc15e..fbcdcd84565633b88612474f0bc18f8461b82871 100644
--- a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
+++ b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
@@ -5,29 +5,29 @@
<<set $milkTap = 0, _descM = "milk", _descC = "cum", _eligibilityMilk2 = 0, _eligibilityMilk4 = 0, _eligibilityMilk8 = 0, _eligibilityCum2 = 0, _eligibilityCum4 = 0, _eligibilityCum8 = 0>>
<<for _i = 0; _i < $slaves.length; _i++>> /* milk output */
-<<if $slaves[_i].lactation > 0>>
- <<set $slaves[_i].milkOutput = 0>>
- <<set _milk = milkAmount($slaves[_i])>>
- <<set _milk = (_milk/14)>>
- <<set _milk = Math.trunc(_milk)>>
- <<set $slaves[_i].milkOutput = _milk>>
-<<else>>
- <<set _milk = 0>>
- <<set $slaves[_i].milkOutput = 0>>
-<</if>>
+ <<if $slaves[_i].lactation > 0>>
+ <<set $slaves[_i].milkOutput = 0>>
+ <<set _milk = milkAmount($slaves[_i])>>
+ <<set _milk = (_milk/14)>>
+ <<set _milk = Math.trunc(_milk)>>
+ <<set $slaves[_i].milkOutput = _milk>>
+ <<else>>
+ <<set _milk = 0>>
+ <<set $slaves[_i].milkOutput = 0>>
+ <</if>>
<</for>>
<<for _i = 0; _i < $slaves.length; _i++>> /* cum output */
-<<if $slaves[_i].balls > 0 && $slaves[_i].dick > 0 && $slaves[_i].chastityPenis != 1>>
- <<set $slaves[_i].cumOutput = 0>>
- <<set _cum = cumAmount($slaves[_i])>>
- <<set _cum = (_cum/7)>>
- <<set _cum = (_cum/10)>>
- <<set _cum = Math.trunc(_cum)>>
- <<set $slaves[_i].cumOutput = _cum>>
-<<else>>
- <<set _cum = 0>>
- <<set $slaves[_i].cumOutput = 0>>
-<</if>>
+ <<if $slaves[_i].balls > 0 && $slaves[_i].dick > 0 && $slaves[_i].chastityPenis != 1>>
+ <<set $slaves[_i].cumOutput = 0>>
+ <<set _cum = cumAmount($slaves[_i])>>
+ <<set _cum = (_cum/7)>>
+ <<set _cum = (_cum/10)>>
+ <<set _cum = Math.trunc(_cum)>>
+ <<set $slaves[_i].cumOutput = _cum>>
+ <<else>>
+ <<set _cum = 0>>
+ <<set $slaves[_i].cumOutput = 0>>
+ <</if>>
<</for>>
//$activeSlave.slaveName is prepped to drink $his fill; now you must select a slave capable of producing the required amount of milk or ejaculate.//
@@ -50,26 +50,26 @@ __2 Liters__
<</if>>
<<if $slaves[_i].relationshipTarget == $activeSlave.ID>>
<<switch $slaves[_i].relationship>>
- <<case 1>>
- friends
- <<case 2>>
- best friends
- <<case 3>>
- friends with benefits
- <<case 4>>
- lover
- <<case 5>>
- slave wife
+ <<case 1>>
+ friends
+ <<case 2>>
+ best friends
+ <<case 3>>
+ friends with benefits
+ <<case 4>>
+ lover
+ <<case 5>>
+ slave wife
<</switch>>
<</if>>
<<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
<<switch $slaves[_i].relationship>>
- <<case 1>>
- dislikes
- <<case 2>>
- rival
- <<case 3>>
- bitterly hates
+ <<case 1>>
+ dislikes
+ <<case 2>>
+ rival
+ <<case 3>>
+ bitterly hates
<</switch>>
<</if>>
<<set _eligibilityMilk2 = 1>>
@@ -94,26 +94,26 @@ __4 Liters__
<</if>>
<<if $slaves[_i].relationshipTarget == $activeSlave.ID>>
<<switch $slaves[_i].relationship>>
- <<case 1>>
- friends
- <<case 2>>
- best friends
- <<case 3>>
- friends with benefits
- <<case 4>>
- lover
- <<case 5>>
- slave wife
- <</switch>>
+ <<case 1>>
+ friends
+ <<case 2>>
+ best friends
+ <<case 3>>
+ friends with benefits
+ <<case 4>>
+ lover
+ <<case 5>>
+ slave wife
+ <</switch>>
<</if>>
<<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
<<switch $slaves[_i].relationship>>
- <<case 1>>
- dislikes
- <<case 2>>
- rival
- <<case 3>>
- bitterly hates
+ <<case 1>>
+ dislikes
+ <<case 2>>
+ rival
+ <<case 3>>
+ bitterly hates
<</switch>>
<</if>>
<<set _eligibilityMilk4 = 1>>
@@ -137,17 +137,17 @@ __4 Liters__
<</if>>
<<if $slaves[_i].relationshipTarget == $activeSlave.ID>>
<<switch $slaves[_i].relationship>>
- <<case 1>>
- friends
- <<case 2>>
- best friends
- <<case 3>>
- friends with benefits
- <<case 4>>
- lover
- <<case 5>>
- slave wife
- <</switch>>
+ <<case 1>>
+ friends
+ <<case 2>>
+ best friends
+ <<case 3>>
+ friends with benefits
+ <<case 4>>
+ lover
+ <<case 5>>
+ slave wife
+ <</switch>>
<</if>>
<<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
<<switch $slaves[_i].relationship>>
diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw
index b2ec17e7ec81131051ca1bc4128427fd94b542e1..287e9aa7a132b14bda088511a4970fe863d5d37e 100644
--- a/src/pregmod/widgets/deathWidgets.tw
+++ b/src/pregmod/widgets/deathWidgets.tw
@@ -1,26 +1,24 @@
:: death widgets [widget nobr]
<<widget "pop">>
-
-<br>
-/* 000-250-006 */
-<<if $seeImages && $seeReportImages>>
-<div class="imageRef tinyImg">
- <<SlaveArt $args[0] 0 0>>
-</div>
-<</if>>
-/* 000-250-006 */
-As $args[0].slaveName is going about $his business with $his overfilled $args[0].inflationType belly, $he can't help but feel exhausted. $His health has been poor lately and the pressure in $his organs is not helping things. $He immediately knows something is wrong when an intense pain runs through $his middle and $his load shifts threateningly. Blood and $args[0].inflationType leak from $his rear as $his body cavity fills with the contents of $his digestive tract. The skin of $his taut belly reddens as the pressure against it builds. As $he takes $his last breath, $he falls forward, $his weight landing upon $his straining stomach. With a gush, $he ruptures, flooding the area around $him with blood, guts and $args[0].inflationType. Word of the late slave and $his gruesome fate spread fast, @@.gold;terrifying@@ your untrusting slaves.
-<<for _dw = 0; _dw < $slaves.length; _dw++>>
- <<if ($slaves[_dw].trust <= 50)>>
- <<if ($slaves[_dw].inflation >= 0)>>
- <<set $slaves[_dw].trust -= (Math.pow($slaves[_dw].inflation,3)*5)>>
- <<else>>
- <<set $slaves[_dw].trust -= 10>>
- <</if>>
+ <br>
+ /* 000-250-006 */
+ <<if $seeImages && $seeReportImages>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $args[0] 0 0>>
+ </div>
<</if>>
-<</for>>
-
+ /* 000-250-006 */
+ As $args[0].slaveName is going about $his business with $his overfilled $args[0].inflationType belly, $he can't help but feel exhausted. $His health has been poor lately and the pressure in $his organs is not helping things. $He immediately knows something is wrong when an intense pain runs through $his middle and $his load shifts threateningly. Blood and $args[0].inflationType leak from $his rear as $his body cavity fills with the contents of $his digestive tract. The skin of $his taut belly reddens as the pressure against it builds. As $he takes $his last breath, $he falls forward, $his weight landing upon $his straining stomach. With a gush, $he ruptures, flooding the area around $him with blood, guts and $args[0].inflationType. Word of the late slave and $his gruesome fate spread fast, @@.gold;terrifying@@ your untrusting slaves.
+ <<for _dw = 0; _dw < $slaves.length; _dw++>>
+ <<if ($slaves[_dw].trust <= 50)>>
+ <<if ($slaves[_dw].inflation >= 0)>>
+ <<set $slaves[_dw].trust -= (Math.pow($slaves[_dw].inflation,3)*5)>>
+ <<else>>
+ <<set $slaves[_dw].trust -= 10>>
+ <</if>>
+ <</if>>
+ <</for>>
<</widget>>
<<widget "DeathOldAge">>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index b6047055e7b0754ada1fe2f0832c970e7ab7b3eb..dae8e88d92a64a126605c477ba224309e835c4c0 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -14,13 +14,13 @@
/* birth complications calcs */
<<if $slaves[$i].mpreg == 1>>
-<<if $slaves[$i].anus < 2>>
- <<set $birthDamage += 3>>
-<</if>>
+ <<if $slaves[$i].anus < 2>>
+ <<set $birthDamage += 3>>
+ <</if>>
<<else>>
-<<if $slaves[$i].vagina < 2>>
- <<set $birthDamage += 3>>
-<</if>>
+ <<if $slaves[$i].vagina < 2>>
+ <<set $birthDamage += 3>>
+ <</if>>
<</if>>
<<if $slaves[$i].hips < 0>>
<<set $birthDamage += (2-$slaves[$i].hips)>>
@@ -51,9 +51,9 @@
<<set $birthDamage += 2>>
<</if>>
<<if $slaves[$i].mpreg != 1>>
-<<if $slaves[$i].vaginaLube == 0>>
- <<set $birthDamage += 1>>
-<</if>>
+ <<if $slaves[$i].vaginaLube == 0>>
+ <<set $birthDamage += 1>>
+ <</if>>
<</if>>
<<if $slaves[$i].tired > 0>>
<<set $birthDamage += 2>>
@@ -103,9 +103,9 @@
<<set $birthDamage -= 3>>
<</if>>
<<if $slaves[$i].mpreg != 1>>
-<<if $slaves[$i].vaginaLube > 0>>
- <<set $birthDamage -= $slaves[$i].vaginaLube>>
-<</if>>
+ <<if $slaves[$i].vaginaLube > 0>>
+ <<set $birthDamage -= $slaves[$i].vaginaLube>>
+ <</if>>
<</if>>
<<if $slaves[$i].curatives > 0>>
<<set $birthDamage -= 3>>
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index 812123be5bfe6cbaaa9e00d584e9a11c77d34200..34347e97a1f70bb6ea4dd6f5b46c19652d7bcadd 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -16,14 +16,14 @@
<<if ($activeSlave.fetish == "masochist")>>
$He shudders with excitement. "I mean, I know my pain will help to feed the godde<<ss>> and I'm willing to <<s>>uffer plenty to plea<<s>>e her, but i<<s>> it really a <<s>>acrifi<<c>>e if I'm enjoying it?"
<<elseif ($activeSlave.fetish == "cumslut")>>
- $He hesitates, looking concerned. "Oh God<<s>>, the <<s>>e<<x>> clean<<s>>ing will be awful, but I'm willing to <<s>>acrifice all that pain for the godde<<ss>>."
+ $He hesitates, looking concerned. "Oh God<<s>>, the <<s>>e<<x>> clean<<s>>ing will be awful, but I'm willing to <<s>>acrifi<<c>>e all that pain for the godde<<ss>>."
<<elseif ($activeSlave.fetish == "humiliation")>>
$He shudders with excitement. "I heard everyone can <<s>>ee me a<<s>> I <<s>>uffer. I hope the public penan<<c>>e will plea<<s>>e the godde<<ss>>."
<<elseif ($activeSlave.fetish == "buttslut")>>
- $He looks sadly at the floor. "Oh God<<s>>, that mean<<s>> no butt <<s>>e<<x>> for me. I hope Xochiquetzal be plea<<s>>ed by all that <<s>>acrifice."
+ $He looks sadly at the floor. "Oh God<<s>>, that mean<<s>> no butt <<s>>e<<x>> for me. I hope Xochiquetzal be plea<<s>>ed by all that <<s>>acrifi<<c>>e."
<</if>>
<<else>>
- $He looks determined. "<<Master>>, I'll do my best. No other <<s>>lave will be cleaner for the godde<<ss>> than I.
+ $He looks determined. "<<Master>>, I'll do my be<<s>>t. No other <<s>>lave will be cleaner for the godde<<ss>> than I.
<</if>>
<<elseif ($activeSlave.devotion > 20) || (($activeSlave.devotion >= -20) && ($activeSlave.trust < -20) && ($activeSlave.trust >= -50))>>
<<if !canTalk($activeSlave)>>
@@ -88,8 +88,8 @@
<<setNonlocalPronouns $seeDicks>>
As tradition dictates, the purification of $his body will be used as penance to the goddess in an attempt to pay for the favors bestowed upon your arcology. First, one of your slaves is appointed to represent you as $his owner, who willingly gives the slave as sacrifice, and is put in charge of the slave's health while $he goes through the penance process. $activeSlave.slaveName is thoroughly bathed and $his whole body covered in blue paint, while $his mouth is covered in black paint, as payment for being a prostitute. /*Might need a clause here for other jobs besides "whore"*/ $He's taken to spend the night at the sexual servitude of another slave who will be sacrificed to Tezcatlipoca, god of the night sky. $He's <<if ($activeSlave.devotion > 20)>>fucked all night long <<else>>raped over and over again throughout the night <</if>>; $his holes dedicated to the sexual satisfaction of the slave who soon will face a much darker fate than $him to please the gods.
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
- <<set _randomVag = random(0,2)>>
- <<set _randomAnal = random(0,1)>>
+ <<set _randomVag = random(1,2)>>
+ <<set _randomAnal = random(1,2)>>
<<set _randomOral = random(2,6)>>
<<set $activeSlave.counter.vaginal += _randomVag, $activeSlave.counter.anal += _randomAnal, $activeSlave.counter.oral += _randomOral, $vaginalTotal += _randomVag, $analTotal += _randomAnal, $oralTotal += _randomOral>>
<<if $activeSlave.vagina == 0 && $activeSlave.anus == 0>>
@@ -194,9 +194,9 @@
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
<<if ($activeSlave.fetish == "submissive")>>
- $He makes sure is ready to take any order $he might be given, and it's evident that $he enjoys it every time $he is ordered to do something. As the week progresses $he finds $himself close to the limits of $his submission. As much as $he tries to keep $his hands to $himself, $his sexual frustration finally wins the battle, and $he desperately tries to masturbate, only for $him to discover how effective the chastity belt really is. $He cries in frustration and shame for being unable to fulfill $his orders. The signs of sexual frustration are more evident on $his body as time goes by and it is common to see $him repeating "<<Master>> told me no touching your<<s>>elf i<<s>> allowed" over and over again as $he shifts $his weight from foot to foot. The only thing that seems to shut $him up is when $he is ordered to come closer to drink, renew $his dose of aphrodisiacs or when ordered to be prepared to sleep. As soon as $he <<if canHear($activeSlave)>>hears<<elseif canSee($activeSlave)>>sees<<else>>recognizes<</if>> the order, $his body twitches and a soft moan can be heard. By the end of the week $he fights to remain standing up almost delusional as $he was told to remain on $his feet but the signs of exhaustion often bring $him to $his knees. Sometimes $he tries to touch $himself down there only to burst into tears when $he is unable to do so.
+ $He makes sure is ready to take any order $he might be given, and it's evident that $he enjoys it every time $he is ordered to do something. As the week progresses $he finds $himself close to the limits of $his submission. As much as $he tries to keep $his hands to $himself, $his sexual frustration finally wins the battle, and $he desperately tries to masturbate, only for $him to discover how effective the chastity belt really is. $He cries in frustration and shame for being unable to fulfill $his orders. The signs of sexual frustration are more evident on $his body as time goes by and it is common to see $him repeating "<<Master>> told me 'no touching your<<s>>elf i<<s>> allowed'" over and over again as $he shifts $his weight from foot to foot. The only thing that seems to shut $him up is when $he is ordered to come closer to drink, renew $his dose of aphrodisiacs or when ordered to be prepared to sleep. As soon as $he <<if canHear($activeSlave)>>hears<<elseif canSee($activeSlave)>>sees<<else>>recognizes<</if>> the order, $his body twitches and a soft moan can be heard. By the end of the week $he fights to remain standing up almost delusional as $he was told to remain on $his feet but the signs of exhaustion often bring $him to $his knees. Sometimes $he tries to touch $himself down there only to burst into tears when $he is unable to do so.
<<elseif ($activeSlave.fetish == "masochist")>>
- $He seems to enjoy the pain $his sacrifice submits $him to. Through the week is fairly common to see $his moaning and showing other signs of pleasure that seem to be fairly unrelated to the huge amounts of aphrodisiacs that run through $him. Every time the shot it is injected to $his body $he pants and thrusts, enjoying the pain of $his swollen <<if $activeSlave.dick != 0>>dick<<else>>pussy lips<</if>> throbbing inside $his chastity belt. As the week progresses, $he starts to frequently faint, as $he refuses to even drink the tea that keeps $him hydrated or sleep whatsoever, instead choosing to focus on the pain of being constantly aroused. As a precaution, alternative methods to keep $him hydrated are put in place to avoid the pleasure of being forced to drink every few hours as $he was caught several times trying to cum from it. By the end of the week $he needs to be constantly reanimated to fulfill $his vigil, moaning as $he comes to conscience as the exhaustion and pain on $his body washes over to $him.
+ $He seems to enjoy the pain $his sacrifice submits $him to. Through the week is fairly common to see $his moaning and showing other signs of pleasure that seem to be fairly unrelated to the huge amounts of aphrodisiacs that run through $him. Every time the shot it is injected to $his body $he pants and thrusts, enjoying the pain of $his swollen <<if $activeSlave.dick != 0>>dick<<elseif $activeSlave.vagina > -1>>pussy lips<</if>> throbbing inside $his chastity belt. As the week progresses, $he starts to frequently faint, as $he refuses to even drink the tea that keeps $him hydrated or sleep whatsoever, instead choosing to focus on the pain of being constantly aroused. As a precaution, alternative methods to keep $him hydrated are put in place to avoid the pleasure of being forced to drink every few hours as $he was caught several times trying to cum from it. By the end of the week $he needs to be constantly reanimated to fulfill $his vigil, moaning as $he comes to conscience as the exhaustion and pain on $his body washes over to $him.
<<elseif ($activeSlave.fetish == "cumslut")>> /*Will need to be completely rewritten*/
At first, $he seems resigned to not cum at all during $his penance. Soon $his resolution seems to vanish and $he can be seen constantly crying, trying to fight the excruciating need to touch $himself yet failing by trying to masturbate through the chastity belt. As a result of the aphrodisiacs in $his body the paint on the inner part of $his legs seems constantly wet and dripping into the cage which $he seems to enjoy. As $his whining and tears increases so do the spasms, a direct result of $his need to cum. The loincloth $he is wearing has to be constantly changed and $his legs constantly cleaned when it becomes apparent they are wet to avoid any evidence of pleasure. $He tries to make it more difficult as now it is the only thing $he has to fantasize on cumming. At the end of the week is often common to see $him beg to be touched by anyone who is close enough to hear $him and bursts into tears when $he is blatantly ignored. As a result of all this crying, the lack of food and sleep $he needs to be hydrated more often also the dose of aphrodisiacs is changed to be less potent but be injected more often to avoid the danger that $he might cum from it. $His body refuses to lose anymore more liquids, a fact that doesn't stop $him from sobbing and begging to be touched as soon as $he finds the strength to it while $he remains almost immobile on the bottom of the cage, interrupted by the spasms of $his body as a result of being constantly aroused for a week.
<<elseif ($activeSlave.fetish == "humiliation")>>
@@ -254,7 +254,7 @@
<<set $sactiveSlave.boobs += $activeSlave.boobsMilk>>
<</if>>
<<set $activeSlave.health -= 20>>
- The penance put $his body through great stress @@.red;which impacted $his health.@@
+ The penance put $his body through great stress @@.red;which impacted $his health.@@
<<set $currentRule.addict = 5>>
<<set $activeSlave.clothes = "no clothing">>
@@ -265,113 +265,107 @@
<<set $activeSlave.devotion += 4, $activeSlave.trust += 4>>
$His successful penance made $him @@.gold;trust@@ and @@.hotpink;love@@ you more as $he has proved both to you and the goddess how good of a slave $he is.
<<elseif ($activeSlave.fetish == "masochist")>>
- <<set $activeSlave.devotion += 6, $activeSlave.trust += 6>>
- The constant pain you submitted $him to during $his penance made $him @@.gold;trust@@ and @@.hotpink;love@@ you more.
- <<set $activeSlave.fetishStrength += 4>>
+ <<set $activeSlave.devotion += 6, $activeSlave.trust += 6>>
+ The constant pain you submitted $him to during $his penance made $him @@.gold;trust@@ and @@.hotpink;love@@ you more.
+ <<set $activeSlave.fetishStrength += 4>>
<<elseif ($activeSlave.fetish == "cumslut")>>
<<set $activeSlave.fetishStrength -= 2>>
<<elseif ($activeSlave.fetish == "humiliation")>>
- <<set $activeSlave.devotion += 6, $activeSlave.trust += 6>>
- The constant humiliation during $his penance made $him @@.gold;trust@@ and @@.hotpink;love@@ you more as $he has proved both to you and the goddess how good of a slave $he is.
- <<set $activeSlave.fetishStrength += 3>>
+ <<set $activeSlave.devotion += 6, $activeSlave.trust += 6>>
+ The constant humiliation during $his penance made $him @@.gold;trust@@ and @@.hotpink;love@@ you more as $he has proved both to you and the goddess how good of a slave $he is.
+ <<set $activeSlave.fetishStrength += 3>>
<<elseif ($activeSlave.fetish == "buttslut")>>
- <<set $activeSlave.fetishStrength -= 2>>
+ <<set $activeSlave.fetishStrength -= 2>>
<<elseif ($activeSlave.fetish == "boobs")>>
- <<set $activeSlave.fetishStrength -= 2>>
+ <<set $activeSlave.fetishStrength -= 2>>
<</if>>
<<else>>
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
$He now understands the importance of $his role as a pennant slave, $his commitment to you and the goddess makes $him @@.gold;trust@@ and @@.hotpink;love@@ you more.
<</if>>
-
<<elseif ($activeSlave.devotion > 20) || (($activeSlave.devotion >= -20) && ($activeSlave.trust < -20) && ($activeSlave.trust >= -50))>>
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
- <<if fetishChangeChance($activeSlave) > random(0,100)>>
- <<set $activeSlave.fetishKnown = 1, $activeSlave.fetish = "masochist">>
- <</if>>
-
+ <<if fetishChangeChance($activeSlave) > random(0,100)>>
+ <<set $activeSlave.fetishKnown = 1, $activeSlave.fetish = "masochist">>
+ <</if>>
<<if ($activeSlave.fetish == "submissive")>>
- <<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
- The constant submission $he was subjected under your orders made $him @@.gold;trust@@ and @@.hotpink;love you more.@@
- <<set $activeSlave.fetishStrength += 6>>
+ <<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
+ The constant submission $he was subjected under your orders made $him @@.gold;trust@@ and @@.hotpink;love you more.@@
+ <<set $activeSlave.fetishStrength += 6>>
<<elseif ($activeSlave.fetish == "masochist")>>
- <<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
- The constant abuse $he was subjected under your orders made $him @@.gold;trust@@ and @@.hotpink;love you more.@@
+ <<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
+ The constant abuse $he was subjected under your orders made $him @@.gold;trust@@ and @@.hotpink;love you more.@@
<<elseif ($activeSlave.fetish == "cumslut")>>
- <<set $activeSlave.fetishStrength -= 2>>
+ <<set $activeSlave.fetishStrength -= 2>>
<<elseif ($activeSlave.fetish == "humiliation")>>
- <<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
- The constant humiliation $he was subjected under your orders made $him @@.gold;trust@@ and @@.hotpink;love you more.@@
- <<set $activeSlave.fetishStrength += 6>>
+ <<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
+ The constant humiliation $he was subjected under your orders made $him @@.gold;trust@@ and @@.hotpink;love you more.@@
+ <<set $activeSlave.fetishStrength += 6>>
<<elseif ($activeSlave.fetish == "buttslut")>>
- <<set $activeSlave.fetishStrength -= 2>>
+ <<set $activeSlave.fetishStrength -= 2>>
<<elseif ($activeSlave.fetish == "boobs")>>
- <<set $activeSlave.fetishStrength -= 2>>
+ <<set $activeSlave.fetishStrength -= 2>>
<</if>>
<<else>>
$He now understands the importance of $his role as a pennant slave, $his commitment to you and the goddess. $He neither trusts nor loves you more any more or less.
<</if>>
-
<<if ($activeSlave.sexualFlaw == "hates oral")>>
<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
- The constant abuse to $his mouth for $his feedings and the pain you subject $him to makes $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ The constant abuse to $his mouth for $his feedings and the pain you subject $him to makes $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
<<set $activeSlave.fetishStrength -= 5>>
<<elseif ($activeSlave.sexualFlaw == "hates anal")>>
<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
- $His constant need of release without the chance to stimulate $his ass and the pain you subject $him to made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ $His constant need of release without the chance to stimulate $his ass and the pain you subject $him to made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
<<set $activeSlave.fetishStrength -= 2>>
<<elseif ($activeSlave.sexualFlaw == "shamefast")>>
<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
- The constant exposure of $his naked body through the bars to anyone willing to see $him and the pain you subjected $him to made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ The constant exposure of $his naked body through the bars to anyone willing to see $him and the pain you subjected $him to made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
<<set $activeSlave.fetishStrength -= 4>>
<<elseif ($activeSlave.sexualFlaw == "self hating")>>
<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
- The constant depravation of food, sleep and sexual release made $him hate $himself more. As a result $he @@.mediumorchid;trusts you less@@ and @@.hotpink;hates you more.@@
+ The constant depravation of food, sleep and sexual release made $him hate $himself more. As a result $he @@.mediumorchid;trusts you less@@ and @@.hotpink;hates you more.@@
<<set $activeSlave.fetishStrength += 7>>
<<elseif ($activeSlave.sexualFlaw == "repressed")>>
<<set $activeSlave.fetishStrength -= 2>>
- The constant shame $he was subjected in such a public way made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ The constant shame $he was subjected in such a public way made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
<<else>>
<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
The lack of food, sleep and the constant arousal with the chastity belt made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
<</if>>
-
<<elseif ($activeSlave.trust < -20)>>
<<if ($activeSlave.fetish != "none")>>
- <<if fetishChangeChance($activeSlave) > random(0,100)>>
- <<set $activeSlave.fetishStrength = 10, $activeSlave.fetishKnown = 1, $activeSlave.fetish = "masochist">>
- <</if>>
+ <<if fetishChangeChance($activeSlave) > random(0,100)>>
+ <<set $activeSlave.fetishStrength = 10, $activeSlave.fetishKnown = 1, $activeSlave.fetish = "masochist">>
+ <</if>>
<</if>>
<</if>>
<<if ($activeSlave.sexualFlaw == "hates oral")>>
- <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
- The constant abuse of $his mouth for feedings and the pain you subjected $him to made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
- <<set $activeSlave.fetishStrength -= 6>>
+ <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
+ The constant abuse of $his mouth for feedings and the pain you subjected $him to made $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ <<set $activeSlave.fetishStrength -= 6>>
<<elseif ($activeSlave.sexualFlaw == "shamefast")>>
- <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
- The constant exposure of $his naked body through the bars to anyone willing to see $him and the pain you subjected $him to makes $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
- <<set $activeSlave.fetishStrength -= 5>>
+ <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
+ The constant exposure of $his naked body through the bars to anyone willing to see $him and the pain you subjected $him to makes $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ <<set $activeSlave.fetishStrength -= 5>>
<<elseif ($activeSlave.sexualFlaw == "repressed")>>
- <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
- The constant shame $he was subjected in such a public way makes $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
+ The constant shame $he was subjected in such a public way makes $him @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
<<elseif ($activeSlave.sexualFlaw == "attention whore")>>
- <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
- $He @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more@@ for spoiling $his chance for attention and depriving $him of $his audience.
+ <<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
+ $He @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more@@ for spoiling $his chance for attention and depriving $him of $his audience.
<<set $activeSlave.fetishStrength += 2>>
<<elseif ($activeSlave.sexualFlaw == "self hating")>>
<<set $activeSlave.devotion -= 7, $activeSlave.trust -= 7>>
- The constant depravation of food, sleep and sexual release made $him hate $himself more. As a result $he @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
+ The constant depravation of food, sleep and sexual release made $him hate $himself more. As a result $he @@.mediumorchid;trust you less@@ and @@.hotpink;hate you more.@@
<<set $activeSlave.fetishStrength += 5>>
<<else>>
- <<set $activeSlave.devotion -= 3, $activeSlave.trust -= 3>>
+ <<set $activeSlave.devotion -= 3, $activeSlave.trust -= 3>>
The lack of food, sleep and the constant arousal with the chastity belt made $him @@.gold;trust you less@@ and @@.mediumorchid;hate you more.@@
-
<</if>>
<<if $arcologies[0].FSAztecRevivalist !== "unset" && $arcologies[0].FSAztecRevivalist < 100>>
<<set $arcologies[0].FSAztecRevivalist += 1>>
<</if>>
<<set $slavesSacrificedThisWeek = ($slavesSacrificedThisWeek || 0) + 1>>
-
<<elseif $sacrificeType == "life">>
$He dies screaming as $his still beating heart is ripped out of $his body. <<if _activeSlaveRepSacrifice <= 0>>Nobody cares.<<elseif _activeSlaveRepSacrifice < 10>>The few spectators are suitably impressed.<<elseif _activeSlaveRepSacrifice < 100>>The small crowd appreciates your devotion to the Aztec culture.<<else>>The crowd cheers to the bloody spectacle.<</if>><<if $slaves.length > 0>> On the other hand, your remaining <<if $slaves.length == 1>>slave is<<else>>slaves are<</if>> suitably @@.gold;horrified@@.<</if>>
<<run repX(_activeSlaveRepSacrifice, "futureSocieties")>>
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index 329214ddb72461e73f7ec7a8f5d379192834d56b..3ff9a1acbec1e030e2e6de071d7502cc15abd11a 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -119,7 +119,7 @@ Names will
<<if $surnameOrder == 0>>
adhere to a slave's country of origin. //[[Force name surname|Description Options][$surnameOrder = 1]]// | //[[Force surname name|Description Options][$surnameOrder = 2]]//
<<elseif $surnameOrder == 1>>
- always be name surname. //[[Allow nationality name order|Description Options][$surnameOrder = 0]]// | //[[Force surname name|Description Options][$surnameOrder = 2]]//
+ always be name then surname. //[[Allow nationality name order|Description Options][$surnameOrder = 0]]// | //[[Force surname name|Description Options][$surnameOrder = 2]]//
<<elseif $surnameOrder == 2>>
- always be name surname. //[[Allow nationality name order|Description Options][$surnameOrder = 0]]// | //[[Force name surname|Description Options][$surnameOrder = 1]]//
+ always be surname then name. //[[Allow nationality name order|Description Options][$surnameOrder = 0]]// | //[[Force name surname|Description Options][$surnameOrder = 1]]//
<</if>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index cd14e70d2112ea6645a90f08fe1356a9d7e5c458..5f5d536fca142e3efad6d5768147df172a875168 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2004,6 +2004,7 @@
<<setLocalPronouns $activeSlave>>
<<run Enunciate($activeSlave)>>
<<setAssistantPronouns>>
+<<setPlayerPronouns>>
<<switch $recruit>>
<<case "female recruit">>