From bc69effa9ce133e78620959a354706b7b7166d16 Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Tue, 4 Dec 2018 19:58:10 -0500 Subject: [PATCH] Some clean up --- src/events/gameover.tw | 2 +- src/uncategorized/BackwardsCompatibility.tw | 4 ++++ src/uncategorized/PESS.tw | 2 +- src/uncategorized/RESS.tw | 2 +- src/uncategorized/pBombing.tw | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/events/gameover.tw b/src/events/gameover.tw index 129cc1ed6c5..d9185bc80cc 100644 --- a/src/events/gameover.tw +++ b/src/events/gameover.tw @@ -4,7 +4,7 @@ <<set $ui = "start">> One fine day, you're strolling down the main promenade, making your usual combined inspection and public rounds. These walks are triply useful, since they allow you to keep a finger on the pulse of your demesne, identify any problems, and display yourself to the population. <br><br> - <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> suddenly relays a silent alarm, highlighting a scruffy individual <<if $showInches == 2>>sixty-six feet<<else>>twenty meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves. + <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> suddenly relays a silent alarm, highlighting a scruffy individual twenty <<if $showInches == 2>>yards<<else>>meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves. <br><br> The implanted bomb is small, and went off too far ahead to do anything more than stun. Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners. Without a bodyguard, decent security systems, or any other means of personal defense, you meet your ignominious death at the end of a bludgeon fashioned from a maintenance tool. diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 67b5b634cb2..f569837a059 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3513,6 +3513,10 @@ Setting missing slave variables: <</if>> <</for>> +<<if def _Slave.areoleaPiercing>> + <<run delete _Slave.areoleaPiercing>> +<</if>> + <<run SlaveDatatypeCleanup(_Slave)>> <<set $slaves[_bci] = _Slave>> diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw index ee0ba7a9ac2..c464b36b972 100644 --- a/src/uncategorized/PESS.tw +++ b/src/uncategorized/PESS.tw @@ -277,7 +277,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to <<link "Make $him the face of an ad campaign">> <<EventNameDelink $activeSlave>> <<replace "#result">> - You bring $him out to a pretty balcony and put her through an extended photo shoot. $He has no idea what you're planning, but $he's skilled enough not to need to. $He dons different outfits, changes makeup, and even shifts personas for the camera, producing hundreds of elegant, sensual and eye-catching images. You dismiss her back to the club when you're done, and $he clearly thinks little of it. The next day, however, you walk her out onto the club in the morning. When the two of you, <<= WrittenMaster()>> and DJ, reach the main club, $he stops short when $he catches sight of the main billboard screen. There $he is, resplendent and opulent, <<if $showInches == 2>>thirty-three feet<<else>>ten meters<</if>> tall, giving the viewer a sultry look. $He only breaks down for a single moment, but it's quite a moment: $he cries rather inelegantly, <<if canTalk($activeSlave)>><<say sobb>>ing "I love you <<Master>>" into your ear<</if>> before giving you a @@.hotpink;wet kiss.@@ Then $he runs over to stand under the screen, looking back at you to give you a @@.green;picture-perfect@@ imitation of the billboard $he's standing under before laughing at $himself a little. + You bring $him out to a pretty balcony and put her through an extended photo shoot. $He has no idea what you're planning, but $he's skilled enough not to need to. $He dons different outfits, changes makeup, and even shifts personas for the camera, producing hundreds of elegant, sensual and eye-catching images. You dismiss her back to the club when you're done, and $he clearly thinks little of it. The next day, however, you walk her out onto the club in the morning. When the two of you, <<= WrittenMaster()>> and DJ, reach the main club, $he stops short when $he catches sight of the main billboard screen. There $he is, resplendent and opulent, <<if $showInches == 2>>thirty feet<<else>>ten meters<</if>> tall, giving the viewer a sultry look. $He only breaks down for a single moment, but it's quite a moment: $he cries rather inelegantly, <<if canTalk($activeSlave)>><<say sobb>>ing "I love you <<Master>>" into your ear<</if>> before giving you a @@.hotpink;wet kiss.@@ Then $he runs over to stand under the screen, looking back at you to give you a @@.green;picture-perfect@@ imitation of the billboard $he's standing under before laughing at $himself a little. <<set $cash -= 1000>> <<set $rep += 500>> <<set $activeSlave.devotion += 4>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index d4dbbbfc7d6..75f25a034d6 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -3494,7 +3494,7 @@ wh-when I'm bad, e-everything, <<if $activeSlave.rudeTitle == 1>><<= PoliteRudeT In a fortuitous confluence of circumstances, <<EventNameLink $activeSlave>> happens to be polishing your office one evening. Keeping every surface in the penthouse at a state of perfect shine is one of your servants' endless tasks, and your office is $his area of responsibility today. At the key moment, $he's working on an area at waist height, directly next to the door that leads to your suite; and $he's crouching to polish this area most comfortably. $He is working diligently, and is paying close attention to what $he's doing. Meanwhile, and for completely unrelated reasons, you have just finished having fun inside said suite. You are naked, and your penis remains fully erect despite your having climaxed only moments before; you are in excellent physical and sexual condition and this happens frequently. You have decided to address a likewise unrelated matter in your office, and walk into it from your suite, naked and erect. <br><br> -This is how $activeSlave.slaveName comes face to face with your cock, unexpectedly, at a distance of about <<if $showInches == 2>>four inches<<else>>ten centimeters<</if>>. +This is how $activeSlave.slaveName comes face to face with your cock, unexpectedly, at a distance of only a few <<if $showInches == 2>>inches<<else>>centimeters<</if>>. <br><br> $He shrieks, backpedaling, and then falls backward, $his <<if $activeSlave.butt > 6>>monstrous bottom<<elseif $activeSlave.butt > 3>>healthy rear end<<else>>cute butt<</if>> hitting the floor with an audible whack. The light cloth $he was using to polish with went flying, and flutters to the ground accusingly. After scrabbling back a short distance, looking up at you hesitantly, and visibly recollecting $himself, $he swallows twice and then says, "I'm <<s>>orry, <<Master>>," in a tone of voice with a great deal of effort applied to keep it even. A frantic, embarrassed search for $his cloth ensues. Finding it at last, $he returns to $his original, low position, and crouch-walks back to the place $he was polishing, doing $his absolute best to look diligent and industrious and not at all aware that your cock is pointing at $him like a gun barrel. diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw index 5e6b5d20830..231ba43c5c4 100644 --- a/src/uncategorized/pBombing.tw +++ b/src/uncategorized/pBombing.tw @@ -5,7 +5,7 @@ One fine day, you're strolling down the main promenade, making your usual combined inspection and public rounds. These walks are triply useful, since they allow you to keep a finger on the pulse of your demesne, identify any problems, and display yourself to the population. <<if $Bodyguard != 0>>$Bodyguard.slaveName is walking with you, of course, her presence protection, intimidation, and ostentation, all in one.<</if>> -<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> suddenly relays a silent alarm, highlighting a scruffy individual <<if $showInches == 2>>sixty-six feet<<else>>twenty meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves. +<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> suddenly relays a silent alarm, highlighting a scruffy individual twenty <<if $showInches == 2>>yards<<else>>meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves. The implant is small, and went off too far ahead to do anything more than stun. <<if $Bodyguard != 0>>Since she was behind you, $Bodyguard.slaveName is in much better shape than you, her ears clear and her senses sharp. <</if>>Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners. @@ -41,7 +41,7 @@ The implant is small, and went off too far ahead to do anything more than stun. <<else>> drawing her machine pistol. She cradles the diminutive weapon in both hands and swivels from target to target, placing a disciplined burst of fire in each at its center of mass. <</if>> - None of them gets within <<if $showInches == 2>>sixteen feet<<else>>five meters<</if>>. $Bodyguard.slaveName dispassionately places a round in the head of each body, reloads, and takes up a position from which she can watch for further threats. There are none, and due to her sterling conduct there is @@.green;an increase in confidence in the security of $arcologies[0].name@@ and @@.green;public applause for your skill in training her.@@ There is some @@.red;minor damage@@ to repair, but no lasting harm. + None of them gets within five <<if $showInches == 2>>yards<<else>>meters<</if>>. $Bodyguard.slaveName dispassionately places a round in the head of each body, reloads, and takes up a position from which she can watch for further threats. There are none, and due to her sterling conduct there is @@.green;an increase in confidence in the security of $arcologies[0].name@@ and @@.green;public applause for your skill in training her.@@ There is some @@.red;minor damage@@ to repair, but no lasting harm. <<set $cash -= 1000>> <<set $rep += 500>> <<set $arcologies[0].prosperity += 1>> -- GitLab