Skip to content
Snippets Groups Projects
Commit ee1b7580 authored by lowercasedonkey's avatar lowercasedonkey
Browse files

convert a few more passages away from the old globals

parent 7492d1e4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/Mods/SpecialForce/TrickShotNight.tw
+ 5
− 8
View file @ ee1b7580
...@@ -67,20 +67,17 @@ Despite your direct elevator, interaction with the majority of your security for ...@@ -67,20 +67,17 @@ Despite your direct elevator, interaction with the majority of your security for
<<if random(1,100) < _shootChance>> <<if random(1,100) < _shootChance>>
<br> <<link "Up the ante">> <br> <<link "Up the ante">>
<<replace "#bounty-result">> <<replace "#bounty-result">>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 35>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>> <<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>> <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>> <<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>> <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>> <<set _race = _races.random()>>
<</if>> <</if>>
<<set _param = {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
<<if $seeDicks != 100>> <<if $seeDicks != 100>>
<<set $activeSlave = GenerateNewSlave("XX")>> <<set $activeSlave = GenerateNewSlave("XX", _param)>>
<<else>> <<else>>
<<set $activeSlave = GenerateNewSlave("XY")>> <<set $activeSlave = GenerateNewSlave("XY", _param)>>
<</if>> <</if>>
<<set $activeSlave.origin = "$He put $himself up as collateral at a trick shot game, and lost.">> <<set $activeSlave.origin = "$He put $himself up as collateral at a trick shot game, and lost.">>
<<set $activeSlave.career = "a soldier">> <<set $activeSlave.career = "a soldier">>
......
src/markets/eliteSlave.tw
+ 7
− 9
View file @ ee1b7580
...@@ -8,25 +8,23 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc ...@@ -8,25 +8,23 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $eliteAuctioned = 1>> <<set $eliteAuctioned = 1>>
<<if $arcologies[0].FSMaturityPreferentialist > 20>> <<if $arcologies[0].FSMaturityPreferentialist > 20>>
<<set $activeSlaveOneTimeMinAge = 25>> <<set _minAge = 25>>
<<else>> <<else>>
<<set $activeSlaveOneTimeMinAge = $fertilityAge>> <<set _minAge = $fertilityAge>>
<</if>> <</if>>
<<if $arcologies[0].FSYouthPreferentialist > 20>> <<if $arcologies[0].FSYouthPreferentialist > 20>>
<<set $activeSlaveOneTimeMaxAge = 23>> <<set _maxAge = 23>>
<<else>> <<else>>
<<set $activeSlaveOneTimeMaxAge = 40>> <<set _maxAge = 40>>
<</if>> <</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacist != "unset">> <<if $arcologies[0].FSSupremacist != "unset">>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>> <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationist != "unset">> <<elseif $arcologies[0].FSSubjugationist != "unset">>
<<set _races = ["amerindian", "asian", "asian", "asian", "asian", "asian", "asian", "black", "black", "indo-aryan", "indo-aryan", "latina", "latina", "latina", "malay", "malay", "middle eastern", "middle eastern", "mixed race", "pacific islander", "semitic", "semitic", "southern european", "southern european", "white", "white", "white", "white", "white", "white", "white", "white", "white"]>> <<set _races = ["amerindian", "asian", "asian", "asian", "asian", "asian", "asian", "black", "black", "indo-aryan", "indo-aryan", "latina", "latina", "latina", "malay", "malay", "middle eastern", "middle eastern", "mixed race", "pacific islander", "semitic", "semitic", "southern european", "southern european", "white", "white", "white", "white", "white", "white", "white", "white", "white"]>>
<<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>> <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>> <<set _race = _races.random()>>
<</if>> <</if>>
<<set $activeSlave = GenerateNewSlave("XX")>> <<set $activeSlave = GenerateNewSlave("XX", {minAge: _minAge, maxAge: _maxAge, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
<<set $activeSlave.origin = "$He was purchased from a member of the Elite.">> <<set $activeSlave.origin = "$He was purchased from a member of the Elite.">>
<<set $activeSlave.career = "a slave">> <<set $activeSlave.career = "a slave">>
<<set $activeSlave.prestige = 1>> <<set $activeSlave.prestige = 1>>
......
src/markets/householdLiquidator.tw
+ 3
− 11
View file @ ee1b7580
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
<<if random(1,100) > 50>> <<if random(1,100) > 50>>
<<set $oneTimeDisableDisability = 1>> <<set $activeSlave = GenerateNewSlave(null, {disableDisability: 1})>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought $him from the household liquidator.">> <<set $activeSlave.origin = "You bought $him from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>> <<set $activeSlave.devotion = random(-75,-25)>>
<<set $activeSlave.trust = random(-45,-25)>> <<set $activeSlave.trust = random(-45,-25)>>
...@@ -35,13 +34,7 @@ The household liquidator is offering a set of siblings for sale. You are permitt ...@@ -35,13 +34,7 @@ The household liquidator is offering a set of siblings for sale. You are permitt
<<elseif random(1,100) > 20>> <<elseif random(1,100) > 20>>
/% Begin younger parents submod. %/ <<set $activeSlave = GenerateNewSlave(null, {minAge: ($fertilityAge + $minimumSlaveAge), maxAge: 42, ageOverridesPedoMode: 1, mature: , nationality: , race: , disableDisability: 1})>>
<<set $activeSlaveOneTimeMinAge = $fertilityAge + $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a child who can be a slave. %/
/% End younger parents submod. %/
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought $him from the household liquidator.">> <<set $activeSlave.origin = "You bought $him from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>> <<set $activeSlave.devotion = random(-75,-25)>>
<<set $activeSlave.trust = random(-45,-25)>> <<set $activeSlave.trust = random(-45,-25)>>
...@@ -73,8 +66,7 @@ The household liquidator is offering a $mother and $his <<if $activeSlave.genes ...@@ -73,8 +66,7 @@ The household liquidator is offering a $mother and $his <<if $activeSlave.genes
<<else>> <<else>>
<<set $oneTimeDisableDisability = 1>> <<set $activeSlave = GenerateNewSlave({disableDisability: 1})>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought $him from the household liquidator.">> <<set $activeSlave.origin = "You bought $him from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>> <<set $activeSlave.devotion = random(-75,-25)>>
<<set $activeSlave.trust = random(-45,-25)>> <<set $activeSlave.trust = random(-45,-25)>>
......
src/pregmod/FCTV/seFCTVremote.tw
+ 9
− 15
View file @ ee1b7580
...@@ -2,17 +2,14 @@ ...@@ -2,17 +2,14 @@
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "FCTV", $FCTV.remote = 2>> <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "FCTV", $FCTV.remote = 2>>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 35>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>> <<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>> <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>> <<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>> <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>> <<set _race = _races.random()>>
<</if>> <</if>>
<<set _slave = GenerateNewSlave()>> <<set _slave = GenerateNewSlave(null, {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
<<set _slave.devotion = 0>> <<set _slave.devotion = 0>>
<<set _slave.trust = 0>> <<set _slave.trust = 0>>
...@@ -88,20 +85,17 @@ ...@@ -88,20 +85,17 @@
<<replace "#scene">> <<replace "#scene">>
/* set up customer */ /* set up customer */
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 35>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>> <<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>> <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>> <<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>> <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>> <<set _race = _races.random()>>
<</if>> <</if>>
<<set _param = {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
<<if $seeDicks > random(1,99)>> <<if $seeDicks > random(1,99)>>
<<set _customer = GenerateNewSlave("XY")>> <<set _customer = GenerateNewSlave("XY", _param)>>
<<else>> <<else>>
<<set _customer = GenerateNewSlave("XX")>> <<set _customer = GenerateNewSlave("XX", _param)>>
<</if>> <</if>>
<<set _customer = GenerateNewSlave()>> <<set _customer = GenerateNewSlave()>>
<<set _customer.devotion = 0>> <<set _customer.devotion = 0>>
......
src/pregmod/pRaped.tw
+ 5
− 6
View file @ ee1b7580
...@@ -4,16 +4,15 @@ ...@@ -4,16 +4,15 @@
<<setPlayerPronouns>> <<setPlayerPronouns>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>> <<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>> <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>> <<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>> <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>> <<set _race = _races.random()>>
<</if>> <</if>>
<<set _param = {minAge: 16, race: _race, disableDisability: 1}>>
<<if $PC.vagina >= 0>> <<if $PC.vagina >= 0>>
<<set $activeSlave = GenerateNewSlave("XY")>> <<set $activeSlave = GenerateNewSlave("XY", _param)>>
<<set $activeSlave.dick = 6>> <<set $activeSlave.dick = 6>>
<<set $activeSlave.balls = 5>> <<set $activeSlave.balls = 5>>
<<set $activeSlave.boobs = 0>> <<set $activeSlave.boobs = 0>>
...@@ -21,7 +20,7 @@ ...@@ -21,7 +20,7 @@
<<set $activeSlave.skill.oral = 0>> <<set $activeSlave.skill.oral = 0>>
<<set $activeSlave.skill.anal = 0>> <<set $activeSlave.skill.anal = 0>>
<<else>> <<else>>
<<set $activeSlave = GenerateNewSlave("XX")>> <<set $activeSlave = GenerateNewSlave("XX", _param)>>
<<set $activeSlave.vagina = 1>> <<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = 0>> <<set $activeSlave.preg = 0>>
<<set $activeSlave.weight = random(-20,30)>> <<set $activeSlave.weight = random(-20,30)>>
......
src/pregmod/reTheSirenStrikesBack.tw
+ 3
− 6
View file @ ee1b7580
...@@ -6,14 +6,11 @@ ...@@ -6,14 +6,11 @@
<<set _ssb = $slaves.find(function(s) { return s.origin == "$He came to you to escape being sold to a cruel master after $his producer informed $him of $his debt." && s.newGamePlus == 0 && s.fetish != "mindbroken" && s.fuckdoll == 0; })>> <<set _ssb = $slaves.find(function(s) { return s.origin == "$He came to you to escape being sold to a cruel master after $his producer informed $him of $his debt." && s.newGamePlus == 0 && s.fetish != "mindbroken" && s.fuckdoll == 0; })>>
<<if $pedo_mode == 1>> <<if $pedo_mode == 1>>
<<set $activeSlaveOneTimeMinAge = 16>> <<set _minAge = 16>>
<<else>> <<else>>
<<set $activeSlaveOneTimeMinAge = 30>> <<set _minAge = 30>>
<</if>> <</if>>
<<set $activeSlaveOneTimeMaxAge = 40>> <<set $activeSlave = GenerateNewSlave(null, {minAge: _minAge, maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1})>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He was brought to you to pay for what $he did to one of your slaves.">> <<set $activeSlave.origin = "$He was brought to you to pay for what $he did to one of your slaves.">>
<<set $activeSlave.career = "a producer">> <<set $activeSlave.career = "a producer">>
<<set $activeSlave.devotion = random(-70,30)>> <<set $activeSlave.devotion = random(-70,30)>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment