diff --git a/Changelog.txt b/Changelog.txt index a7ad3912e1cd8cebfd89cc6715b6d5997ca61269..fba12a893d633504e7cc5e56bcafab1d46db9c41 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -5,6 +5,8 @@ Pregmod 0 -RA refactoring -multibranding + -added support for gloves and arm accessories + -expanded the traitor event line -superfetation tweaks -preg analysis can now identify genetic quirks in fetuses -enabled weight gain/loss genetic quirks diff --git a/src/npc/fBeg.tw b/src/npc/fBeg.tw index aa680470dce281b5c0384fcf01ab33ecacde0fe5..816044cdd96cb538b6dc5763893b564b61f0c5b8 100644 --- a/src/npc/fBeg.tw +++ b/src/npc/fBeg.tw @@ -1,12 +1,16 @@ :: FBeg [nobr] +/* things I need: checks for canWalk() to see how easily she can move, blindness checks, replacement for BoobsDesc, maybe devotion catches for certain flaws */ + <<set $desc = SlaveTitle($activeSlave)>> <<run clearSummaryCache($activeSlave)>> <<setLocalPronouns $activeSlave>> <<run Enunciate($activeSlave)>> <<setSpokenLocalPronouns $activeSlave $activeSlave>> -You call $him over to you for inspection. <<BoobsDescription>> You look at $him lustfully and instruct $him to strip. +You call $him over to you for inspection. +<<BoobsDescription>> /* this part needs expansion */ +You look at $him lustfully and instruct $him to strip. <<if ($activeSlave.sexualFlaw == "shamefast")>> Tears well up in $his eyes at the idea of showing $his naked body. <<elseif ($activeSlave.sexualQuirk == "tease")>> @@ -28,11 +32,11 @@ You call $him over to you for inspection. <<BoobsDescription>> You look at $him <<else>> <<if ($activeSlave.devotion < -20)>> $He resists, forcing you to undress $him yourself. - <<elseif ($activeSlave.devotion > -20)>> - $He obeys, and moves to the center of your office to undress $himself for you. + <<elseif ($activeSlave.devotion >= -20)>> + $He obeys, and moves to the center of your office to disrobe for you. <</if>> <</if>> -<<if ($activeSlave.devotion > -20)>> +<<if ($activeSlave.devotion >= -20)>> $He begins to undress with <<if ($activeSlave.skill.entertainment >= 100)>> masterful skill, teasing and taunting all the way down. $He rolls $his hips and most sexual parts as $he removes $his clothing. @@ -66,38 +70,42 @@ You call $him over to you for inspection. <<BoobsDescription>> You look at $him <<else>> <<Master>>. <</if>> - Plea<<s>>e puni<<sh>> your little <<s>>lut." Sensing that your slave is getting too much enjoyment from $his beating you cease. + Plea<<s>>e puni<<sh>> your little <<s>>lut." Sensing that your slave is getting too much enjoyment from $his beating, you cease. <</switch>> <</if>> -You stare at the naked form of your slave standing before you. +You stare at the naked figure standing before you. -<<if ($activeSlave.boobsTat == "rude words")>> - The words on $his chest stand out at you. You ask $him what $his tits say. "Fuck<<s>>lave," $he replies. You ask if that's what $he is. - <<if ($activeSlave.behavioralFlaw == "liberated")>> - "I'm nobody'<<s>> property. I'm a free $woman!" $he shoots back. "We shall see," you reply. - <<elseif ($activeSlave.devotion < -20)>> - $He does $his best to shake $his head. - <<else>> - "Yes <<Master>>, that'<<s>> what I am." - <</if>> -<<elseif ($activeSlave.boobsTat == "possessive")>> - The words on $his chest stand out at you. You ask $him what $his tits say. "It'<<s>> your per<<s>>onal <<s>>ymbol," $he replies. You ask if that's what $he is. - <<if ($activeSlave.behavioralFlaw == "liberated")>> - "I'm nobody'<<s>> property. I'm a free $woman!" $he shoots back. "We shall see," you reply. - <<elseif ($activeSlave.devotion < -20)>> - $He does $his best to shake $his head. - <<else>> - "Ye<<s>> <<Master>>, that'<<s>> what I am." - <</if>> -<<elseif ($activeSlave.boobsTat == "degradation")>> - The words on $his chest stand out at you. You ask $him what $his tits say. "<<Master>>'<<s>> Bitch," $he replies. You ask if that's what $he is. - <<if ($activeSlave.behavioralFlaw == "liberated")>> - "I'm nobody'<<s>> property. I'm a free $woman!" $he shoots back. "We shall see," you reply. - <<elseif ($activeSlave.devotion < -20)>> - $He does $his best to shake $his head. +<<if canSee($activeSlave)>> + <<if ($activeSlave.boobsTat == "rude words")>> + The words on $his chest stand out at you. You ask $him what $his tits say. "Fuck<<s>>lave," $he replies. You ask if that's what $he is. + <<if ($activeSlave.behavioralFlaw == "liberated")>> + "I'm nobody'<<s>> property. I'm a free $woman!" $he shoots back. "We shall see," you reply. + <<elseif ($activeSlave.devotion < -20)>> + $He does $his best to shake $his head. + <<else>> + "Yes <<Master>>, that'<<s>> what I am." + <</if>> + <<elseif ($activeSlave.boobsTat == "possessive")>> + The words on $his chest stand out at you. You ask $him what $his tits say. "It'<<s>> your per<<s>>onal <<s>>ymbol," $he replies. You ask if that's what $he is. + <<if ($activeSlave.behavioralFlaw == "liberated")>> + "I'm nobody'<<s>> property. I'm a free $woman!" $he shoots back. "We shall see," you reply. + <<elseif ($activeSlave.devotion < -20)>> + $He does $his best to shake $his head. + <<else>> + "Ye<<s>> <<Master>>, that'<<s>> what I am." + <</if>> + <<elseif ($activeSlave.boobsTat == "degradation")>> + The words on $his chest stand out at you. You ask $him what $his tits say. "<<Master>>'<<s>> Bitch," $he replies. You ask if that's what $he is. + <<if ($activeSlave.behavioralFlaw == "liberated")>> + "I'm nobody'<<s>> property. I'm a free $woman!" $he shoots back. "We shall see," you reply. + <<elseif ($activeSlave.devotion < -20)>> + $He does $his best to shake $his head. + <<else>> + "Ye<<s>> <<Master>>, that'<<s>> what I am." + <</if>> <<else>> - "Ye<<s>> <<Master>>, that'<<s>> what I am." + $His body belongs to you, and your slave needs to remember that. <</if>> <<else>> $His body belongs to you, and your slave needs to remember that. @@ -242,7 +250,7 @@ Now kneeling at your feet naked before you, your slave waits for $his Master's c <<if ($activeSlave.fetishStrength > 60)>> <<switch $activeSlave.fetish>> <<case "submissive">> - $He keeps $his eyes down and poises $his body to be fully available to $his master, trying to model for you the image of the perfect submissive. + $He keeps $his eyes down and poises $his body to be fully available to $his <<= WrittenMaster()>>, trying to model for you the image of the perfect submissive. <<case "dom">> Despite $his kneeling stature, $his back is straight and shoulders back. <<case "masochist">> @@ -250,7 +258,7 @@ Now kneeling at your feet naked before you, your slave waits for $his Master's c <<case "cumslut">> $he goes to $his knees, all the while staring at your <<if $PC.dick != 0>>manly bulge<<if $PC.vagina == 1>> and <</if>><<else>>feminine mound<</if>>. <<case "humiliation">> - $He eagerly takes to this humiliating position, hoping to demonstrate $his willingness to be degraded by $his <<Master>>. + $He eagerly takes to this humiliating position, hoping to demonstrate $his willingness to be degraded by $his <<= WrittenMaster()>>. <<case "buttslut">> $He positions $himself, sticking $his butt out as far as $he can manage, hoping to draw your attention to $his favorite area. <<case "boobs">> @@ -268,7 +276,7 @@ Now kneeling at your feet naked before you, your slave waits for $his Master's c <<elseif ($activeSlave.boobs <= 400)>> pathetic slave boobs <</if>> - for $his master. + for $his <<= WrittenMaster()>>. <<if ($activeSlave.lactation > 0)>> milk dribbles down the soft curves of $his chest as a further sign of $his arousal. <</if>> @@ -278,7 +286,7 @@ Now kneeling at your feet naked before you, your slave waits for $his Master's c <</switch>> <</if>> <</if>> -You give $him permission to speak, and tell $him that $he may beg $his Master. +You give $him permission to speak, and tell $him that $he may beg $his <<= WrittenMaster()>>. <<if ($activeSlave.devotion < -20)>> <<if ($activeSlave.fear < -50)>> @@ -308,7 +316,7 @@ You give $him permission to speak, and tell $him that $he may beg $his Master. <</if>> <</if>> This is clearly the best you are going to get out of $him until $he is better trained. You - <<if ($activeSlave.fear > -50)>> + <<if ($activeSlave.fear >= -50)>> signal your loyal slaves to lift $him to $his feet, and <</if>> send $him away for now. @@ -332,7 +340,7 @@ You give $him permission to speak, and tell $him that $he may beg $his Master. <</if>> <</if>> You tell your slave to rise to $his feet. Even though $he desired the impossible, it wasn't a total waste. You feel as though you have a pretty good understanding of where your slave stands. You send $him away with $his request denied, and you resolve to break $him more in the coming weeks. -<<elseif ($activeSlave.devotion < 60)>> +<<elseif ($activeSlave.devotion <= 60)>> Your slave looks at $his Master with obedient eyes. <<elseif ($activeSlave.devotion <= 100)>> Your devoted slave takes the begging position, @@ -417,7 +425,7 @@ You give $him permission to speak, and tell $him that $he may beg $his Master. <</if>> "I beg of you, <<Master>>, I need you to u<<s>>e my tit<<s>>. <<S>>uck them, <<s>>queeze them, fuck them, I cannot cum without you u<<s>>ing my <<s>>lave tit<<s>>! I am nothing more than a walking tit-carrier, and my only purpo<<s>>e i<<s>> to offer the<<s>>e brea<<s>>t<<s>> to you." <<case "pregnant">> - $He begins to caress $his womb "U<<s>>e me a<<s>> your breeder, <<Master>>, plea<<s>>e! I ju<<s>>t want to be filled with your <<s>>eed forever!" + $He begins to caress $his stomach, "U<<s>>e me a<<s>> your breeder, <<Master>>, plea<<s>>e! I ju<<s>>t want to be filled with your <<s>>eed forever!" <<default>> $He kneels with $his knees far spread, "use my fuckhole <<Master>>, I beg you. Plea<<s>>e, I need you to fuck me!" <</switch>> diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw index c81b7372efe3f6475c59c3ee40b51065d4a104e2..24e386519b23994ee52df11ab6b02b5d14634f06 100644 --- a/src/uncategorized/shops.tw +++ b/src/uncategorized/shops.tw @@ -56,7 +56,8 @@ This is a section of the promenade dedicated to Roman Revivalism. Since the forums are out on the arcology's plazas, there are fewer stores here. There are eateries, from which the sharp smell of //garum// is distinctly identifiable, but most of the space is occupied by hypocaust baths, which are free to enter but include various concession stands run by slaves. <span id="result"><<link "Clean yourself">><<replace "#result">>A good Roman trip to the baths serves to cleanse, but it's a social experience, too. After being oiled down by a skilled slave, you work out in the proper nude, and then have the oil and any dirt scraped off your skin with by another slave. Then you make your way across the heated floor through a set of baths of varying temperatures, ending in a large and egalitarian space where many naked citizens of the new Rome are sharing the news of the day. You're welcomed with surprise, but also with comradeship, and made to feel welcome.<</replace>><</link>></span> <<case "Aztec Revivalist">> - //I need content!// + dedicated to Aztec Revivalism. There are a variety of stores selling tools of worship ranging from bloodletting daggers to sacrificial altars, some even open for public use. Any blood spilt here flows to a shallow reflecting pool in the middle of the plaza. + <span id="result"><<link "Pay tribute">><<replace "#result">>You decide to pay tribute to the gods and draw your preferred tool for bloodletting. You run it across your hand and watch as your blood begins to flow. You let several drops fall into the pool before stemming the flow as a good feeling washes over you.<</replace>><</link>></span> <<case "Egyptian Revivalist">> dedicated to Egyptian Revivalism. There are a bewildering multiplicity of shops here; ancient Egypt is wonderfully fertile of linen fashion, fine jewelry, perfumes, incense, and other luxury goods. Beautiful warm-skinned slave<<= _girlU>>s of all races have wares in hand to offer citizens who pass by, and they seem well-treated. <span id="result"><<link "Shop around">><<replace "#result">>You decide to tour the shops; with so much fine merchandise on offer, it's possible that someone's selling something that even you haven't heard of, and it's always good to see and be seen. The slave sales<<= _girlU>>s are welcoming, and most are so well-trained that despite knowing who you are, they treat you with the same friendly courtesy that they offer everyone. They all offer you the peculiar straight-down curtsey that allows them to keep their necks straight, since they're all wearing gradually melting perfume cakes atop their hair, making them glisten with beguiling scent.<</replace>><</link>></span> @@ -85,6 +86,10 @@ This is a section of the promenade <<case "Hedonism">> dedicated to Hedonism. The establishments here are nearly all eateries, with a few sex shops and plus size clothing stores thrown in for good measure. Lovely smells fill the air, drawing your attention to the food vendors. Plump, cheerful slave<<= _girlU>>s are present outside most of them offering free samples of the food sold within. You can't help but sample as you browse the menus. <span id="result"><<link "Conduct a more thorough culinary inspection">><<replace "#result">>The eateries are very eager to have you seen enjoying their food, and go all out in their presentations. Plate after plate, vendor after vendor, you are treated to the best they can make and as much as you want, free of charge. You make sure to not go too crazy, but by the final restaurant, your clothing is definitely getting a little tight around your bloated belly. After a number of glowing reviews, you're left with making your way back home. Fortunately, your arcology features plenty of moving walkways and escalators, so you can relax as your infrastructure delivers you right back to your penthouse.<</replace>><</link>></span> +<<case "Intellectual Dependency">> +<<case "Slave Professionalism">> +<<case "Petite Admiration">> +<<case "Statuesque Glorification">> <<default>>ERROR: bad sector type <</switch>> <<if $sectors[$AS].type == "Shops">><<SectorSell>><</if>> @@ -148,6 +153,19 @@ This is a section of the promenade //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// <</if>> <</if>> + <<if $arcologies[0].FSIntellectualDependency != "unset">> + <<if $FSPromenade.IntellectualDependency == 0>> + <br> + [[Upgrade this sector to appeal to Intellectual Dependency establishments|Main][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $FSPromenade.IntellectualDependency = 1, $FSPromenade[_currentFSStyle] = 0, $sectors[$AS].type = "Intellectual Dependency"]] + //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// + <</if>> + <<elseif $arcologies[0].FSSlaveProfessionalism != "unset">> + <<if $FSPromenade.SlaveProfessionalism == 0>> + <br> + [[Upgrade this sector to appeal to Slave Professionalism establishments|Main][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $FSPromenade.SlaveProfessionalism = 1, $FSPromenade[_currentFSStyle] = 0, $sectors[$AS].type = "Slave Professionalism"]] + //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// + <</if>> + <</if>> <<if $arcologies[0].FSBodyPurist != "unset">> <<if $FSPromenade.BodyPurist == 0>> <br> @@ -174,6 +192,19 @@ This is a section of the promenade //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// <</if>> <</if>> + <<if $arcologies[0].FSPetiteAdmiration != "unset">> + <<if $FSPromenade.PetiteAdmiration == 0>> + <br> + [[Upgrade this sector to appeal to Petite Admiration establishments|Main][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $FSPromenade.PetiteAdmiration = 1, $FSPromenade[_currentFSStyle] = 0, $sectors[$AS].type = "Petite Admiration"]] + //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// + <</if>> + <<elseif $arcologies[0].FSStatuesqueGlorification != "unset">> + <<if $FSPromenade.StatuesqueGlorification == 0>> + <br> + [[Upgrade this sector to appeal to Statuesque Glorification establishments|Main][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $FSPromenade.StatuesqueGlorification = 1, $FSPromenade[_currentFSStyle] = 0, $sectors[$AS].type = "Statuesque Glorification"]] + //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// + <</if>> + <</if>> <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<if $FSPromenade.SlimnessEnthusiast == 0>> <br> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 74e2c162a706c1a9beeebf957ab5d67dac2c865c..63b71a5b282c16268b80e2514ca92b5376419d43 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -349,9 +349,7 @@ <</if>> <<if ($activeSlave.fetish != "mindbroken") && (($activeSlave.amp != 1) || ($activeSlave.voice != 0)) && $activeSlave.accent != 4>> | <<link "Ask $him about $his feelings">><<replace "#miniscene">><<include "FFeelings">><br> <</replace>><</link>> - <<if $cheatMode == 1>> - | <<link "Make $him beg">><<replace "#miniscene">><<include "FBeg">><br> <</replace>><</link>> - <</if>> + | <<link "Make $him beg">><<replace "#miniscene">><<include "FBeg">><br> <</replace>><</link>> <</if>> <<if $activeSlave.devotion >= 100 && $activeSlave.relationship < 0 && $activeSlave.relationship > -3>> | <<link "Talk to $him about relationships" "Matchmaking">><<set $subSlave = 0, $eventSlave = $activeSlave>><</link>>