diff --git a/src/Mods/Catmod/events/SoSSniper.tw b/src/Mods/Catmod/events/SoSSniper.tw
index c5b1fc09bf2ce5c127dbebd46a366b92b98eb430..d31cf27ecf697ca6002940276780f8a3ac9349a5 100644
--- a/src/Mods/Catmod/events/SoSSniper.tw
+++ b/src/Mods/Catmod/events/SoSSniper.tw
@@ -18,19 +18,38 @@
</span>
<</if>>
+<<set _slave = GenerateNewSlave(null, {minAge: 18, maxAge: 32, disability: 1})>>
+<<run generateSalonModifications(_slave)>>
+<<set _slave.face = random(50,100)>>
+<<set _slave.origin = "$He was an elite sniper of the Sons of Sekhmet, nearly successful in assassinating you with a long-range shot from across the arcology before being captured by your Imperial Knights in a tense shootout.">>
+<<set _slave.intelligenceImplant = 30>>
+<<set _slave.career = "a sniper">>
+<<set _slave.skill.combat = 1>>
+<<set _slave.devotion = -100>>
+<<set _slave.trust = random(-20,10)>>
+<<set _slave.weight = random(-20,30)>>
+<<set _slave.muscles = random(20,80)>>
+<<set _slave.waist = random(10,80)>>
+<<set _slave.shouldersTat = either("flowers", "tribal patterns", "asian art")>>
+<<set _slave.custom.tattoo = "$He has the orange sun of the Sons of Sekhmet tattooed on $his neck, marking $him as a high-ranking operative.">>
+
It's a particularly nice day out and you've decided to visit some of the more prominent citizens of your arcology, the kind of people you might call 'friends' if genuine friendship wasn't a quick way to get stabbed in the back in the Free Cities. As you're having a pleasant conversation with one of these notables on the raised porch of his luxurious apartment, $assistant.name pings you with an urgent message: DUCK.
<br><br>
<<if $PC.skill.warfare >= 60>>
-You don't even think about it. Combat reflexes kicking in, you dive onto the ground as something whizzes past your head close enough to shave off a lock of hair, slamming into the ground next to you with enough force to shatter the wood. Before you conciously realize what's going on, your body understands that you're being shot at, <<if _S.Bodyguard>> _S.Bodyguard.slaveName helping you up and shielding you with $his body as you're hustled into the citizen's apartment with the citizen himself<<else>>leaping up and springing towards the citizen's apartment with the frightened man himself<</if>>. Two more shots slam into the wood around you as you all but leap into the citizen's apartment, one more bullet splintering the wood of the door as you close it shut behind you.
-<<run cashX(-1000, "event", _S.Bodyguard)>>
-
+ You don't even think about it. Combat reflexes kicking in, you dive onto the ground as something whizzes past your head close enough to shave off a lock of hair, slamming into the ground next to you with enough force to shatter the wood. Before you conciously realize what's going on, your body understands that you're being shot at,
+ <<if _S.Bodyguard>>
+ _S.Bodyguard.slaveName helping you up and shielding you with $his body as you're hustled into the citizen's apartment with the citizen himself
+ <<else>>
+ leaping up and springing towards the citizen's apartment with the frightened man himself
+ <</if>>.
+ Two more shots slam into the wood around you as you all but leap into the citizen's apartment, one more bullet splintering the wood of the door as you close it shut behind you.
+ <<run cashX(-1000, "event", _S.Bodyguard)>>
<<elseif _S.Bodyguard.intelligence + _S.Bodyguard.intelligenceImplant > 60>>
-You blink once at the message in confusion before _S.Bodyguard.slaveName tackles you, $his shoulder bursting out with an explosion of red as $he catches a bullet clearly meant for you. $He cries out in pain, but it doesn't look like the hit was lethal; even injured and bleeding, $he shields you as you hustle into the open apartment along with the spooked citizen, more shots impacting around you as you wildly scramble into cover. A final bullet splinters the wood of the door as you close it shut behind you.
-<<run cashX(-1000, "event", _S.Bodyguard), healthDamage(_S.Bodyguard, 60)>>
-
+ You blink once at the message in confusion before _S.Bodyguard.slaveName tackles you, $his shoulder bursting out with an explosion of red as $he catches a bullet clearly meant for you. $He cries out in pain, but it doesn't look like the hit was lethal; even injured and bleeding, $he shields you as you hustle into the open apartment along with the spooked citizen, more shots impacting around you as you wildly scramble into cover. A final bullet splinters the wood of the door as you close it shut behind you.
+ <<run cashX(-1000, "event", _S.Bodyguard), healthDamage(_S.Bodyguard, 60)>>
<<else>>
-<<set $gameover = "snipedbysons">><<goto "Gameover">>
+ <<set $gameover = "snipedbysons">><<goto "Gameover">>
<</if>>
<br><br>
As you pant in the wake of the sudden attack, $assistant.name notifies you that they've traced the origin of the shots to somewhere in Sector Three. Having missed the killing shot, the sniper is undoubtedly packing up and moving to leave right now. You'll have to get a search party moving immediately if you want any hope of tracking them down.
@@ -38,133 +57,109 @@ As you pant in the wake of the sudden attack, $assistant.name notifies you that
<span id="result">
<<if $arcologies[0].FSNeoImperialistLaw1 == 1>>
-<br> <<link "Lock down the sector and notify your Imperial Knights to lead citizens out in searching for the shooter">>
- <<replace "#result">>
- <<if random(1,2,3) == 1>><<set $sniperescape = 1>> After a few hours of searching, your brightly-painted Knights return empty-handed, cursing that it was like no one was ever there. <<elseif random(1,2) == 1>><<set $sniperescape = 2>> After maybe thirty minutes, you hear loud gunfire coming from the sector where your Knights are searching. About five minutes later, a Knight in bright red armor brings you a body slung over his shoulder and thumps it in the ground in front of you, riddled in bullet holes and marked with the logo of the Sons of Sekhmet. "We got the bastard, m'lord." The Knight drawls. With his other hand, he tosses a broken sniper rifle next to the corpse. <<else>><<set $sniperescape = 3>> After maybe thirty minutes, you hear loud gunfire coming from the sector where your Knights are searching. About five minutes later, a Knight in bright red armor brings you a captive bound heavily with iron shackles, covered in body armor bearing the logo of the Sons of Sekhmet. In his other hand, he tosses a broken sniper rifle on the ground in front of you.<</if>>
- <br><br>
- <<if $sniperescape == 1>>
- The assassination attempt and subsequent escape has @@.red;scared@@ many of your citizens, even after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. A few days later, a trader passing by the arcology hands you an envelope, saying that he was told to pass it onto you. Inside is a single slip of paper, totally blank except for a single line of text: "See you soon." The envelope is emblazoned with the logo of an orange sun.
- <<set $arcologies[0].prosperity -= 1>>
- <<run repX(-2000, "event")>>
- <<elseif $sniperescape == 2>>
- Surviving the assassination attempt and killing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
- <br><br>
- "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. This was not the first attempt we have made, and it will not be the last. Next time, we will inscribe his name on the bullet that finishes the job. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
- <<set $arcologies[0].prosperity += 1>>
- <<run repX(2000, "event")>>
- <<elseif $sniperescape == 3>>
- Surviving the assassination attempt and capturing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
- <br><br>
- "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. The enemy has captured one of ours - in time we will free them, or perhaps they will awake to find a dagger in their back. Soon, they will understand the grave mistake of taking a Son into their ranks, even as a slave. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
- <<set $arcologies[0].prosperity += 1>>
- <<run repX(2000, "event")>>
- <<set $activeSlaveOneTimeMinAge = 18>>
- <<set $activeSlaveOneTimeMaxAge = 32>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("")>>
- <<run generateSalonModifications($activeSlave)>>
- <<set $activeSlave.face = random(50,100)>>
- <<set $activeSlave.origin = "$He was an elite sniper of the Sons of Sekhmet, nearly successful in assassinating you with a long-range shot from across the arcology before being captured by your Imperial Knights in a tense shootout.">>
- <<set $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.career = "a sniper">>
- <<set $activeSlave.skill.combat = 1>>
- <<set $activeSlave.devotion = -100>>
- <<set $activeSlave.trust = random(-20,10)>>
- <<set $activeSlave.weight = random(-20,30)>>
- <<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.waist = random(10,80)>>
- <<set $activeSlave.shouldersTat = either("flowers", "tribal patterns", "asian art")>>
- <<set $activeSlave.custom.tattoo = "$He has the orange sun of the Sons of Sekhmet tattooed on $his neck, marking $him as a high-ranking operative.">>
- <<run newSlave($activeSlave)>>
- <</if>>
- <</replace>>
-<</link>>
+ <br> <<link "Lock down the sector and notify your Imperial Knights to lead citizens out in searching for the shooter">>
+ <<replace "#result">>
+ <<if random(1,2,3) == 1>>
+ <<set _sniperescape = 1>>
+ After a few hours of searching, your brightly-painted Knights return empty-handed, cursing that it was like no one was ever there.
+ <<elseif random(1,2) == 1>>
+ <<set _sniperescape = 2>>
+ After maybe thirty minutes, you hear loud gunfire coming from the sector where your Knights are searching. About five minutes later, a Knight in bright red armor brings you a body slung over his shoulder and thumps it in the ground in front of you, riddled in bullet holes and marked with the logo of the Sons of Sekhmet. "We got the bastard, m'lord." The Knight drawls. With his other hand, he tosses a broken sniper rifle next to the corpse.
+ <<else>>
+ <<set _sniperescape = 3>>
+ After maybe thirty minutes, you hear loud gunfire coming from the sector where your Knights are searching. About five minutes later, a Knight in bright red armor brings you a captive bound heavily with iron shackles, covered in body armor bearing the logo of the Sons of Sekhmet. In his other hand, he tosses a broken sniper rifle on the ground in front of you.
+ <</if>>
+ <br><br>
+ <<if _sniperescape == 1>>
+ The assassination attempt and subsequent escape has @@.red;scared@@ many of your citizens, even after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. A few days later, a trader passing by the arcology hands you an envelope, saying that he was told to pass it onto you. Inside is a single slip of paper, totally blank except for a single line of text: "See you soon." The envelope is emblazoned with the logo of an orange sun.
+ <<set $arcologies[0].prosperity -= 1>>
+ <<run repX(-2000, "event")>>
+ <<elseif _sniperescape == 2>>
+ Surviving the assassination attempt and killing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
+ <br><br>
+ "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. This was not the first attempt we have made, and it will not be the last. Next time, we will inscribe his name on the bullet that finishes the job. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
+ <<set $arcologies[0].prosperity += 1>>
+ <<run repX(2000, "event")>>
+ <<elseif _sniperescape == 3>>
+ Surviving the assassination attempt and capturing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
+ <br><br>
+ "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. The enemy has captured one of ours - in time we will free them, or perhaps they will awake to find a dagger in their back. Soon, they will understand the grave mistake of taking a Son into their ranks, even as a slave. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
+ <<set $arcologies[0].prosperity += 1>>
+ <<run repX(2000, "event")>>
+ <<run newSlave(_slave)>>
+ <</if>>
+ <</replace>>
+ <</link>>
<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>
-<br> <<link "Lock down the sector and notify your Praetorians to lead the citizens out in searching for the shooter">>
- <<replace "#result">>
-<<if random(1,2,3) == 1>><<set $sniperescape = 1>> After a few hours of searching, your armed Praetorian citizens return empty-handed, cursing that it was like no one was ever there. <<elseif random(1,2) == 1>><<set $sniperescape = 2>> After maybe thirty minutes, you hear loud gunfire coming from the sector where your citizens are searching. About five minutes later, a group of rough-looking Hastati citizens bring you a body slung over his shoulder and thumps it in the ground in front of you, riddled in bullet holes and marked with the logo of the Sons of Sekhmet. "We got the filth." The Hastati carrying the body enunciates. With his other hand, he tosses a broken sniper rifle next to the corpse. <<else>><<set $sniperescape = 3>> After maybe thirty minutes, you hear loud gunfire coming from the sector where your citizens are searching. About five minutes later, a group of rough-looking Hastati citizens bring you a captive bound heavily with iron shackles, covered in body armor bearing the logo of the Sons of Sekhmet. In his other hand, he tosses a broken sniper rifle on the ground in front of you.<</if>>
- <br><br>
- <<if $sniperescape == 1>>
- The assassination attempt and subsequent escape has @@.red;scared@@ many of your citizens, even after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. A few days later, a trader passing by the arcology hands you an envelope, saying that he was told to pass it onto you. Inside is a single slip of paper, totally blank except for a single line of text: "See you soon." The envelope is emblazoned with the logo of an orange sun.
- <<set $arcologies[0].prosperity -= 1>>
- <<run repX(-2000, "event")>>
- <<elseif $sniperescape == 2>>
- Surviving the assassination attempt and killing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
- <br><br>
- "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. This was not the first attempt we have made, and it will not be the last. Next time, we will inscribe his name on the bullet that finishes the job. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
- <<set $arcologies[0].prosperity += 1>>
- <<run repX(2000, "event")>>
- <<elseif $sniperescape == 3>>
- Surviving the assassination attempt and capturing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
- <br><br>
- "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. The enemy has captured one of ours - in time we will free them, or perhaps they will awake to find a dagger in their back. Soon, they will understand the grave mistake of taking a Son into their ranks, even as a slave. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
- <<set $arcologies[0].prosperity += 1>>
- <<run repX(2000, "event")>>
- <<set $activeSlaveOneTimeMinAge = 18>>
- <<set $activeSlaveOneTimeMaxAge = 32>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("")>>
- <<run generateSalonModifications($activeSlave)>>
- <<set $activeSlave.face = random(50,100)>>
- <<set $activeSlave.origin = "$He was an elite sniper of the Sons of Sekhmet, nearly successful in assassinating you with a long-range shot from across the arcology before being captured by your Imperial Knights in a tense shootout.">>
- <<set $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.career = "a sniper">>
- <<set $activeSlave.skill.combat = 1>>
- <<set $activeSlave.devotion = -100>>
- <<set $activeSlave.trust = random(-20,10)>>
- <<set $activeSlave.weight = random(-20,30)>>
- <<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.waist = random(10,80)>>
- <<set $activeSlave.shouldersTat = either("flowers", "tribal patterns", "asian art")>>
- <<set $activeSlave.custom.tattoo = "$He has the orange sun of the Sons of Sekhmet tattooed on $his neck, marking $him as a high-ranking operative.">>
- <<run newSlave($activeSlave)>>
- <</if>>
- <</replace>>
-<</link>>
+ <br> <<link "Lock down the sector and notify your Praetorians to lead the citizens out in searching for the shooter">>
+ <<replace "#result">>
+ <<if random(1,2,3) == 1>>
+ <<set _sniperescape = 1>>
+ After a few hours of searching, your armed Praetorian citizens return empty-handed, cursing that it was like no one was ever there.
+ <<elseif random(1,2) == 1>>
+ <<set _sniperescape = 2>>
+ After maybe thirty minutes, you hear loud gunfire coming from the sector where your citizens are searching. About five minutes later, a group of rough-looking Hastati citizens bring you a body slung over his shoulder and thumps it in the ground in front of you, riddled in bullet holes and marked with the logo of the Sons of Sekhmet. "We got the filth." The Hastati carrying the body enunciates. With his other hand, he tosses a broken sniper rifle next to the corpse.
+ <<else>>
+ <<set _sniperescape = 3>>
+ After maybe thirty minutes, you hear loud gunfire coming from the sector where your citizens are searching. About five minutes later, a group of rough-looking Hastati citizens bring you a captive bound heavily with iron shackles, covered in body armor bearing the logo of the Sons of Sekhmet. In his other hand, he tosses a broken sniper rifle on the ground in front of you.
+ <</if>>
+ <br><br>
+ <<if _sniperescape == 1>>
+ The assassination attempt and subsequent escape has @@.red;scared@@ many of your citizens, even after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. A few days later, a trader passing by the arcology hands you an envelope, saying that he was told to pass it onto you. Inside is a single slip of paper, totally blank except for a single line of text: "See you soon." The envelope is emblazoned with the logo of an orange sun.
+ <<set $arcologies[0].prosperity -= 1>>
+ <<run repX(-2000, "event")>>
+ <<elseif _sniperescape == 2>>
+ Surviving the assassination attempt and killing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
+ <br><br>
+ "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. This was not the first attempt we have made, and it will not be the last. Next time, we will inscribe his name on the bullet that finishes the job. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
+ <<set $arcologies[0].prosperity += 1>>
+ <<run repX(2000, "event")>>
+ <<elseif _sniperescape == 3>>
+ Surviving the assassination attempt and capturing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
+ <br><br>
+ "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. The enemy has captured one of ours - in time we will free them, or perhaps they will awake to find a dagger in their back. Soon, they will understand the grave mistake of taking a Son into their ranks, even as a slave. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
+ <<set $arcologies[0].prosperity += 1>>
+ <<run repX(2000, "event")>>
+ <<run newSlave(_slave)>>
+ <</if>>
+ <</replace>>
+ <</link>>
<</if>>
<<if $mercenaries == 5>>
-<br> <<link "Lock down the sector and notify your $mercenariesTitle to send in hunter-killer teams">>
+ <br> <<link "Lock down the sector and notify your $mercenariesTitle to send in hunter-killer teams">>
<<replace "#result">>
- <<if random(1,2,3) == 1>><<set $sniperescape = 1>> After a few hours of searching, your $mercenariesTitle return empty-handed, cursing that it was like no one was ever there. <<elseif random(1,2) == 1>><<set $sniperescape = 2>> After maybe thirty minutes, you hear loud gunfire coming from the sector where your $mercenariesTitle are searching. About five minutes later, a small squad of heavily-armored mercenaries bring you a body, dragging it in the ground in front of you, riddled in bullet holes and marked with the logo of the Sons of Sekhmet. "We got the fucker." The sergeant of the mercenary squad grumbles. With his other hand, he tosses a broken sniper rifle next to the corpse. <<else>><<set $sniperescape = 3>> After maybe thirty minutes, you hear loud gunfire coming from the sector where your $mercenariesTitle are searching. About five minutes later, a small squad of heavily-armored mercenaries bring you a captive bound heavily with iron shackles, covered in body armor bearing the logo of the Sons of Sekhmet. One of the tosses a broken sniper rifle on the ground in front of you.<</if>>
- <br><br>
- <<if $sniperescape == 1>>
- The assassination attempt and subsequent escape has @@.red;scared@@ many of your citizens, even after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. A few days later, a trader passing by the arcology hands you an envelope, saying that he was told to pass it onto you. Inside is a single slip of paper, totally blank except for a single line of text: "See you soon." The envelope is emblazoned with the logo of an orange sun.
- <<set $arcologies[0].prosperity -= 1>>
- <<run repX(-2000, "event")>>
- <<elseif $sniperescape == 2>>
- Surviving the assassination attempt and killing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
- <br><br>
- "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. This was not the first attempt we have made, and it will not be the last. Next time, we will inscribe his name on the bullet that finishes the job. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
- <<set $arcologies[0].prosperity += 1>>
- <<run repX(2000, "event")>>
- <<elseif $sniperescape == 3>>
- Surviving the assassination attempt and capturing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
- <br><br>
- "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. The enemy has captured one of ours - in time we will free them, or perhaps they will awake to find a dagger in their back. Soon, they will understand the grave mistake of taking a Son into their ranks, even as a slave. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
- <<set $arcologies[0].prosperity += 1>>
- <<run repX(2000, "event")>>
- <<set $activeSlaveOneTimeMinAge = 18>>
- <<set $activeSlaveOneTimeMaxAge = 32>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("")>>
- <<run generateSalonModifications($activeSlave)>>
- <<set $activeSlave.face = random(50,100)>>
- <<set $activeSlave.origin = "$He was an elite sniper of the Sons of Sekhmet, nearly successful in assassinating you with a long-range shot from across the arcology before being captured by your Imperial Knights in a tense shootout.">>
- <<set $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.career = "a sniper">>
- <<set $activeSlave.skill.combat = 1>>
- <<set $activeSlave.devotion = -100>>
- <<set $activeSlave.trust = random(-20,10)>>
- <<set $activeSlave.weight = random(-20,30)>>
- <<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.waist = random(10,80)>>
- <<set $activeSlave.shouldersTat = either("flowers", "tribal patterns", "asian art")>>
- <<set $activeSlave.custom.tattoo = "$He has the orange sun of the Sons of Sekhmet tattooed on $his neck, marking $him as a high-ranking operative.">>
- <<run newSlave($activeSlave)>>
- <</if>>
+ <<if random(1,2,3) == 1>>
+ <<set _sniperescape = 1>>
+ After a few hours of searching, your $mercenariesTitle return empty-handed, cursing that it was like no one was ever there.
+ <<elseif random(1,2) == 1>>
+ <<set _sniperescape = 2>>
+ After maybe thirty minutes, you hear loud gunfire coming from the sector where your $mercenariesTitle are searching. About five minutes later, a small squad of heavily-armored mercenaries bring you a body, dragging it in the ground in front of you, riddled in bullet holes and marked with the logo of the Sons of Sekhmet. "We got the fucker." The sergeant of the mercenary squad grumbles. With his other hand, he tosses a broken sniper rifle next to the corpse.
+ <<else>>
+ <<set _sniperescape = 3>>
+ After maybe thirty minutes, you hear loud gunfire coming from the sector where your $mercenariesTitle are searching. About five minutes later, a small squad of heavily-armored mercenaries bring you a captive bound heavily with iron shackles, covered in body armor bearing the logo of the Sons of Sekhmet. One of the tosses a broken sniper rifle on the ground in front of you.
+ <</if>>
+ <br><br>
+ <<if _sniperescape == 1>>
+ The assassination attempt and subsequent escape has @@.red;scared@@ many of your citizens, even after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. A few days later, a trader passing by the arcology hands you an envelope, saying that he was told to pass it onto you. Inside is a single slip of paper, totally blank except for a single line of text: "See you soon." The envelope is emblazoned with the logo of an orange sun.
+ <<set $arcologies[0].prosperity -= 1>>
+ <<run repX(-2000, "event")>>
+ <<elseif _sniperescape == 2>>
+ Surviving the assassination attempt and killing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
+ <br><br>
+ "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. This was not the first attempt we have made, and it will not be the last. Next time, we will inscribe his name on the bullet that finishes the job. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
+ <<set $arcologies[0].prosperity += 1>>
+ <<run repX(2000, "event")>>
+ <<elseif _sniperescape == 3>>
+ Surviving the assassination attempt and capturing the assassin earns you @@.green;admiration@@ of the citizenry, who see you as strong for punishing the assassin, particularly after you @@.red;pay@@ for the damage the sniper bullets caused to the wealthy elite's propety. The next day, the Sons of Sekhmet release a 'news' update featuring their balaclava-wearing figurehead in front of his professional desk.
+ <br><br>
+ "Today a servant of Sekhmet was martyred while making an attempt on the life of a hedonistic new-world plutocrat. The enemy has captured one of ours - in time we will free them, or perhaps they will awake to find a dagger in their back. Soon, they will understand the grave mistake of taking a Son into their ranks, even as a slave. Abna Sakhmat damk-" You turn off the report. That's about all you need to see.
+ <<set $arcologies[0].prosperity += 1>>
+ <<run repX(2000, "event")>>
+ <<run newSlave(_slave)>>
+ <</if>>
<</replace>>
-<</link>>
+ <</link>>
<</if>>
<br><<link "Just lock down the sector and send out search parties for the shooter">>
<<replace "#result">>
@@ -173,4 +168,4 @@ As you pant in the wake of the sudden attack, $assistant.name notifies you that
<<run repX(-2000, "event")>>
<</replace>>
<</link>>
-</span>
+</span>
\ No newline at end of file
diff --git a/src/events/scheduled/projectNBlowingTheLid.tw b/src/events/scheduled/projectNBlowingTheLid.tw
index a284ca0ca7cdc020d1c995ebb1e60ac202e650f5..93be36c165e592b25eede49c8c5c63eaa4178bf4 100644
--- a/src/events/scheduled/projectNBlowingTheLid.tw
+++ b/src/events/scheduled/projectNBlowingTheLid.tw
@@ -6,6 +6,15 @@
<<set $puristsFurious = 1>>
<<run repX(-4000, "event")>>
+<<set _slave = GenerateNewSlave(null, {minAge: 16, maxAge: 32, disability: 1})>>
+<<run generateSalonModifications(_slave)>>
+<<set _slave.origin = "$He is an enslaved Son of Sekhmet, one of many idealistic rebel groups violently opposed to you.">>
+<<set _slave.devotion = random(-90,-70)>>
+<<set _slave.trust = random(-20,30)>>
+<<set _slave.weight = random(-20,30)>>
+<<set _slave.muscles = random(20,80)>>
+<<set _slave.waist = random(10,80)>>
+
It's a fine, sunny afternoon in your plaza, surrounded by the noise of bustling merchants harking their wares and slavegirls glibly advertising their bodies, for money, pleasure, or just simple decorative value. As you're inspecting a particularly beautiful raven-haired slave, the plaza's many vidscreens, usually buzzing with the noise of arcology media, suddenly all go black with a crackle of electricity. As the marketplace, yourself included, turn their heads to the unusual display, the screens come back on again, this time universally displaying a man in a dark balaclava, seated at a nondescript desk with a series of papers held in his gloved hands.
<br><br>
"Attention, citizens of $arcologies[0].name. It has come to our attention, the Sons of Sekhmet, that the tyrant of your "free" city, <<= PlayerName()>>, has constructed an underground laboratory from which they have been methodically conducting deeply unethical genetic experiments for the last three months, underneath all of your noses, and involving the inhumane splicing of human and animal DNA into a twisted abomination of a creature." The balaclava-clad man shuffles his papers as slaves and merchants alike glance towards you in stricken shock.
@@ -21,18 +30,7 @@ It's a fine, sunny afternoon in your plaza, surrounded by the noise of bustling
You immediately call out for your AI to send an emergency bulletin to every Knight in the city ordering them to get to your lab, and fast. As you yourself sprint towards the laboratory, the crack of loud gunshots ring through the air, back-and-forth fire that keeps going for nearly a full minute. By the time you finally arrive, you find the entrance to the lab absolutely covered in blood and bodies. All of the corpses on the ground are dressed in black and orange and clutching old-fashioned assault rifles, surrounded by guardsmen dressed in hot pink liveries. Their Knight, a goliath of a man wearing equally hot pink Imperial Plate bearing his crest that makes him look even bigger, is busy wrestling one struggling figure in black and orange to the ground, apparently the sole survivor on the Sons' side. As much as the Sons of Sekhmet's annoucement has @@.red;shocked@@ the arcology, the timely and heroic response of your Knights is just the PR event you needed to @@.green;reverse the damage@@, especially when the rattled Dr. Nieskowitz comes out from the assaulted lab to thank you for saving his life.
<<run repX(4000, "event")>>
<<set $projectN.status = 5>>
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 32>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("")>>
- <<run generateSalonModifications($activeSlave)>>
- <<set $activeSlave.origin = "$He is an enslaved Son of Sekhmet, one of many idealistic rebel groups violently opposed to you.">>
- <<set $activeSlave.devotion = random(-90,-70)>>
- <<set $activeSlave.trust = random(-20,30)>>
- <<set $activeSlave.weight = random(-20,30)>>
- <<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.waist = random(10,80)>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>>
<</if>>
@@ -42,18 +40,7 @@ It's a fine, sunny afternoon in your plaza, surrounded by the noise of bustling
You immediately send for your AI to send an emergency bulletin to your armed citizen-soldiers, calling for the sons and daughters of New Rome to defend the Republic once more. As you yourself sprint towards the laboratory, the crack of loud gunshots ring through the air, back-and-forth fire that keeps going for nearly a full minute. By the time you finally arrive, you find the entrance to the lab absolutely covered in blood and bodies. All of the corpses on the ground are dressed in black and orange and clutching old-fashioned assault rifles, surrounded by a large cluster of armed citizens, a few of which nurse wounds from their brief but intense fighting with the Sons. Two Hastati hold down a struggling survivor dressed in orange and black, seemingly the only still-breathing fighter on the Sons' side. As much as the Sons of Sekhmet's annoucement has @@.red;shocked@@ the arcology, the timely and heroic response of your Principes, honest citizens defending the arcology against violent foreign insurgents, is just the PR event you needed to @@.green;reverse the damage@@, especially when the rattled Dr. Nieskowitz comes out from the assaulted lab to thank you for saving his life.
<<run repX(4000, "event")>>
<<set $projectN.status = 5>>
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 32>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("")>>
- <<run generateSalonModifications($activeSlave)>>
- <<set $activeSlave.origin = "$He is an enslaved Son of Sekhmet, one of many idealistic rebel groups violently opposed to you.">>
- <<set $activeSlave.devotion = random(-90,-70)>>
- <<set $activeSlave.trust = random(-20,30)>>
- <<set $activeSlave.weight = random(-20,30)>>
- <<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.waist = random(10,80)>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>>
<</if>>
@@ -63,18 +50,7 @@ It's a fine, sunny afternoon in your plaza, surrounded by the noise of bustling
You immediately send for your AI to send an emergency bulletin to your $mercenariesTitle, calling them for rapid-deployment to the genetics lab ASAP. As you yourself sprint towards the laboratory, the crack of loud gunshots ring through the air, back-and-forth fire that keeps going for nearly a full minute. By the time you finally arrive, you find the entrance to the lab absolutely covered in blood and bodies. All of the corpses on the ground are dressed in black and orange and clutching old-fashioned assault rifles, surrounded by a small QRF force of lightly-armed mercenaries, most of whom hang off the sides of an armored APC set readied for just such an occassion. An especially large mercenary pins down a struggling survivor dressed in orange and black, seemingly the only still-breathing fighter on the Sons' side. As much as the Sons of Sekhmet's annoucement has @@.red;shocked@@ the arcology, the timely response of your well-trained mercenaries stopping a terrorist attack in under three minutes is just the PR event you needed to @@.green;reverse the damage@@, especially when the rattled Dr. Nieskowitz comes out from the assaulted lab to thank you for saving his life.
<<run repX(4000, "event")>>
<<set $projectN.status = 5>>
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 32>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("")>>
- <<run generateSalonModifications($activeSlave)>>
- <<set $activeSlave.origin = "$He is an enslaved Son of Sekhmet, one of many idealistic rebel groups violently opposed to you.">>
- <<set $activeSlave.devotion = random(-90,-70)>>
- <<set $activeSlave.trust = random(-20,30)>>
- <<set $activeSlave.weight = random(-20,30)>>
- <<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.waist = random(10,80)>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>>
<</if>>
@@ -83,4 +59,4 @@ It's a fine, sunny afternoon in your plaza, surrounded by the noise of bustling
About two minutes later, there's a violent explosion from the top of the free city, near your genetics laboratory. You hear a brief exchange of gunshots that ring out above the city's tense silence, then once more a deafening quiet. You don't even need to read the AI briefing that pops up to know that Nieskowitz and the rest of the scientists are dead, and that the laboratory's been destroyed. All that you can really focus on in the moment is the @@.red;shock and horror@@ on the faces of everyone you see on the long walk back to your penthouse.
<</replace>>
<</link>>
-</span>
+</span>
\ No newline at end of file
diff --git a/src/events/scheduled/projectNComplete.tw b/src/events/scheduled/projectNComplete.tw
index 60b463b710f8b4c5c61da6782042d9d96b46b12e..25fb1e6668cc2531071f17d675377c9dfd7591e2 100644
--- a/src/events/scheduled/projectNComplete.tw
+++ b/src/events/scheduled/projectNComplete.tw
@@ -4,50 +4,45 @@
<<set $bodyPuristRiot = 1>>
<<set $projectN.public = 1>>
-
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 16>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $fixedRace = "catgirl">>
- <<set $activeSlave = GenerateNewSlave("XX", {nationality: "Stateless"})>>
- <<set $activeSlave.origin = "$He is a vat-grown catgirl, the world's first. You painstakingly grew $him yourself over months in the expensive Project N, a cutting-edge biotechnology experiment led by Doctor Nieskowitz.">>
- <<set $activeSlave.face = random(75,100)>>
- <<set $activeSlave.faceShape = "feline">>
- <<set $activeSlave.slaveName = $subjectDeltaName>>
- <<set $activeSlave.birthName = $subjectDeltaName>>
- <<set $activeSlave.slaveSurname = "">>
- <<set $activeSlave.birthSurname = "">>
- <<set $activeSlave.career = "an orphan">>
- <<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.hColor = "white">>
- <<set $activeSlave.override_H_Color = 1>>
- <<set $activeSlave.origHColor = "white">>
- <<set $activeSlave.skin = "pure white">>
- <<set $activeSlave.origSkin = "pure white">>
- <<set $activeSlave.override_Skin = 1>>
- <<set $activeSlave.teeth = "fangs">>
- <<set $activeSlave.devotion = 20>>
- <<set $activeSlave.trust = 30>>
- <<set $activeSlave.boobs = 300>>
- <<set $activeSlave.earShape = "none">>
- <<set $activeSlave.earT = "neko">>
- <<set $activeSlave.earTColor = $activeSlave.hColor>>
- <<set $activeSlave.earImplant = 1>>
- <<set $activeSlave.tailShape = "neko">>
- <<set $activeSlave.tailColor = $activeSlave.hColor>>
- <<set $activeSlave.pupil = "catlike">>
- <<set $activeSlave.weight = 10>>
- <<set $activeSlave.muscles = 0>>
- <<set $activeSlave.waist = 10>>
- <<set $activeSlave.skill.vaginal = 0>>
- <<set $activeSlave.vagina = 0>>
- <<set $activeSlave.skill.oral = 0>>
- <<set $activeSlave.skill.anal = 0>>
- <<set $activeSlave.anus = 0>>
- <<set $activeSlave.skill.whoring = 0>>
- <<set $activeSlave.skill.entertainment = 0>>
- <<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.accent = 4>>
+ <<set _slave = GenerateNewSlave("XX", {maxAge: 16, minAge: 16, disability: 1, race: "catgirl", nationality: "Stateless"})>>
+ <<set _slave.origin = "$He is a vat-grown catgirl, the world's first. You painstakingly grew $him yourself over months in the expensive Project N, a cutting-edge biotechnology experiment led by Doctor Nieskowitz.">>
+ <<set _slave.face = random(75,100)>>
+ <<set _slave.faceShape = "feline">>
+ <<set _slave.slaveName = $subjectDeltaName>>
+ <<set _slave.birthName = $subjectDeltaName>>
+ <<set _slave.slaveSurname = "">>
+ <<set _slave.birthSurname = "">>
+ <<set _slave.career = "an orphan">>
+ <<set _slave.intelligenceImplant = 0>>
+ <<set _slave.hColor = "white">>
+ <<set _slave.override_H_Color = 1>>
+ <<set _slave.origHColor = "white">>
+ <<set _slave.skin = "pure white">>
+ <<set _slave.origSkin = "pure white">>
+ <<set _slave.override_Skin = 1>>
+ <<set _slave.teeth = "fangs">>
+ <<set _slave.devotion = 20>>
+ <<set _slave.trust = 30>>
+ <<set _slave.boobs = 300>>
+ <<set _slave.earShape = "none">>
+ <<set _slave.earT = "neko">>
+ <<set _slave.earTColor = _slave.hColor>>
+ <<set _slave.earImplant = 1>>
+ <<set _slave.tailShape = "neko">>
+ <<set _slave.tailColor = _slave.hColor>>
+ <<set _slave.pupil = "catlike">>
+ <<set _slave.weight = 10>>
+ <<set _slave.muscles = 0>>
+ <<set _slave.waist = 10>>
+ <<set _slave.skill.vaginal = 0>>
+ <<set _slave.vagina = 0>>
+ <<set _slave.skill.oral = 0>>
+ <<set _slave.skill.anal = 0>>
+ <<set _slave.anus = 0>>
+ <<set _slave.skill.whoring = 0>>
+ <<set _slave.skill.entertainment = 0>>
+ <<set _slave.canRecruit = 0>>
+ <<set _slave.accent = 4>>
It's finally time. Nieskowitz greets you with a rare smile as you enter the genetics lab, showing you to the tube where $subjectDeltaName floats unconcious. Far from the blob of pinkish flesh she once was, $subjectDeltaName is now a fully-formed humanoid, covered in a layer of beautiful, snow-white fur and topped with twitching, pointed cat ears. You can hear the bustle of the media, journalists who somehow found out about $subjectDeltaName's near completition and are all but breaking down the lab's door trying to get a good look in.
<br><br>
@@ -59,20 +54,20 @@ It's finally time. Nieskowitz greets you with a rare smile as you enter the gene
The watching scientists hold their breath as the green liquid drains from the tube, and $subjectDeltaName hits the glass wall with an unglamorous thud. As the tube comes up, you carefully catch the white catgirl, feeling the silk-like softness of her entire body as the young vat-grown girl opens her eyes for the first time. She blinks her big, catlike eyes a few times, and then meows at you loudly, probably the closest thing she can manage to a question. In response, you set her down on wobbly feet, take her by the hand, and lead her out the doors of the genelab to meet an absolute hail of journalists with cameras and bright flashing lights shoving microphones and recorders in both of your faces. As the terrified, nude catgirl recoils from the confusing sound and noise, you promptly divert the recording devices towards your own face, explaining that she's in no state to speak for herself but you'll gladly take questions. Speaking with the media on such a momentous scientific occassion @@.green;improves your reputation@@ while $subjectDeltaName, interpreting your diversion as protecting her from the bright lights and scary noises, immediately @@.hotpink;likes@@ and @@.mediumaquamarine;trusts@@ you more.
<<run repX(2000, "event")>>
<<set $projectN.status = 6>>
- <<set $activeSlave.prestige = 1>>
- <<set $activeSlave.prestigeDesc = "$He was the world's very first catgirl, plastered all over the world within days of $his 'birth' as proof of your arcology's scientific superiority.">>
- <<set $activeSlave.devotion += 5>>
- <<set $activeSlave.trust += 5>>
- <<run newSlave($activeSlave)>>
+ <<set _slave.prestige = 1>>
+ <<set _slave.prestigeDesc = "$He was the world's very first catgirl, plastered all over the world within days of $his 'birth' as proof of your arcology's scientific superiority.">>
+ <<set _slave.devotion += 5>>
+ <<set _slave.trust += 5>>
+ <<run newSlave(_slave)>>
<</replace>>
<</link>>
<br> <<link "Force the media to disperse before leaving with $subjectDeltaName">>
<<replace "#result">>
The watching scientists hold their breath as the green liquid drains from the tube, and $subjectDeltaName hits the glass wall with an unglamorous thud. As the tube comes up, you carefully catch the white catgirl, feeling the silk-like softness of her entire body as the young vat-grown girl opens her eyes for the first time. She blinks her big, catlike eyes a few times, and then meows at you loudly, probably the closest thing she can manage to a question. In response, you set her down on wobbly feet, take her by the hand, and lead her out the doors of the genelab to meet an absolute hail of journalists with cameras and bright flashing lights shoving microphones and recorders in both of your faces. As the terrified, nude catgirl recoils from the confusing sound and noise, you tell the media that Dr. Nieskowitz will be handling their questions and you'll have anyone who tries to interrupt or scare you two on the way back to the penthouse arrested. Although you miss the chance to improve your reputation or use $subjectDeltaName for propaganda, she stares at you with big, catlike eyes as you lead her away from the crowd, full of obvious, immediate @@.hotpink;affection@@ and @@.mediumaquamarine;admiration.@@
<<set $projectN.status = 6>>
- <<set $activeSlave.devotion += 20>>
- <<set $activeSlave.trust += 20>>
- <<run newSlave($activeSlave)>>
+ <<set _slave.devotion += 20>>
+ <<set _slave.trust += 20>>
+ <<run newSlave(_slave)>>
<</replace>>
<</link>>
<br> <<link "Let the media get a good look at $subjectDeltaName as you leave">>
@@ -80,11 +75,11 @@ It's finally time. Nieskowitz greets you with a rare smile as you enter the gene
he watching scientists hold their breath as the green liquid drains from the tube, and $subjectDeltaName hits the glass wall with an unglamorous thud. As the tube comes up, you carefully catch the white catgirl, feeling the silk-like softness of her entire body as the young vat-grown girl opens her eyes for the first time. She blinks her big, catlike eyes a few times, and then meows at you loudly, probably the closest thing she can manage to a question. In response, you set her down on wobbly feet, take her by the hand, and lead her out the doors of the genelab to meet an absolute hail of journalists with cameras and bright flashing lights shoving microphones and recorders in both of your faces. As the terrified, nude catgirl recoils from the confusing sound and noise, you promptly push her forward, allowing the media to explore every last inch of her naked body while you answer questions. She's obviously @@.red;terrified@@ at the cameras in her face and crotch, not that the journalists seem to care, and although they get a @@.green;whole array of perfect footage@@ as you ignore $subjectDeltaName's loud, desperate meowing, you're forced to break off the imprompteau interview session early when $subjectDeltaName starts @@.gold;crying@@ as photos flash in her face. She's completely nonresponsive to your attempts to get her to stop bawling as the watching journalists awkwardly shuffle, and only stops sobbing loudly when you bring her away from the assembled crowd. As you lead $subjectDeltaName back to the penthouse, still sniffling and mrowling intermittently, she stares sullenly at you with big catlike eyes that only understand that you've @@.red;somehow betrayed her.@@
<<set $projectN.status = 6>>
<<run repX(5000, "event")>>
- <<set $activeSlave.prestige = 2>>
- <<set $activeSlave.prestigeDesc = "$He was the world's very first catgirl, plastered all over the world within days of $his 'birth' as proof of your arcology's scientific superiority.">>
- <<set $activeSlave.devotion -= 30>>
- <<set $activeSlave.trust -= 30>>
- <<run newSlave($activeSlave)>>
+ <<set _slave.prestige = 2>>
+ <<set _slave.prestigeDesc = "$He was the world's very first catgirl, plastered all over the world within days of $his 'birth' as proof of your arcology's scientific superiority.">>
+ <<set _slave.devotion -= 30>>
+ <<set _slave.trust -= 30>>
+ <<run newSlave(_slave)>>
<</replace>>
<</link>>
</span>
diff --git a/src/events/scheduled/projectNSaboteur.tw b/src/events/scheduled/projectNSaboteur.tw
index 1f62dc48560f756efe9b2f77d1d30b8f6032192c..d4488e00ad6f6764e58dec9310fc380210891116 100644
--- a/src/events/scheduled/projectNSaboteur.tw
+++ b/src/events/scheduled/projectNSaboteur.tw
@@ -13,18 +13,15 @@ You're not going to be able to get down there in time yourself, but you'll need
<<replace "#result">>
You briefly thank your lucky stars that you invested enough in project N to provide for integrated security, then call for the lab's drones to activate. Over the cameras, you smugly watch from your comfortable bed as the security drones tear two of the mysterious saboteurs to shreds, then pin down and apprehend the third. Seems like all they managed to get you today was a @@.green;brand new slave.@@
<<run repX(1500, "event")>>
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 32>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("")>>
- <<run generateSalonModifications($activeSlave)>>
- <<set $activeSlave.origin = "$He is an enslaved Son of Sekhmet, one of many idealistic rebel groups violently opposed to you.">>
- <<set $activeSlave.devotion = random(-90,-70)>>
- <<set $activeSlave.trust = random(-20,30)>>
- <<set $activeSlave.weight = random(-20,30)>>
- <<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.waist = random(10,80)>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<set _slave = GenerateNewSlave(null, {minAge: 16, maxAge: 32, disability: 1})>>
+ <<run generateSalonModifications(_slave)>>
+ <<set _slave.origin = "$He is an enslaved Son of Sekhmet, one of many idealistic rebel groups violently opposed to you.">>
+ <<set _slave.devotion = random(-90,-70)>>
+ <<set _slave.trust = random(-20,30)>>
+ <<set _slave.weight = random(-20,30)>>
+ <<set _slave.muscles = random(20,80)>>
+ <<set _slave.waist = random(10,80)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<<set $projectN.status = 5>>
<</replace>>
<</link>>
diff --git a/src/events/scheduled/vatcatboy.tw b/src/events/scheduled/vatcatboy.tw
index 4ac3b2df4840a7916bd01faa6c4044809ba45525..6008e142c3ffa1987bb3943067131b10ca727d9e 100644
--- a/src/events/scheduled/vatcatboy.tw
+++ b/src/events/scheduled/vatcatboy.tw
@@ -1,49 +1,45 @@
:: SE vatcatboy [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 16>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $fixedRace = "catgirl">>
- <<set $activeSlave = GenerateNewSlave("XY", {nationality: "Stateless"})>>
- <<set $activeSlave.origin = "$He is a vat-grown catboy created by Dr. Nieskowitz and the science team in your genelab.">>
- <<set $activeSlave.face = random(55,95)>>
- <<set $activeSlave.faceShape = "feline">>
- <<set $activeSlave.slaveName = setup.catSlaveNames.random()>>
- <<set $activeSlave.birthName = $activeSlave.slaveName>>
- <<set $activeSlave.slaveSurname = "">>
- <<set $activeSlave.birthSurname = "">>
- <<set $activeSlave.career = "an orphan">>
- <<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.teeth = "fangs">>
- <<set $activeSlave.devotion = 20>>
- <<set $activeSlave.trust = 30>>
- <<set $activeSlave.earShape = "none">>
- <<set $activeSlave.earT = "neko">>
- <<set $activeSlave.earTColor = $activeSlave.hColor>>
- <<set $activeSlave.earImplant = 1>>
- <<set $activeSlave.tailShape = "neko">>
- <<set $activeSlave.tailColor = $activeSlave.hColor>>
- <<set $activeSlave.pupil = "catlike">>
- <<set $activeSlave.weight = 10>>
- <<set $activeSlave.muscles = 0>>
- <<set $activeSlave.waist = 10>>
- <<set $activeSlave.skill.oral = 0>>
- <<set $activeSlave.skill.anal = 0>>
- <<set $activeSlave.anus = 0>>
- <<set $activeSlave.skill.whoring = 0>>
- <<set $activeSlave.skill.entertainment = 0>>
- <<set $activeSlave.accent = 4>>
- <<set $activeSlave.canRecruit = 0>>
+<<set _slave = GenerateNewSlave(null, {minAge: 16, maxAge: 16, nationality: "Stateless", disability: 1, race: "catgirl"})>>
+<<set _slave.origin = "$He is a vat-grown catboy created by Dr. Nieskowitz and the science team in your genelab.">>
+<<set _slave.face = random(55,95)>>
+<<set _slave.faceShape = "feline">>
+<<set _slave.slaveName = setup.catSlaveNames.random()>>
+<<set _slave.birthName = _slave.slaveName>>
+<<set _slave.slaveSurname = "">>
+<<set _slave.birthSurname = "">>
+<<set _slave.career = "an orphan">>
+<<set _slave.intelligenceImplant = 0>>
+<<set _slave.teeth = "fangs">>
+<<set _slave.devotion = 20>>
+<<set _slave.trust = 30>>
+<<set _slave.earShape = "none">>
+<<set _slave.earT = "neko">>
+<<set _slave.earTColor = _slave.hColor>>
+<<set _slave.earImplant = 1>>
+<<set _slave.tailShape = "neko">>
+<<set _slave.tailColor = _slave.hColor>>
+<<set _slave.pupil = "catlike">>
+<<set _slave.weight = 10>>
+<<set _slave.muscles = 0>>
+<<set _slave.waist = 10>>
+<<set _slave.skill.oral = 0>>
+<<set _slave.skill.anal = 0>>
+<<set _slave.anus = 0>>
+<<set _slave.skill.whoring = 0>>
+<<set _slave.skill.entertainment = 0>>
+<<set _slave.accent = 4>>
+<<set _slave.canRecruit = 0>>
-With their latest genemodding project complete, Dr. Nieskowitz proudly presents to you a healthy, unconcious catboy, floating suspended in the tube of thick green liquid you use to grow them. "Looks like he came out just fine." The aging doctor says with an authoritative gesture. "Another successful project. $activeSlave.slaveName is going to make a lovely addition to your little collection."
+With their latest genemodding project complete, Dr. Nieskowitz proudly presents to you a healthy, unconcious catboy, floating suspended in the tube of thick green liquid you use to grow them. "Looks like he came out just fine." The aging doctor says with an authoritative gesture. "Another successful project. _slave.slaveName is going to make a lovely addition to your little collection."
<br><br>
<span id="result">
<br> <<link "Bring your new slave back home">>
<<replace "#result">>
There's no obnoxious media attention this time getting in the way of you and your brand new, confusedly meowing catboy. It's just you, the rising sun over your arcology, and a fresh new cat to lead up to the penthouse.
<<set $projectN.status = 6>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>>
</span>
diff --git a/src/events/scheduled/vatcatgirl.tw b/src/events/scheduled/vatcatgirl.tw
index bd9163ae5582073666fcab7f06664a1217b7822a..68f143617675a5038afef0bc76e090e4e32b1c0f 100644
--- a/src/events/scheduled/vatcatgirl.tw
+++ b/src/events/scheduled/vatcatgirl.tw
@@ -1,51 +1,47 @@
:: SE vatcatgirl [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 16>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $fixedRace = "catgirl">>
- <<set $activeSlave = GenerateNewSlave("XX", {nationality: "Stateless"})>>
- <<set $activeSlave.origin = "$He is a vat-grown catgirl created by Dr. Nieskowitz and the science team in your genelab.">>
- <<set $activeSlave.face = random(55,95)>>
- <<set $activeSlave.faceShape = "feline">>
- <<set $activeSlave.slaveName = setup.catSlaveNames.random()>>
- <<set $activeSlave.birthName = $activeSlave.slaveName>>
- <<set $activeSlave.slaveSurname = "">>
- <<set $activeSlave.birthSurname = "">>
- <<set $activeSlave.career = "an orphan">>
- <<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.devotion = 20>>
- <<set $activeSlave.trust = 30>>
- <<set $activeSlave.earShape = "none">>
- <<set $activeSlave.teeth = "fangs">>
- <<set $activeSlave.earT = "neko">>
- <<set $activeSlave.earTColor = $activeSlave.hColor>>
- <<set $activeSlave.earImplant = 1>>
- <<set $activeSlave.tailShape = "neko">>
- <<set $activeSlave.tailColor = $activeSlave.hColor>>
- <<set $activeSlave.pupil = "catlike">>
- <<set $activeSlave.weight = 10>>
- <<set $activeSlave.muscles = 0>>
- <<set $activeSlave.waist = 10>>
- <<set $activeSlave.skill.vaginal = 0>>
- <<set $activeSlave.vagina = 0>>
- <<set $activeSlave.skill.oral = 0>>
- <<set $activeSlave.skill.anal = 0>>
- <<set $activeSlave.anus = 0>>
- <<set $activeSlave.skill.whoring = 0>>
- <<set $activeSlave.skill.entertainment = 0>>
- <<set $activeSlave.accent = 4>>
- <<set $activeSlave.canRecruit = 0>>
+<<set _slave = GenerateNewSlave(null, {minAge: 16, maxAge: 16, nationality: "Stateless", disability: 1, race: "catgirl"})>>
+<<set _slave.origin = "$He is a vat-grown catgirl created by Dr. Nieskowitz and the science team in your genelab.">>
+<<set _slave.face = random(55,95)>>
+<<set _slave.faceShape = "feline">>
+<<set _slave.slaveName = setup.catSlaveNames.random()>>
+<<set _slave.birthName = _slave.slaveName>>
+<<set _slave.slaveSurname = "">>
+<<set _slave.birthSurname = "">>
+<<set _slave.career = "an orphan">>
+<<set _slave.intelligenceImplant = 0>>
+<<set _slave.devotion = 20>>
+<<set _slave.trust = 30>>
+<<set _slave.earShape = "none">>
+<<set _slave.teeth = "fangs">>
+<<set _slave.earT = "neko">>
+<<set _slave.earTColor = _slave.hColor>>
+<<set _slave.earImplant = 1>>
+<<set _slave.tailShape = "neko">>
+<<set _slave.tailColor = _slave.hColor>>
+<<set _slave.pupil = "catlike">>
+<<set _slave.weight = 10>>
+<<set _slave.muscles = 0>>
+<<set _slave.waist = 10>>
+<<set _slave.skill.vaginal = 0>>
+<<set _slave.vagina = 0>>
+<<set _slave.skill.oral = 0>>
+<<set _slave.skill.anal = 0>>
+<<set _slave.anus = 0>>
+<<set _slave.skill.whoring = 0>>
+<<set _slave.skill.entertainment = 0>>
+<<set _slave.accent = 4>>
+<<set _slave.canRecruit = 0>>
-With their latest genemodding project complete, Dr. Nieskowitz proudly presents to you a healthy, unconcious catgirl, floating suspended in the tube of thick green liquid you use to grow them. "Looks like she came out just fine." The aging doctor says with an authoritative gesture. "Another successful project. $activeSlave.slaveName is going to make a lovely addition to your little collection."
+With their latest genemodding project complete, Dr. Nieskowitz proudly presents to you a healthy, unconcious catgirl, floating suspended in the tube of thick green liquid you use to grow them. "Looks like she came out just fine." The aging doctor says with an authoritative gesture. "Another successful project. _slave.slaveName is going to make a lovely addition to your little collection."
<br><br>
<span id="result">
<br> <<link "Bring your new slave back home">>
<<replace "#result">>
There's no obnoxious media attention this time getting in the way of you and your brand new, confusedly meowing catgirl. It's just you, the rising sun over your arcology, and a fresh new cat to lead up to the penthouse.
<<set $projectN.status = 6>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>>
</span>