diff --git a/src/pregmod/slaveSlaveSwap.tw b/src/pregmod/slaveSlaveSwap.tw index 6cc520cd42e6bf0450be0ae3e5c2df1df7e83883..d9294bea78eb65f0281306849a165a374d22830d 100644 --- a/src/pregmod/slaveSlaveSwap.tw +++ b/src/pregmod/slaveSlaveSwap.tw @@ -14,10 +14,10 @@ <<run clearSummaryCache($slaves[_ss2])>> You strap $activeSlave.slaveName and $swappingSlave.slaveName into the remote surgery and stand back as it goes to work. -<<BodySwap $slaves[_ss1] _ss2Clone 1>> /* passing a third argument just to detect if it's a slave from the genepool */ -<<BodySwap $genePool[_gps1] _gps2Clone>> -<<BodySwap $slaves[_ss2] _ss1Clone 1>> /* passing a third argument just to detect if it's a slave from the genepool */ -<<BodySwap $genePool[_gps2] _gps1Clone>> +<<BodySwap $slaves[_ss1] _ss2Clone>> +<<BodySwap $genePool[_gps1] _gps2Clone 1>> /* passing a third argument just to detect if it's a slave from the genepool */ +<<BodySwap $slaves[_ss2] _ss1Clone>> +<<BodySwap $genePool[_gps2] _gps1Clone 1>> /* passing a third argument just to detect if it's a slave from the genepool */ <br><br> After an honestly impressive procedure, $slaves[_ss1].slaveName is recovering nicely. diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw index 68d1bb07d0f9ad7e9501ae5c5f6d7a560d978a5b..34b51dbe798c16306a9715cc06e63daf5722f3ee 100644 --- a/src/pregmod/widgets/bodyswapWidgets.tw +++ b/src/pregmod/widgets/bodyswapWidgets.tw @@ -7,19 +7,10 @@ <<set WombInit($args[1])>> /*Just to be sure.*/ <<set $args[0].genes = $args[1].genes>> -<<set $args[0].prestige = $args[1].prestige>> -<<set $args[0].pornFame = $args[1].pornFame>> -<<set $args[0].pornPrestige = $args[1].pornPrestige>> -<<set $args[0].pornPrestigeDesc = $args[1].pornPrestigeDesc>> -<<set $args[0].porn.fameType = $args[1].porn.fameType>> -<<set $args[0].porn.focus = "none">> -<<set $args[0].porn = $args[1].porn>> -<<set $args[0].prestigeDesc = $args[1].prestigeDesc>> <<set $args[0].physicalAge = $args[1].physicalAge>> <<set $args[0].visualAge = $args[1].visualAge>> <<set $args[0].ageImplant = $args[1].ageImplant>> <<set $args[0].health = $args[1].health>> -<<set $args[0].minorInjury = $args[1].minorInjury>> <<set $args[0].weight = $args[1].weight>> <<set $args[0].muscles = $args[1].muscles>> <<set $args[0].height = $args[1].height>> @@ -33,9 +24,7 @@ <<set $args[0].eyes = $args[1].eyes>> <<set $args[0].origEye = $args[1].origEye>> <<set $args[0].eyeColor = $args[1].eyeColor>> -<<set $args[0].eyeWear = $args[1].eyeWear>> <<set $args[0].hears = $args[1].hears>> -<<set $args[0].earwear = $args[1].earwear>> <<set $args[0].earImplant = $args[1].earImplant>> <<set $args[0].earShape = $args[1].earShape>> <<set $args[0].earT = $args[1].earT>> @@ -97,22 +86,15 @@ <<set $args[0].vaginaLube = $args[1].vaginaLube>> <<set $args[0].vaginaPiercing = $args[1].vaginaPiercing>> <<set $args[0].vaginaTat = $args[1].vaginaTat>> -<<set $args[0].preg = $args[1].preg>> -<<set $args[0].pregSource = $args[1].pregSource>> -<<set $args[0].pregType = $args[1].pregType>> <<set $args[0].fertKnown = $args[1].fertKnown>> <<set $args[0].fertPeak = $args[1].fertPeak>> <<set $args[0].broodmother = $args[1].broodmother>> <<set $args[0].broodmotherFetuses = $args[1].broodmotherFetuses>> <<set $args[0].broodmotherOnHold = $args[1].broodmotherOnHold>> <<set $args[0].broodmotherCountDown = $args[1].broodmotherCountDown>> -<<set $args[0].labor = $args[1].labor>> -<<set $args[0].csec = $args[1].csec>> -<<set $args[0].bellyAccessory = $args[1].bellyAccessory>> <<set $args[0].labia = $args[1].labia>> <<set $args[0].clit = $args[1].clit>> <<set $args[0].clitPiercing = $args[1].clitPiercing>> -<<set $args[0].clitSetting = $args[1].clitSetting>> <<set $args[0].dick = $args[1].dick>> <<set $args[0].foreskin = $args[1].foreskin>> <<set $args[0].anus = $args[1].anus>> @@ -125,11 +107,8 @@ <<set $args[0].ovaries = $args[1].ovaries>> <<set $args[0].anusPiercing = $args[1].anusPiercing>> <<set $args[0].anusTat = $args[1].anusTat>> -<<set $args[0].makeup = $args[1].makeup>> -<<set $args[0].nails = $args[1].nails>> <<set $args[0].brand = $args[1].brand>> <<set $args[0].brandLocation = $args[1].brandLocation>> -<<set $args[0].earsPiercing = $args[1].earsPiercing>> <<set $args[0].nosePiercing = $args[1].nosePiercing>> <<set $args[0].eyebrowPiercing = $args[1].eyebrowPiercing>> <<set $args[0].navelPiercing = $args[1].navelPiercing>> @@ -138,60 +117,31 @@ <<set $args[0].legsTat = $args[1].legsTat>> <<set $args[0].backTat = $args[1].backTat>> <<set $args[0].stampTat = $args[1].stampTat>> -<<set $args[0].diet = $args[1].diet>> -<<set $args[0].dietCum = $args[1].dietCum>> -<<set $args[0].dietMilk = $args[1].dietMilk>> <<set $args[0].hormones = $args[1].hormones>> -<<set $args[0].drugs = $args[1].drugs>> -<<set $args[0].aphrodisiacs = $args[1].aphrodisiacs>> -<<set $args[0].curatives = $args[1].curatives>> <<set $args[0].chem = $args[1].chem>> -<<set $args[0].clothes = $args[1].clothes>> -<<set $args[0].collar = $args[1].collar>> -<<set $args[0].shoes = $args[1].shoes>> -<<set $args[0].vaginalAccessory = $args[1].vaginalAccessory>> <<set $args[0].vaginalAttachment = $args[1].vaginalAttachment>> -<<set $args[0].dickAccessory = $args[1].dickAccessory>> <<set $args[0].chastityVagina = $args[1].chastityVagina>> <<set $args[0].chastityPenis = $args[1].chastityPenis>> <<set $args[0].chastityAnus = $args[1].chastityAnus>> -<<set $args[0].buttplug = $args[1].buttplug>> <<set $args[0].customTat = $args[1].customTat>> <<set $args[0].bellyTat = $args[1].bellyTat>> <<set $args[0].abortionTat = $args[1].abortionTat>> -<<set $args[0].bellySag = $args[1].bellySag>> -<<set $args[0].bellySagPreg = $args[1].bellySagPreg>> -<<set $args[0].induce = $args[1].induce>> -<<set $args[0].mpreg = $args[1].mpreg>> -<<set $args[0].inflation = 0, $args[0].inflationType = "none", $args[0].inflationMethod = 0, $args[0].milkSource = 0, $args[0].cumSource = 0>> -<<set $args[0].bellyImplant = $args[1].bellyImplant>> -<<set $args[0].bellyPain = $args[1].bellyPain>> -<<set $args[0].cervixImplant = $args[1].cervixImplant>> <<set $args[0].pubertyAgeXX = $args[1].pubertyAgeXX>> <<set $args[0].pubertyXX = $args[1].pubertyXX>> <<set $args[0].pubertyAgeXY = $args[1].pubertyAgeXY>> <<set $args[0].pubertyXY = $args[1].pubertyXY>> -<<set $args[0].scars = $args[1].scars>> <<set $args[0].breedingMark = $args[1].breedingMark>> <<set $args[0].underArmHColor = $args[1].underArmHColor>> <<set $args[0].underArmHStyle = $args[1].underArmHStyle>> <<set $args[0].publicCount = $args[1].publicCount>> <<set $args[0].ballType = $args[1].ballType>> <<set $args[0].eggType = $args[1].eggType>> -<<set $args[0].pregControl = $args[1].pregControl>> -<<set $args[0].readyLimbs = $args[1].readyLimbs>> <<set $args[0].bald = $args[1].bald>> <<set $args[0].hormoneBalance = $args[1].hormoneBalance>> <<set $args[0].breastMesh = $args[1].breastMesh>> -<<set $args[0].buttplugAttachment = $args[1].buttplugAttachment>> <<set $args[0].vasectomy = $args[1].vasectomy>> <<set $args[0].haircuts = $args[1].haircuts>> -<<set $args[0].pregKnown = $args[1].pregKnown>> -<<set $args[0].pregWeek = $args[1].pregWeek>> <<set $args[0].ovaryAge = $args[1].ovaryAge>> -<<set $args[0].belly = $args[1].belly>> -<<set $args[0].bellyPreg = $args[1].bellyPreg>> -<<set $args[0].bellyFluid = $args[1].bellyFluid>> <<set $args[0].readyOva = $args[1].readyOva>> <<set $args[0].womb = $args[1].womb>> /* this is array assigned by reference, if slave body that is $args[1] will be still used anywhere in code (not discarded) - it's WRONG (they now technically share one womb object). Please tell me about it then. But if old body $args[1] just discarded - it's no problem then.*/ <<set $args[0].laborCount = $args[1].laborCount>> @@ -204,6 +154,57 @@ <<set $args[0].ovaImplant = $args[1].ovaImplant>> <<set $args[0].canRecruit = 0>> + +<<if $args[2] != 1>> /* swpping NOT gene pool records */ + <<set $args[0].porn = $args[1].porn>> + <<set $args[0].aphrodisiacs = $args[1].aphrodisiacs>> + <<set $args[0].curatives = $args[1].curatives>> + <<set $args[0].drugs = $args[1].drugs>> + <<set $args[0].prestige = $args[1].prestige>> + <<set $args[0].pornFame = $args[1].pornFame>> + <<set $args[0].pornPrestige = $args[1].pornPrestige>> + <<set $args[0].pornPrestigeDesc = $args[1].pornPrestigeDesc>> + <<set $args[0].prestigeDesc = $args[1].prestigeDesc>> + <<set $args[0].minorInjury = $args[1].minorInjury>> + <<set $args[0].eyeWear = $args[1].eyeWear>> + <<set $args[0].earwear = $args[1].earwear>> + <<set $args[0].earsPiercing = $args[1].earsPiercing>> + <<set $args[0].bellyAccessory = $args[1].bellyAccessory>> + <<set $args[0].preg = $args[1].preg>> + <<set $args[0].pregSource = $args[1].pregSource>> + <<set $args[0].pregType = $args[1].pregType>> + <<set $args[0].labor = $args[1].labor>> + <<set $args[0].clitSetting = $args[1].clitSetting>> + <<set $args[0].diet = $args[1].diet>> + <<set $args[0].dietCum = $args[1].dietCum>> + <<set $args[0].dietMilk = $args[1].dietMilk>> + <<set $args[0].clothes = $args[1].clothes>> + <<set $args[0].collar = $args[1].collar>> + <<set $args[0].shoes = $args[1].shoes>> + <<set $args[0].makeup = $args[1].makeup>> + <<set $args[0].nails = $args[1].nails>> + <<set $args[0].vaginalAccessory = $args[1].vaginalAccessory>> + <<set $args[0].dickAccessory = $args[1].dickAccessory>> + <<set $args[0].buttplug = $args[1].buttplug>> + <<set $args[0].buttplugAttachment = $args[1].buttplugAttachment>> + <<set $args[0].induce = $args[1].induce>> + <<set $args[0].mpreg = $args[1].mpreg>> + <<set $args[0].inflation = 0, $args[0].inflationType = "none", $args[0].inflationMethod = 0, $args[0].milkSource = 0, $args[0].cumSource = 0>> + <<set $args[0].pregKnown = $args[1].pregKnown>> + <<set $args[0].pregWeek = $args[1].pregWeek>> + <<set $args[0].belly = $args[1].belly>> + <<set $args[0].bellyPreg = $args[1].bellyPreg>> + <<set $args[0].bellyFluid = $args[1].bellyFluid>> + <<set $args[0].bellyImplant = $args[1].bellyImplant>> + <<set $args[0].bellySag = $args[1].bellySag>> + <<set $args[0].bellySagPreg = $args[1].bellySagPreg>> + <<set $args[0].bellyPain = $args[1].bellyPain>> + <<set $args[0].csec = $args[1].csec>> + <<set $args[0].cervixImplant = $args[1].cervixImplant>> + <<set $args[0].scars = $args[1].scars>> + <<set $args[0].pregControl = $args[1].pregControl>> + <<set $args[0].readyLimbs = $args[1].readyLimbs>> +<</if>> /* <<if def $args[2]>> <<= assignJob($args[0], "rest")>>