From 02f3e8d61a46df7cc126fd70d2c62f4ea9831236 Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Thu, 14 Mar 2019 23:07:35 -0400 Subject: [PATCH] sync up trickshot --- src/SpecialForce/TrickShotNight.tw | 10 ++++++---- src/uncategorized/rePokerNight.tw | 3 --- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw index 1bcfada098a..66fe1c3e541 100644 --- a/src/SpecialForce/TrickShotNight.tw +++ b/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)>> diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw index 025ca0d93ee..7dd8f76a50d 100644 --- a/src/uncategorized/rePokerNight.tw +++ b/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)>> -- GitLab