diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 3e4652fa12497ec7fd386b02e023ff4ef15b9ced..7c6c345715a845ca580dba22a30249212fd3d889 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -614,35 +614,27 @@ <<if $PC.hacking >= 100 && random(0,100) > 95 && $cash >= 100000>> <<set $recruit.push("rogue cyborg")>> <</if>> - <<if $arcologyUpgrade.drones == 1>> - <<set _recruitEvents.push("RE malefactor")>> - <<set $malefactor = ["addict", "businesswoman", "liberator", "whore"]>> - <<if $seePreg != 0>> - <<set $malefactor.push("anchorBaby")>> - <<if $arcologies[0].FSRepopulationFocus < 50>> - <<set $malefactor.push("mule")>> /* blends right in */ - <</if>> - <</if>> - <<if $seeDicks != 0>> - <<set $malefactor.push("rapist")>> - <</if>> - <<if $minimumSlaveAge <= 12>> - <<set $malefactor.push("orphanloli")>> - <</if>> - <<if $arcologies[0].FSPaternalist < 50>> - <<set $malefactor.push("escapee")>> - <</if>> - <<if $arcologies[0].FSSupremacistLawME + $arcologies[0].FSSubjugationistLawME > 0>> - <<set $malefactor.push("passfail")>> - <</if>> - <<set $malefactor = $malefactor.random()>> - <<if ($rep/150) > random(1,100)>> - <<set _recruitEvents.push("RE malefactor")>> - <</if>> - <</if>> <<if $rep > 16000 && random(1,100) < $rep/1000 && $cash >= 100000>> <<set $recruit.push("forbidden love")>> <</if>> + <<if ($rep/400) > random(1,100)>> + <<set $RecETSevent.push("identical pair")>> + <</if>> + <<if ($rep/400) > random(1,100)>> + <<set $RecETSevent.push("posh mother daughter")>> + <</if>> + <<if ($rep/400) > random(1,100)>> + <<set $RecETSevent.push("incest sister sister")>> + <</if>> + <<if ($rep/400) > random(1,100)>> + <<set $RecETSevent.push("incest twin sister")>> + <</if>> + <<if ($rep/400) > random(1,100)>> + <<set $RecETSevent.push("incest mother daughter")>> + <</if>> + <<if $seeHyperPreg == 1 && $seePreg != 0 && $arcologies[0].FSRestart == "unset" && random(1,100) <= 5>> + <<set $RecETSevent.push("desperate broodmother")>> + <</if>> <</if>> @@ -696,24 +688,6 @@ <<if ($rep/400) > random(1,100)>> <<set $RecETSevent.push("incest twins mixed")>> <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("identical pair")>> - <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("posh mother daughter")>> - <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("incest sister sister")>> - <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("incest twin sister")>> - <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("incest mother daughter")>> - <</if>> - <<if $seeHyperPreg == 1 && $seePreg != 0 && $arcologies[0].FSRestart == "unset" && random(1,100) <= 5>> - <<set $RecETSevent.push("desperate broodmother")>> - <</if>> <</if>> <<if ($rep/400) > random(1,100)>> <<set $RecETSevent.push("incest brother brother")>> @@ -725,27 +699,37 @@ <<set $RecETSevent.push("incest father son")>> <</if>> - <<else>> /*XX ACQUISITIONS*/ - - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("identical pair")>> + <</if>> + + <<if $arcologyUpgrade.drones == 1>> + <<set _recruitEvents.push("RE malefactor")>> + <<set $malefactor = ["addict", "whore"]>> + <<if $seeDicks != 100>> + <<set $malefactor.push("businesswoman")>> + <<set $malefactor.push("liberator")>> + <<if $seePreg != 0>> + <<set $malefactor.push("anchorBaby")>> + <<if $arcologies[0].FSRepopulationFocus < 50>> + <<set $malefactor.push("mule")>> /* blends right in */ + <</if>> + <</if>> <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("posh mother daughter")>> + <<if $seeDicks != 0>> + <<set $malefactor.push("rapist")>> <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("incest sister sister")>> + <<if $minimumSlaveAge <= 12>> + <<set $malefactor.push("orphanloli")>> <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("incest twin sister")>> + <<if $arcologies[0].FSPaternalist < 50>> + <<set $malefactor.push("escapee")>> <</if>> - <<if ($rep/400) > random(1,100)>> - <<set $RecETSevent.push("incest mother daughter")>> + <<if $arcologies[0].FSSupremacistLawME + $arcologies[0].FSSubjugationistLawME > 0>> + <<set $malefactor.push("passfail")>> <</if>> - <<if $seeHyperPreg == 1 && $seePreg != 0 && $arcologies[0].FSRestart == "unset" && random(1,100) <= 5>> - <<set $RecETSevent.push("desperate broodmother")>> + <<set $malefactor = $malefactor.random()>> + <<if ($rep/150) > random(1,100)>> + <<set _recruitEvents.push("RE malefactor")>> <</if>> - <</if>> <<set $recruit.push("starving artist")>>