From a0e735e5d73b5485e743edf97b044ab21f7053d8 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 16 Jan 2018 11:34:36 -0500 Subject: [PATCH] fixes and ovaryAge to cheat edit slave --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++++ src/cheats/mod_EditSlaveCheat.tw | 4 +++ .../mod_EditSlaveCheatDatatypeCleanup.tw | 1 + .../mod_EditSlaveCheatDatatypeCleanupNew.tw | 27 +++++++++++-------- src/cheats/mod_editSlaveCheatNew.tw | 3 +++ src/uncategorized/SFMBarracks.tw | 1 + src/uncategorized/specialSlave.tw | 4 +-- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 0eb766a4ed6..3362d6aab99 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,13 @@ 0.10.7.0/1 +1/16/18 + + 277 + -fixed minor display issues + -fixed potential $rep cause in involving SF's Colonel (or fucked up the check and made it worse) + -added .ovaryAge to the cheat edit slaves + 1/15/18 276 diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index 7c0ecab017e..a1554e4a553 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -152,6 +152,10 @@ <<textbox "$activeSlave.visualAge" $activeSlave.visualAge>> <br> +''Age - Ovary:'' +<<textbox "$activeSlave.ovaryAge" $activeSlave.ovaryAge>> + +<br> ''Birth week:'' <<textbox "$activeSlave.birthWeek" $activeSlave.birthWeek>> diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw index 5e155292ee0..f9b44dcb0dd 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw @@ -25,6 +25,7 @@ <<set $activeSlave.actualAge = Number($activeSlave.actualAge)>> <<set $activeSlave.visualAge = Number($activeSlave.visualAge) || 18>> <<set $activeSlave.physicalAge = Number($activeSlave.physicalAge) || 18>> +<<set $activeSlave.ovaryAge = Number($activeSlave.physicalAge) || 18>> <<set $activeSlave.birthWeek = Number($activeSlave.birthWeek) || 0>> <<set $activeSlave.health = Number($activeSlave.health) || 0>> <<set $activeSlave.addict = Number($activeSlave.addict) || 0>> diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw index 7409ad81f30..44f1a317e8c 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw @@ -27,6 +27,7 @@ <<set $tempSlave.actualAge = Number($tempSlave.actualAge)>> <<set $tempSlave.visualAge = Number($tempSlave.visualAge) || 18>> <<set $tempSlave.physicalAge = Number($tempSlave.physicalAge) || 18>> +<<set $tempSlave.ovaryAge = Number($tempSlave.ovaryAge) || 18>> <<set $tempSlave.ageImplant = Number($tempSlave.ageImplant) || 0>> <<set $tempSlave.birthWeek = Number($tempSlave.birthWeek) || 0>> <<set $tempSlave.health = Number($tempSlave.health) || 0>> @@ -123,41 +124,45 @@ <<print "The Slave was her own Rival reset to No Rivalry">><br> <</if>> <<if $tempSlave.actualAge < 0>> - <<print "Slave actual Age is set to low reset to Arcology Minimum Age">><br> + <<print "Slave actual Age is set too low reset to Arcology Minimum Age">><br> <<set $tempSlave.actualAge = $minimumSlaveAge>> <</if>> <<if $tempSlave.physicalAge < 0>> - <<print "Slave physical Age is set to low reset to Arcology Minimum Age">><br> + <<print "Slave physical Age is set too low reset to Arcology Minimum Age">><br> <<set $tempSlave.physicalAge = $minimumSlaveAge>> <</if>> <<if $tempSlave.visualAge < 0>> - <<print "Slave visual Age is set to low reset to Arcology Minimum Age">><br> + <<print "Slave visual Age is set too low reset to Arcology Minimum Age">><br> <<set $tempSlave.visualAge = $minimumSlaveAge>> <</if>> <<if ($tempSlave.ageImplant == 1) && ($tempSlave.visualAge < 25)>> <<print "Slaves Visual Age is smaller than 25 reset to no lifting">><br> <<set $tempSlave.ageImplant = 0>> <</if>> +<<if $tempSlave.ovaryAge < 0>> + <<print "Slave ovary Age is set too low reset to match physical age">><br> + <<set $tempSlave.ovaryAge = $tempSlave.physicalAge>> +<</if>> <<if $tempSlave.chem < 0>> - <<print "Slaves DNA Error is set to low reset to 0">><br> + <<print "Slaves DNA Error is set too low reset to 0">><br> <<set $tempSlave.chem = 0>> <</if>> <<if $tempSlave.face < -100>> - <<print "Face Beauty was set to low reset to -100">><br> + <<print "Face Beauty was set too low reset to -100">><br> <<set $tempSlave.face = -100>> <<elseif $tempSlave.face > 100>> - <<print "Face Beauty was set to high reset to 100">><br> + <<print "Face Beauty was set too high reset to 100">><br> <<set $tempSlave.face = 100>> <</if>> <<if $tempSlave.hLength < 0>> - <<print "Slaves Hair length was set to low reset to 0">><br> + <<print "Slaves Hair length was set too low reset to 0">><br> <<set $tempSlave.hLength = 0>> <</if>> <<if $tempSlave.lips < 0>> - <<print "Lips size to small reset to 0">><br> + <<print "Lips size too small reset to 0">><br> <<set $tempSlave.lips = 0>> <<elseif $tempSlave.lips > 100>> - <<print "Lips size to big reset to 100">><br> + <<print "Lips size too big reset to 100">><br> <<set $tempSlave.lips = 100>> <</if>> <<if ($tempSlave.voice == 0) && ($tempSlave.voiceImplant == 1)>> @@ -165,10 +170,10 @@ <<set $tempSlave.voiceImplant = 0>> <</if>> <<if $tempSlave.amp <-5>> - <<print "Amputation Value to low reset to -5 (Cybernetic limbs)">><br> + <<print "Amputation Value too low reset to -5 (Cybernetic limbs)">><br> <<set $tempSlave.amp = -5>> <<elseif $tempSlave.amp > 1>> - <<print "Amputation Value to high reset to 1 (Amputated)">><br> + <<print "Amputation Value too high reset to 1 (Amputated)">><br> <<set $tempSlave.amp = 1>> <</if>> <<if ($tempSlave.amp == 0) && ($tempSlave.PLimb > 0)>> diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index de1d414341d..38e927796a1 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -803,6 +803,9 @@ ''Age - Physical:'' <<textbox "$tempSlave.physicalAge" $tempSlave.physicalAge>> <br> + ''Age - Ovaries:'' + <<textbox "$tempSlave.ovaryAge" $tempSlave.ovaryAge>> + <br> ''Age - Visual:'' <<textbox "$tempSlave.visualAge" $tempSlave.visualAge>> <br> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 4d03a97afeb..e6b11c13c30 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -65,6 +65,7 @@ <br><<link "Ask The Colonel to put in a good word for you with her contacts">> <<replace "#result">> <<set $GoodWords1 += 250+(Math.ceil(Math.max(0.99,$SFAO))*$Env)>> + <<set $GoodWords1 = ((def $GoodWords1) ? $GoodWords1 : 500)>> <<if random(1,100) > 50>> <<if random(1,100) > 50>> The Colonel nods. "Sure boss," she says, "I still know a lot of people out there and they know my word means something. I'll tell them that yours does as well." She picks up a tablet on the table, tapping a few commands on it. "I just put the word out, boss. Your @@.green;reputation should be a bit better@@ now." diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw index 86499213b42..31655528b03 100644 --- a/src/uncategorized/specialSlave.tw +++ b/src/uncategorized/specialSlave.tw @@ -13,9 +13,7 @@ <<set $activeSlave = getHeroSlave($heroSlaves.random(), $baseHeroSlave)>> <<set $activeSlave.weekAcquired = $week>> <<set $activeSlave.pubicHColor = $activeSlave.hColor>> - <<set $activeSlave.pubicHStyle = "waxed">> <<set $activeSlave.underArmHColor = $activeSlave.hColor>> - <<set $activeSlave.underArmHStyle = "waxed">> <<if $familyTesting == 1>> /* special slaves exceptions to keep siblings sensible */ <<if $activeSlave.mother == -9999 && $activeSlave.father == -9998>> /* The twins - Camille & Kennerly */ @@ -57,7 +55,7 @@ <br><br> - [[Pay to access complete catalog of slaves|Complete Catalog][$cash -= 1000]] //Costs <<print cashFormat(1000).>>// + [[Pay to access complete catalog of slaves|Complete Catalog][$cash -= 1000]] //Costs <<print cashFormat(1000)>>.// <br><br> -- GitLab