From 3734d101fd5b8f9d2df94591602ac3fc80dec847 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 22 Jun 2018 19:39:31 -0400 Subject: [PATCH] fixes and tweaks --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 8 ++++++++ src/uncategorized/RESS.tw | 2 +- src/uncategorized/pRivalryActions.tw | 1 + src/uncategorized/pRivalryCapture.tw | 12 ++++++++++++ src/uncategorized/pRivalryVictory.tw | 2 ++ src/uncategorized/saDrugs.tw | 2 +- 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 42ecd4d7ec9..d04591b1fbe 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -1,5 +1,13 @@ Pregmod +0.10.7.1-0.4.x + +6/22/2018 + + 1 + -vas's total RA overhaul + -various little fixes and tweaks + 0.10.7.1-0.3.x 6/20/2018 diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 056b35af5de..b9a4ea60446 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -5851,7 +5851,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?" <<else>> to kneel and take it doggy style. <</if>> - After getting things going, you use one hand to begin groping her<<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>pregnant<<else>>_belly<</if>><</if>> belly. Bending forward to whisper into her ear, you begin to describe how + After getting things going, you use one hand to begin groping her<<if $activeSlave.bellyPreg >= 1500>> pregnant<<elseif $activeSlave.belly >= 1500>> _belly<</if>> belly. Bending forward to whisper into her ear, you begin to describe how <<if $activeSlave.belly >= 750000>> she's nothing more than a giant egg just waiting for her children to hatch; how she's so close to bursting with life that just a few more babies should do it. <<elseif $activeSlave.belly >= 600000>> diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw index 5478bc8cbd2..343c02a379b 100644 --- a/src/uncategorized/pRivalryActions.tw +++ b/src/uncategorized/pRivalryActions.tw @@ -3958,6 +3958,7 @@ You remind yourself that success in this conflict will not be defined by the tra <<set $arcologies[_pra].influenceTarget = -1>> <<set $arcologies[_pra].rival = 0>> <<set $arcologies[_pra].government = "direct democracy">> + <<if _rivalCaptured == 1 && $arcologies[_pra].FSSupremacist > 20>><<set $rivalRace = $arcologies[_pra].FSSupremacistRace<</if>> <<break>> <</if>> <</for>> diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw index 3013eae396c..70fdc697f1b 100644 --- a/src/uncategorized/pRivalryCapture.tw +++ b/src/uncategorized/pRivalryCapture.tw @@ -34,6 +34,7 @@ the delicious moment of finding your rival on her knees in front of you with a b immediately apparent: she's obviously been indulging in self-transformation to excess. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.face = 100>> <<set $activeSlave.faceImplant = 15>> @@ -69,6 +70,7 @@ the delicious moment of finding your rival on her knees in front of you with a b immediately apparent: there's nothing wrong with having cumflation and ball expansion fetishes, but applying them to oneself can be addictive. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.chem = 3000>> <<set $activeSlave.face = 100>> @@ -103,6 +105,7 @@ the delicious moment of finding your rival on her knees in front of you with a b not immediately apparent: she's young, in good shape, and not lacking down there at all. <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>> <<set $activeSlaveOneTimeMaxAge = 18>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.face = 100>> <<set $activeSlave.faceShape = "androgynous">> @@ -135,6 +138,7 @@ the delicious moment of finding your rival on her knees in front of you with a b not immediately apparent: she's in good shape, if quite masculine. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.face = 55>> <<set $activeSlave.faceImplant = 0>> @@ -165,6 +169,7 @@ the delicious moment of finding your rival on her knees in front of you with a b immediately apparent: she's got a slavegirl's cock and balls, not an arcology owner's. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.face = 55>> <<set $activeSlave.faceImplant = 0>> @@ -195,6 +200,7 @@ the delicious moment of finding your rival on her knees in front of you with a b not immediately apparent: though female, she's obviously no stranger to taking a dominant sexual role, to put it politely. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.face = 55>> <<set $activeSlave.faceImplant = 0>> @@ -235,6 +241,7 @@ the delicious moment of finding your rival on her knees in front of you with a b <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> <</if>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.pubertyXX = 1>> <<set $activeSlave.face = 100>> @@ -280,6 +287,7 @@ the delicious moment of finding your rival on her knees in front of you with a b immediately apparent: she's young, inexperienced, and extremely top heavy. <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>> <<set $activeSlaveOneTimeMaxAge = 12>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.face = 100>> <<set $activeSlave.faceImplant = 0>> @@ -311,6 +319,7 @@ the delicious moment of finding your rival on her knees in front of you with a b immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.face = 55>> <<set $activeSlave.faceImplant = 0>> @@ -342,6 +351,7 @@ the delicious moment of finding your rival on her knees in front of you with a b immediately apparent: there's nothing wrong with having a bimbo fetish, but applying it to oneself can be addictive. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.face = 100>> <<set $activeSlave.faceImplant = 65>> @@ -375,6 +385,7 @@ the delicious moment of finding your rival on her knees in front of you with a b immediately apparent: she seems to have recently fallen into serious aphrodisiac addiction. <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> + <<if $rivalRace != 0>><<set $fixedRace = $rivalRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.face = 100>> <<set $activeSlave.faceImplant = 15>> @@ -418,4 +429,5 @@ the delicious moment of finding your rival on her knees in front of you with a b <<set $activeSlave.pubicHStyle = "waxed">> <<set $activeSlave.underArmHStyle = "waxed">> <<set $nextLink = "AS Dump", $returnTo = "P rival initiation", $rivalID = $activeSlave.ID>> /* proceed directly to rival initiation event after New Slave Intro */ +<<set $rivalRace = 0>> <<include "New Slave Intro">> \ No newline at end of file diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw index 51f10ade740..7517d4c3b90 100644 --- a/src/uncategorized/pRivalryVictory.tw +++ b/src/uncategorized/pRivalryVictory.tw @@ -1,6 +1,7 @@ :: P rivalry victory [nobr] <<set $nextButton = " ", $nextLink = "Random Nonindividual Event", $rivalOwner = 0, $rivalryPower = 0, _num = random(1,99)>> /* hide button until user makes a selection */ +<<set $rivalRace = 0>> For the first time, you receive a direct call from your rival. You pictured the moment as feeling grander than this, sitting at your desk as usual looking into <<if _num < $seeDicks>>his<<else>>her<</if>> downcast face. You're the victor in a new form of warfare in which bankruptcy has replaced surrender. If the world survives in its present state, you may one day be remembered as an innovator in the evolution of (nearly) bloodless war. Today, your reputation has @@.green;greatly improved.@@ But today all you have that's tangible is a view of a still-dignified arcology owner, self-possessed despite the situation. @@ -105,6 +106,7 @@ For the first time, you receive a direct call from your rival. You pictured the <<set $arcologies[_prv].influenceTarget = -1>> <<set $arcologies[_prv].rival = 0>> <<set $arcologies[_prv].government = "direct democracy">> + <<if $arcologies[_prv].FSSupremacist > 20>><<set $rivalRace = $arcologies[_prv].FSSupremacistRace<</if>> <<break>> <</if>> <</for>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 2a50bd78844..0ab1c499e19 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -582,7 +582,7 @@ <<set $slaves[$i].health -= 20>> <</if>> <<if random(1,10) == 1 && _growth != 5>> - the stimulants stressed $slaves[$i].slaveName's body more than expected, @@.red;damaging $possessive health.@@ + The stimulants stressed $slaves[$i].slaveName's body more than expected, @@.red;damaging $possessive health.@@ <<set $slaves[$i].health -= 10>> <</if>> <<if $slaves[$i].physicalAge > $maxGrowthAge>> -- GitLab