From 0a0e4479ab91818174949f7c31ea4573207727e5 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 19 Apr 2018 02:54:46 -0400 Subject: [PATCH] fixes and FCTV show addition --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 10 +++++++ src/npc/removeActiveSlave.tw | 2 +- src/pregmod/seFCTVshows.tw | 30 +++++++++++++++++++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 9d3f6341613..7fbd5529ef3 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,8 +2,18 @@ 0.10.7.1-0.1.x +4/19/2018 + + 61 + -fixes + -code optimizations + -channel13's FCTV channel addition + 4/18/2018 + 60 + -fixes and more code optimizations + 59.1 -accidentally made HGs even more likely to become doms, that has been fixed now diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw index 2183e06c3a8..ea3dd932931 100644 --- a/src/npc/removeActiveSlave.tw +++ b/src/npc/removeActiveSlave.tw @@ -26,7 +26,7 @@ <</if>> <<if _x >= 0 && _x < _SL>> - <<if $incubator > 0 && $activeSlave.daughters > 0>> + <<if $incubator > 0>> <<for _z = 0; _z < $tanks.length; _z++>> <<if _ID == $tanks[_z].mother>> <<set $tanks[_z].mother = $missingParentID>> diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw index 688aafeea54..0708d813d0e 100644 --- a/src/pregmod/seFCTVshows.tw +++ b/src/pregmod/seFCTVshows.tw @@ -769,7 +769,7 @@ The offered price is <<print cashFormat($slaveCost)>>. <<case 13>> <<set $lastShow = 13, $showThirteen++>> - <<if $showThirteen == 3>><<set $showThirteen = 1>><</if>> + <<if $showThirteen == 4>><<set $showThirteen = 1>><</if>> /* $showThirteen is the number of times the channel has been viewed. This will be your chapter count, more or less. */ <<if $showThirteen == 1>> The random function has skipped straight to the middle of a "real life" documentary. @@ -854,6 +854,34 @@ The offered price is <<print cashFormat($slaveCost)>>. "Are you going to go and protect people, Dad?" A pained grimace crosses over his face as he locks eyes with the nurse who has a very similar expression. After a long moment he turns back with the most genuine smile a father can muster and says, "I sure am, kiddo. I sure am," before turning again to leave. "Good luck." + <<elseif $showThirteen == 3>> + The random function seems to have selected a program about the nuances of slave life. + <<br><br> + The screen fades in with a a fly-through shot of what is undoubtedly an arcology penthouse littered with slaves accompanied by a somewhat upbeat piano melody. You recognize many of the traditional additions to a penthouse, though there are some stylistic differences. After a short time the show identifies itself as “The Other Hand†before fading out. + <<br><br> + The show returns after a brief moment to a shot of a penthouse slave cafeteria that is absolutely filled with slaves. Most are nude but there are a few in maid's uniforms that look to be the current shift of house servants. The low murmur of slaves talking can be heard as a man's voice starts narrating over it. + <<br><br> + “Like any human, slaves require interaction to maintain a healthy mental state. It is well known that this need can be manipulated to drive even the most rebellious slaves into subservience. It is also known that, like in any environment where the same humans interact with each other over extended periods, slaves will form relationships with other slaves, from the most intense of hatred to the most romantic of relationships.†+ <<br><br> + The scene shifts to the entrance of a very well decorated brothel lower in the arcology where clearly well cared for slaves are attracting the attention of passersby by showing off their skills in various intimate ways. + <<br><br> + “While it may be difficult to effectively prevent rivalries from forming, some slave owners do mandate against certain positive relationships for any number of reasons. From a desire to seed fear among slaves and prevent them from having a source of solace to a belief that their slaves should be devoted only to their owner.†+ <<br><br> + Again, the scene changes to a view just inside the entrance of what looks to be the servants’ quarters. Slaves in conservative maid's uniforms bustle about, but there are a few knots of slaves talking amongst themselves dotted around. + <<br><br> + “However, here in the arcology Open Skies, the owner, Charles Greenwich, has no such desires and has stated that he greatly enjoys watching the various relationships between slaves rise and fall and encourages such things within his chattel.†+ <<br><br> + The scene switches to a surprisingly short, middle-aged man in an outfit reminiscent of the old American West. He's seated in front of the camera with a particular energy and warmth sparkling in his eyes. He speaks, answering a question you didn't hear, “Why, I didn't get where I am now by mistreating my property. Even cows develop friendships, even having best friends. I've seen a cow turn into an inconsolable wreck just because his friend caught ill and had to be put down.†+ <<br><br> + “Now, that seems like a flaw, don't it? Why let your slaves have the chance of basically losing two when one goes? But believe me when I say you don't want over a hundred and fifty slaves resenting you for not letting them make friendly-like. Not that I'd want to or nothing. They're all dear to me and I want them happy. That's when the best work gets done.†+ <<br><br> + “Now, I'm sure you're vying to ask why I don't do nothin’ about the rivalries that crop up. That's ‘cuz it's a right pain in the ass to fix. You have to sit both parties down and make them talk their problems out. I will admit that I do like seeing it happen some too. It's like high school drama but I get to see it all unfold.†+ <<br><br> + The shot switches to the inside of a comparatively sparsely populated spa. The gentle splash of water is interspersed with some shots of laughter and bits of louder conversion from the lounging slaves. + <<br><br> + The narrator begins speaking again, “the fact of the matter is that a happy slave is a healthy slave, and allowing a slave to have friends is one of the more simple ways to achieve that.†+ <<br><br> + With that, the credits roll, listing a string of names and titles that completely fail to keep your attention further. <</if>> <<case 14>> -- GitLab