diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index d2278d399ae3f487f17c82b079804a66e331a7a9..f15f9b8f68e52e94df842de133bd7d8a02016319 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -3816,6 +3816,17 @@ accepts int 0 - no 1 - yes, comforting 2 - yes, terrifying +3 - yes, vegetable (do not use outside of incubator!) + +clone: + +Is she a clone? +0 - yes +1 - no + +cloneID: + +If she is a clone, the ID of her source geneMods: diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 5fe21b697f60cdc48b957ab2137303e6b09601b8..7f969162582c014dfa9a17fadc99dfe0f11d8713 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -2412,8 +2412,12 @@ App.Entity.SlaveState = class SlaveState { * * 0: no; 1: yes, comforting; 2: yes, terrifying */ this.tankBaby = 0; - /** */ + /** Is the slave a clone? + * + * 0: no; 1: yes */ this.clone = 0; + /** ID she was cloned from */ + this.cloneID = 0; /** */ this.geneMods = { /** Does slave have induced NCS? diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw index 2d9ab7d21cc27ce111e64a4596aefa2f48ea4594..395ceb483e94148745fd104ba42b6e0508dda809 100644 --- a/src/pregmod/widgets/bodySwapReaction.tw +++ b/src/pregmod/widgets/bodySwapReaction.tw @@ -1680,8 +1680,13 @@ Now you only have to wait for $him to wake up. The changes to $his tattoos were not lost on $him, but compared to everything else, they were truly insignificant. <</if>> - <<if $args[0].fetish != "mindbroken" && $args[0].origBodyOwnerID == $args[0].ID>> - This is $his body alright. Some things might have changed, + <<if $args[0].fetish != "mindbroken">> + <<if $args[0].origBodyOwnerID == $args[0].ID>> + This is $his body alright. + <<elseif $args[0].ID == $args[0].cloneID>> + This feels like $his body, in a sense. + <</if>> + Some things might have changed, <<if $args[0].devotion > 50>> but $he enjoyed the time they spent apart. <<elseif $args[0].devotion >= -20>> @@ -1691,6 +1696,9 @@ Now you only have to wait for $him to wake up. but @@.mediumaquamarine;$he's where $he belongs.@@ Now to get it back the way @@.mediumorchid;$he likes it.@@ <<set $args[0].trust += 30, $args[0].devotion -= 15>> <</if>> + <<if $args[0].ID == $args[0].cloneID>> + Whether or not $he'll figure out it is a clone of $his original body remains to be seen. + <</if>> <</if>> <</if>> @@ -3195,16 +3203,20 @@ Now you only have to wait for $him to wake up. The changes to $his tattoos were not lost on $him, but compared to everything else, they were truly insignificant. <</if>> - <<if $args[0].fetish != "mindbroken" && $args[0].origBodyOwnerID == $args[0].ID>> - This is $his body alright. Some things might have changed, - <<if $args[0].devotion > 50>> - but $he enjoyed the time they spent apart. - <<elseif $args[0].devotion >= -20>> - but @@.mediumaquamarine;it's good to be home.@@ - <<set $args[0].trust += 15>> - <<else>> - but @@.mediumaquamarine;$he's where $he belongs.@@ Now to get it back the way @@.mediumorchid;$he likes it.@@ - <<set $args[0].trust += 30, $args[0].devotion -= 15>> + <<if $args[0].fetish != "mindbroken">> + <<if $args[0].origBodyOwnerID == $args[0].ID>> + This is $his body alright. Some things might have changed, + <<if $args[0].devotion > 50>> + but $he enjoyed the time they spent apart. + <<elseif $args[0].devotion >= -20>> + but @@.mediumaquamarine;it's good to be home.@@ + <<set $args[0].trust += 15>> + <<else>> + but @@.mediumaquamarine;$he's where $he belongs.@@ Now to get it back the way @@.mediumorchid;$he likes it.@@ + <<set $args[0].trust += 30, $args[0].devotion -= 15>> + <</if>> + <<elseif $args[0].ID == $args[0].cloneID>> + This is $his body, but not ''$his'' body. That it was cloned from $his original one is not lost on $him. <</if>> <</if>> diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw index e78c76933937880d9a0ca879015ad5c1773f75f1..0449dcf8102d1587e143f62490162e08fedb306d 100644 --- a/src/pregmod/widgets/bodyswapWidgets.tw +++ b/src/pregmod/widgets/bodyswapWidgets.tw @@ -162,6 +162,8 @@ <<set $args[0].ovaImplant = $args[1].ovaImplant>> <<set $args[0].geneticQuirks = $args[1].geneticQuirks>> <<set $args[0].albinismOverride = $args[1].albinismOverride>> +<<set $args[0].clone = $args[1].clone>> +<<set $args[0].cloneID = $args[1].cloneID>> <<set $args[0].canRecruit = 0>>