diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 1c59662c7d490651bf8be8e45ef0dcc09410a730..2e56de1784e2f3ff06de184535d64ddc37f20f20 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4626,4 +4626,7 @@ Pregmod 0.10.3.0 -fixes 143 - -SFanon's stuff \ No newline at end of file + -SFanon's stuff + + 144 + -The daughters of liberty now require combatants to pass a physical before deployment (the captures will be in a more reasonable fighting shape) \ No newline at end of file diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw index 32e3fd030290287e11dfcbadf3b3320a70b35d6d..a746c60f5f8898e92dfdd40d8f4637b8c5f12d9e 100644 --- a/src/uncategorized/pCoupAttempt.tw +++ b/src/uncategorized/pCoupAttempt.tw @@ -26,11 +26,23 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc <<set $cash -= Math.trunc($cash*0.2)>> <<set $arcologies[0].prosperity = Math.trunc($arcologies[0].prosperity*0.7)>> <<set $rep += 2000>> + <<set $activeSlaveOneTimeMinAge = 16>> + <<set $activeSlaveOneTimeMaxAge = 32>> <<for $i = 0; $i < 8; $i++>> <<if random(0,99) < $seeDicks>> + <<set $activeSlaveOneTimeMinAge = 16>> + <<set $activeSlaveOneTimeMaxAge = 32>> <<include "Generate XY Slave">> + <<set $activeSlave.weight = random(-20,30)>> + <<set $activeSlave.muscles = random(20,80)>> + <<set $activeSlave.waist = random(10,80)>> <<else>> + <<set $activeSlaveOneTimeMinAge = 16>> + <<set $activeSlaveOneTimeMaxAge = 32>> <<include "Generate XX Slave">> + <<set $activeSlave.weight = random(-50,30)>> + <<set $activeSlave.muscles = random(0,80)>> + <<set $activeSlave.waist = random(-20,20)>> <</if>> <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">> <<set _newSlaves.push($activeSlave)>> @@ -52,8 +64,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc <<set $j = 0>> <</if>> <<for $i = 0; $i < $j; $i++>> + <<set $activeSlaveOneTimeMinAge = 16>> + <<set $activeSlaveOneTimeMaxAge = 32>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">> + <<set $activeSlave.weight = random(-20,30)>> + <<set $activeSlave.muscles = random(20,80)>> + <<set $activeSlave.waist = random(10,80)>> <<set _newSlaves.push($activeSlave)>> <</for>> <<if $seeDicks > 50>> @@ -64,8 +81,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc <<set $j = 5>> <</if>> <<for $i = 0; $i < $j; $i++>> + <<set $activeSlaveOneTimeMinAge = 16>> + <<set $activeSlaveOneTimeMaxAge = 32>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">> + <<set $activeSlave.weight = random(-50,30)>> + <<set $activeSlave.muscles = random(0,80)>> + <<set $activeSlave.waist = random(-20,20)>> <<set _newSlaves.push($activeSlave)>> <</for>> <<set $desc = "a Daughters of Liberty flag that once hung in their forward command post within your arcology">> @@ -89,8 +111,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc <<set $j = 0>> <</if>> <<for $i = 0; $i < $j; $i++>> + <<set $activeSlaveOneTimeMinAge = 16>> + <<set $activeSlaveOneTimeMaxAge = 32>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">> + <<set $activeSlave.weight = random(-20,30)>> + <<set $activeSlave.muscles = random(20,80)>> + <<set $activeSlave.waist = random(10,80)>> <<set _newSlaves.push($activeSlave)>> <</for>> <<if $seeDicks > 50>> @@ -101,8 +128,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc <<set $j = 3>> <</if>> <<for $i = 0; $i < $j; $i++>> + <<set $activeSlaveOneTimeMinAge = 16>> + <<set $activeSlaveOneTimeMaxAge = 32>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">> + <<set $activeSlave.weight = random(-50,30)>> + <<set $activeSlave.muscles = random(0,80)>> + <<set $activeSlave.waist = random(-20,20)>> <<set _newSlaves.push($activeSlave)>> <</for>> <<set $desc = "a Daughters of Liberty brassard">> diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw index 0ac8f9fc05b4dc41ebf9c78c0e8fbcb8005d908c..9b9d77162bb893562e313c0412223d50ddce920e 100644 --- a/src/uncategorized/saDevotion.tw +++ b/src/uncategorized/saDevotion.tw @@ -725,7 +725,7 @@ <<if ($slaves[$i].devotion > 100) && ($slaves[$i].trust > 100) && ($slaves[$i].energy > 75)>> Her perfect devotion and trust @@.green;improve your reputation.@@ - <<set $repGain += 10*($slaves[$i].trust-100)>> + <<set $repGain += 10*($slaves[$i].devotion-100)>> <<set $slaves[$i].devotion = 100>> <<set $repGain += 10*($slaves[$i].trust-100)>> <<set $slaves[$i].trust = 100>> @@ -752,7 +752,7 @@ <<set $energyPlus += Math.trunc($slaves[$i].trust-100)>> <<else>> Her extreme trust @@.green;improved your reputation.@@ - <<set $repGain += 25*($slaves[$i].trust-100)>> + <<set $repGain += 10*($slaves[$i].trust-100)>> <</if>> <<set $slaves[$i].trust = 100>> <<elseif $slaves[$i].trust > 95>>