Merge branch 'trickshot-sync' into 'pregmod-master'

Sync up trickshot slave with poker night

See merge request !3887

src/SpecialForce/TrickShotNight.tw

@@ -47,20 +47,22 @@ Despite your direct elevator, interaction with the majority of your security for
 			<<set $activeSlaveOneTimeMinAge = 25>>
 			<<set $activeSlaveOneTimeMaxAge = 35>>
 			<<set $one_time_age_overrides_pedo_mode = 1>>
+			<<set $oneTimeDisableDisability = 1>>
 			<<if $arcologies[0].FSSupremacistLawME == 1>>
 				<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
 			<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
 				<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
 				<<set $fixedRace = _races.random()>>
 			<</if>>
-			<<include "Generate XX Slave">>
+			<<if $seeDicks != 100>>
+				<<include "Generate XX Slave">>
+			<<else>>
+				<<include "Generate XY Slave">>
+			<</if>>
 			<<set $activeSlave.origin = "She put herself up as collateral at a trick shot game, and lost.">>
 			<<set $activeSlave.career = "a soldier">>
 			<<set $activeSlave.indentureRestrictions = 2>>
 			<<set $activeSlave.indenture = 52>>
-			<<if $activeSlave.eyes == -2>>
-				<<set $activeSlave.eyes = -1>>
-			<</if>>
 			<<set $activeSlave.devotion = random(45,60)>>
 			<<set $activeSlave.trust = random(55,65)>>
 			<<set $activeSlave.health = random(60,80)>>

src/uncategorized/rePokerNight.tw

@@ -78,9 +78,6 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
 					<<set $activeSlave.career = "a soldier">>
 					<<set $activeSlave.indentureRestrictions = 2>>
 					<<set $activeSlave.indenture = 52>>
-					<<if $activeSlave.eyes == -2>>
-						<<set $activeSlave.eyes = -1>>
-					<</if>>
 					<<set $activeSlave.devotion = random(25,40)>>
 					<<set $activeSlave.trust = random(35,45)>>
 					<<set $activeSlave.health = random(60,80)>>