diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js index f9fed6d059dddd5d5c1df23860de313bfa209334..fc54335e12287d92d7c0933624bcdceaf0e59112 100644 --- a/src/js/walkPastJS.js +++ b/src/js/walkPastJS.js @@ -1240,36 +1240,37 @@ window.relatedSlave = function(activeSlave) { const he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun; const He = capFirstChar(he), His = capFirstChar(his); let t = ""; - let _target = ""; + let partnerSlave; + + let fuckseed = jsRandom(1,100); if (V.partner === "relation") { if (V.familyTesting === 1) { - _partnerSlave = V.relation; + partnerSlave = V.relation; } else { - _partnerSlave = getSlave(activeSlave.relationTarget); + partnerSlave = getSlave(activeSlave.relationTarget); } } else { var activeSlaveRel = relationshipTerm(activeSlave); - _partnerSlave = getSlave(activeSlave.relationshipTarget); + partnerSlave = getSlave(activeSlave.relationshipTarget); } - if (_partnerSlave !== undefined) { /* potential problem point */ - // let race2 = (V.seeRace ? _partnerSlave.race : ""); + if (partnerSlave !== undefined) { /* potential problem point */ - t += " His "; + t += ` ${His} `; if (V.partner === "relation") { if (V.familyTesting === 1) { t += `${V.relationType} `; } else { - t += `${_partnerSlave.relation} `; + t += `${partnerSlave.relation} `; } } else { t += `${activeSlaveRel} `; } - t += `${_partnerSlave.slaveName} `; - + t += `${partnerSlave.slaveName} `; + t += walkPasts(partnerSlave, fuckseed); - V.target = "FRival"; /*potentially removed later*/ + V.target = "FRelation"; /*potentially removed later*/ } else { t += ` Expected partner not found!`; } diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw index 0312fa83bccdf030d3cb425b3427fea72b93b930..9b6cbb36f662cdaa0f2872b384ac7b6a3f746d47 100644 --- a/src/uncategorized/walkPast.tw +++ b/src/uncategorized/walkPast.tw @@ -52,196 +52,9 @@ <<= loverSlave($activeSlave)>> <<elseif ($partner == "relationship") || ($partner == "relation")>> - <<set _partnerSlave = null>> - <<if ($partner == "relation")>> - <<if $familyTesting == 1>> - <<set _partnerSlave = $relation>> - <<setLocalPronouns _partnerSlave 2>> - <<else>> - <<set _partnerSlave = getSlave($activeSlave.relationTarget)>> - <<setLocalPronouns _partnerSlave 2>> - <</if>> - <<else>> - <<set _partnerSlave = getSlave($activeSlave.relationshipTarget)>> - <<setLocalPronouns _partnerSlave 2>> - <<if $activeSlave.relationship <= 1>> - <<set _activeSlaveRel = "friend", _partnerRel = "friend">> - <<elseif $activeSlave.relationship <= 2>> - <<set _activeSlaveRel = "best friend", _partnerRel = "best friend">> - <<elseif $activeSlave.relationship <= 3>> - <<set _activeSlaveRel = "friend with benefits", _partnerRel = "friend with benefits">> - <<elseif $activeSlave.relationship <= 4>> - <<set _activeSlaveRel = "lover", _partnerRel = "lover">> - <<elseif $activeSlave.relationship > 4>> - <<set _activeSlaveRel = "slave wife", _partnerRel = "slave wife">> - <</if>> - <</if>> - <<if ndef _partnerSlave || _partnerSlave == null>> - <<goto "Main">> - <</if>> - - $His - <<if ($partner == "relation")>> - <<if $familyTesting == 1>> - $relationType - <<else>> - _partnerSlave.relation - <</if>> - <<else>> - _activeSlaveRel - <</if>> - _partnerSlave.slaveName - <<switch _partnerSlave.assignment>> - <<case "be your agent">> - is off managing an arcology in your stead, but you can call _him2 back for a visit if you were inclined. - <<case "be confined in the arcade">> - is nothing more than holes in $arcadeName, but you have a fine view of _his2 <<if $seeRace == 1>>_partnerSlave.race rear <</if>>on the feed from the facility. - <<case "stay confined">> - is confined, but you have a fine view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feed from _his2 cell. - <<case "work in the brothel">> - is working in the brothel, and is - <<if (_seed > 80)>> - riding a customer's dick. - <<elseif (_seed > 60)>> - sucking a customer's cock. - <<elseif (_seed > 40)>> - pleasuring a customer's cunt. - <<elseif (_seed > 20)>> - getting pounded by a woman wearing a strap-on. - <<else>> - being held down and buttfucked by a customer. You have a voyeuristic view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds. - <</if>> - You have a voyeuristic view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds. - <<case "serve the public">> - is serving the public, and is - <<if (_seed > 80)>> - riding a citizen's dick. - <<elseif (_seed > 60)>> - sucking a citizen's cock. - <<elseif (_seed > 40)>> - pleasuring a citizen's cunt. - <<elseif (_seed > 20)>> - getting pounded by a citizen wearing a strap-on. - <<else>> - being held down and buttfucked by a citizen. - <</if>> - You have a voyeuristic view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds. - <<case "work in the dairy">> - <<if ($dairyRestraintsSetting > 1)>> - is strapped to a milking machine in $dairyName. - <<elseif (_partnerSlave.lactation == 0) && (_partnerSlave.balls > 0)>> - is working in $dairyName, and is having _his2 cock milked. As you watch, _his2 balls tighten as the phallus up _his2 butt brings _him2 closer to a copious ejaculation. - <<elseif _seed > 50>> - is working in $dairyName, having _his2 tits milked. - <<else>> - is working in $dairyName, massaging _his2 sore tits. - <</if>> - You have a good view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds. - <<case "serve in the club">> - is working on the club, - <<if _seed > 50>> - displaying _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body, keeping citizens company, and flirting with anyone who shows interest. - <<else>> - or rather just off it, having taken a prominent citizen back to a discreet room so he can use _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body. - <</if>> - <<case "work as a servant">> - <<if _seed > 50>> - was scrubbing the penthouse floor, until another slave requested oral service. - <<else>> - is scrubbing the penthouse floor. - <</if>> - <<case "guard you">> - is standing discreetly behind your left shoulder, watching for threats. _He2 has a straight ceramic sword strapped to _his2 back and a machine pistol at _his2 hip. - <<case "be the Madam">> - is managing the brothel: _he2 is making sure all the customers are satisfied and all the whores are working hard. - <<case "be the Attendant">> - is seeing to slaves in the spa: _he2 is gently soaping an exhausted slave. - <<case "be the Stewardess">> - is managing the house servants: _he2 overseeing the laboring house slaves and punishing any that step out of line. - <<case "be the DJ">> - is taking the lead on the club: _he2 greets new arrivals, flirts with them prettily, and subtly guides them towards choice sluts. - <<case "be the Schoolteacher">> - is teaching classes: _he2 is leading the slave students in rote recitation. - <<case "be the Milkmaid">> - is working in the dairy, looking after your stock. - <<default>> - - <<if (_partnerSlave.heels == 1) && !["flats", "none"].includes(_partnerSlave.shoes)>> - walks past your desk with the tiny swaying steps $he must take in order to walk on _his2 surgically altered legs. _He2 is on _his2 way to - <<elseif ["heels", "pumps"].includes(_partnerSlave.shoes)>> - walks past your desk with the swaying steps _he2 must take in _his2 high heels. _He2 is on _his2 way to - <<elseif (_partnerSlave.shoes == "boots")>> - walks past your desk with the confident gait encouraged by _his2 high heeled boots. _He2 is on _his2 way to - <<elseif (_partnerSlave.shoes == "extreme heels")>> - walks past your desk with the tiny swaying steps _he2 must take in _his2 ridiculous heels. _He2 is on _his2 way to - <<elseif (_partnerSlave.heels == 1)>> - crawls past your desk on all fours, since _he2 has not been allowed the heels _he2 needs to walk upright. _He2 is on _his2 way to - <<elseif (_partnerSlave.amp == 1)>> - is carried past your desk by one of your other slaves. _He2 is on _his2 way to - <<else>> - walks past your desk on _his2 way to - <</if>> - <<switch _partnerSlave.assignment>> - <<case "whore">> - <<if _seed > 50>> - whore; - <<else>> - sell _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body; - <</if>> - <<case "serve the public">> - <<if _seed > 50>> - serve the public; - <<else>> - be a public slut; - <</if>> - <<case "rest">> - <<if _seed > 50>> - eat; - <<else>> - bed; - <</if>> - <<case "get milked">> - <<if _seed > 50>> - milk _his2 overfull <<if $seeRace == 1>>_partnerSlave.race <</if>>tits; - <<else>> - drain _his2 milky <<if $seeRace == 1>>_partnerSlave.race <</if>>udders; - <</if>> - <<case "please you">> - sit next to you and wait for - <<if _seed > 50>> - you to fuck _him2; - <<else>> - _his2 Master to use _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body; - <</if>> - <<case "be a subordinate slave">> - service your other slaves; - <<case "be a servant">> - clean up after your other slaves; - <<case "be your Head Girl">> - oversee your other slaves; - <<case "recruit girls">> - use _his2 connections to recruit slaves; - <</switch>> - - <<if (_partnerSlave.amp == 1)>> - _he2 is carried by on _his2 way to _his2 next task. - <<elseif _partnerSlave.fetish == "mindbroken">> - _he2 does not even glance at you as _he2 goes mindlessly to _his2 next task. - <<elseif _partnerSlave.devotion < -50>> - _he2 directs a look of pure hatred at where you sit as _he2 passes. - <<elseif _partnerSlave.devotion < -20>> - _he2 cannot keep the loathing from _his2 face as _he2 passes. - <<elseif _partnerSlave.devotion <= 20>> - _he2 passes quickly, obviously hoping to avoid you. - <<elseif _partnerSlave.devotion <= 50>> - _he2 rushes by, hurrying to _his2 next task. - <<else>> - as _he2 passes _he2 gives you a look of adoration. - <</if>> - - <</switch>> - <<set $target = "FRelation", _partnerSlave = null>> + <<= relatedSlave($activeSlave)>> + <<elseif (_flag > 80) && ($activeSlave.fuckdoll == 0)>> <<BoobsDescription>> <<switch $activeSlave.clothes>>