From d4c49295f54e7da3e41649a617297f72b5897b73 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 24 Apr 2018 21:57:08 -0500
Subject: [PATCH] Jiggle Fix
---
src/init/storyInit.tw | 6 +-
src/uncategorized/reNickname.tw | 16 ++--
src/utility/descriptionWidgetsFlesh.tw | 128 ++++++++++++-------------
src/utility/descriptionWidgetsStyle.tw | 18 ++--
4 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 738a34c6ee2..3e3b9b943b3 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -3,13 +3,13 @@
/*
FREE CITIES
a text-based slave management game
-Copyright (C) 2017 freecitiesdev
+Copyright (C) 2017 freecitiesdev
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
<<set $returnTo = "init", $nextButton = "Continue", $nextLink = "Alpha disclaimer">>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 04b7cec401a..f727dcf841c 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -595,7 +595,7 @@
<<case "Somali">>
<<set $nickname = either("'Black Hawk Down'", "'Mogadishu'", "'Skinnie'", "'Somali'", "'Somalian'", "'The Captain Now'")>>
<<case "South African">>
- <<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Boer'", "'Cape Town'", "'Johannesburg'", "'Mandela'", "'Saffer'", "'Shaka'", "'South African'", "'Springbok'")>>
+ <<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Boer'", "'Cape Town'", "'Johannesburg'", "'Mandela'", "'Saffer'", "'Shaka'", "'South African'", "'Springbok'", "'Vuvuzela'")>>
<<case "South Sudanese">>
<<set $nickname = either("'Anyanya'", "'Juba'", "'Nilotic'", "'Nuba'", "'South Sudanese'", "'Sudd'")>>
<<case "Spanish">>
@@ -661,13 +661,13 @@
<<case "Zambian">>
<<set $nickname = either("'Livingstone'", "'Lusaka'", "'Victoria Falls'", "'Zambian'")>>
<<case "Zimbabwean">>
- <<if $activeSlave.race == "white">>
- <<set $nickname = either("'Altena'", "'Bush War'", "'Rhodesian'", "'Rhodie'", "'Salisbury'", "'Zimbabwean'")>>
- <<else>>
- <<set $nickname = either("'Bobojan'", "'Chimurenga'", "'Grimmy'", "'Harare'", "'Kaffir'", "'Mugabe'", "'Mujiba'", "'Nyombie'", "'Zimbabwean'", "'Zimbo'")>>
- <</if>>
+ <<if $activeSlave.race == "white">>
+ <<set $nickname = either("'Altena'", "'Bush War'", "'Rhodesian'", "'Rhodie'", "'Salisbury'", "'Zimbabwean'")>>
+ <<else>>
+ <<set $nickname = either("'Bobojan'", "'Chimurenga'", "'Grimmy'", "'Harare'", "'Kaffir'", "'Mugabe'", "'Mujiba'", "'Nyombie'", "'Zimbabwean'", "'Zimbo'")>>
+ <</if>>
<<default>>
- <<set $nickname = either("'International'", "'Nomad'", "'Refugee'", "'Stateless'")>>
+ <<set $nickname = either("'International'", "'Nomad'", "'Refugee'", "'Stateless'", "'Wanderer'")>>
<</switch>>
<<set $situationDesc = "is $activeSlave.nationality. The slave trade is truly international, and no nation is unrepresented among the masses of sex slaves passed from hand to hand like the chattel they are. Most of the old nations are struggling, and even those still in great shape often find their citizens emigrating to the Free Cities. Some of these émigrés do well, and others become human livestock.">>
<<set $applyDesc = "is a little proud of her national nickname, as a reminder of who she was and a mark that she still has an identity.">>
@@ -693,7 +693,7 @@
<<case "black">>
<<set $nickname = either("'African'", "'B-Girl'", "'Black'", "'Blackie'", "'Bottom Bitch'", "'Cocoa'", "'Coon'", "'Cotton'", "'Dark'", "'Ebony'", "'Gangsta'", "'His Girl Friday'", "'House Slave'", "'Jungle Bunny'", "'Jungle Fever'", "'Mammy'", "'Miss'", "'Missie'", "'Mulatto'", "'N-Word'", "'Negro'", "'Negroid'", "'Nigga'", "'Nigger'", "'Porch Monkey'", "'Quadroon'", "'Sambo'", "'Sheboon'", "'Spade'", "'Spook'")>>
- <<set $situationDesc = "is black, which is not uncommon given the urban collapse afflicting the first world and the wars raging in Africa. Slaves casually reference race as much as free citizens. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
+ <<set $situationDesc = "is black, which is not uncommon given the urban collapse afflicting the first world and the wars raging in Africa. Slaves casually reference race as much as free citizens. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 3f902873c79..4aba5146b08 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -9058,7 +9058,7 @@ $pronounCap has
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
$activeSlave.slaveName's monokini overs less than half of $possessive jiggling <<print $activeSlave.inflationType>>-filled belly.
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's monokini overs less than half of $possessive jiggling implant-filled belly.
+ $activeSlave.slaveName's monokini overs less than half of $possessive implant-filled belly.
<<else>>
$activeSlave.slaveName's monokini shows off every kick and movement within $possessive big pregnant belly. The swimsuit has been pushed down to just above $possessive popped navel.
<</if>>
@@ -9068,7 +9068,7 @@ $pronounCap has
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
$activeSlave.slaveName's monokini overs only half of $possessive jiggling <<print $activeSlave.inflationType>>-filled belly.
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's monokini overs only half of $possessive jiggling implant-filled belly.
+ $activeSlave.slaveName's monokini overs only half of $possessive implant-filled belly.
<<else>>
$activeSlave.slaveName's monokini overs only half of $possessive pregnant belly.
<</if>>
@@ -11173,9 +11173,9 @@ $pronounCap has
<<else>>
She almost gleams; she's in the absolute @@.green;best of health,@@
<</if>>
-and
+ and
<<set $seed = $activeSlave.actualAge + 1>>
-she's
+ she's
<<if $activeSlave.birthWeek >= 52 && $seeAge == 1>>
going to turn $seed this week,
<<elseif $activeSlave.actualAge < 3>>
@@ -11222,11 +11222,11 @@ she's
<<elseif $activeSlave.actualAge < 18>>
young, fresh, and nearly 18<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>her birthday is next week<<if $seeAge == 1>> and people are already beginning to eye her<</if>><<else>>her birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
<<elseif $activeSlave.actualAge < 19>>
- <<if $activeSlave.birthWeek == 0 && $seeAge == 1>>
+ <<if $activeSlave.birthWeek == 0 && $seeAge == 1>>
just turned $activeSlave.actualAge this week, which many citizens find especially appealing.
- <<elseif $activeSlave.birthWeek < 4 && $seeAge == 1>>
+ <<elseif $activeSlave.birthWeek < 4 && $seeAge == 1>>
only turned $activeSlave.actualAge this month.
- <<else>>
+ <<else>>
$activeSlave.actualAge years old<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>her birthday is next week<<else>>her birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
<</if>>
<<elseif $activeSlave.actualAge < 20>>
@@ -11501,21 +11501,21 @@ she's
<<widget "amputeeDescription">>
<<if $activeSlave.amp != 0>>
- <<if $activeSlave.amp == -1>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with a set of modern prosthetic limbs that allow her a fairly normal life.
- <<elseif $activeSlave.amp == -2>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with P-Limbs customized for sex. Her fingertips vibrate, her finger joints are masked to prevent pinching, and her hands can dispense lube.
- <<elseif $activeSlave.amp == -3>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with P-Limbs customized to look natural. Their covering looks like living $activeSlave.skin skin, and their servos are noise damped.
- <<elseif $activeSlave.amp == -4>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with P-Limbs customized for combat. They're hardened, strengthened, and more responsive, and they conceal taser knuckles and extensible forearm blades.
- <<elseif $activeSlave.amp == -5>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with advanced cybernetic P-Limbs. The ultimate fusion of combat effectiveness and instruments of pleasure, they're capable of performing multiple functions. They can enhance sex through her vibrating hands and increase her combat skills with hardened, yet flexible artificial muscles. They have an advanced artificial skin that can send electrical impulses that can cause stimulation or extreme pain.
- <<elseif $activeSlave.fuckdoll > 0>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ making her a convenient torso-only sex toy.
- <<else>>
- The most obvious thing about $activeSlave.slaveName is that she is a @@.pink;quadruple amputee@@: she has neither arms nor legs.
- <</if>>
+ <<if $activeSlave.amp == -1>>
+ $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with a set of modern prosthetic limbs that allow her a fairly normal life.
+ <<elseif $activeSlave.amp == -2>>
+ $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with P-Limbs customized for sex. Her fingertips vibrate, her finger joints are masked to prevent pinching, and her hands can dispense lube.
+ <<elseif $activeSlave.amp == -3>>
+ $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with P-Limbs customized to look natural. Their covering looks like living $activeSlave.skin skin, and their servos are noise damped.
+ <<elseif $activeSlave.amp == -4>>
+ $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with P-Limbs customized for combat. They're hardened, strengthened, and more responsive, and they conceal taser knuckles and extensible forearm blades.
+ <<elseif $activeSlave.amp == -5>>
+ $activeSlave.slaveName is a @@.pink;quadruple amputee@@, but she's equipped with advanced cybernetic P-Limbs. The ultimate fusion of combat effectiveness and instruments of pleasure, they're capable of performing multiple functions. They can enhance sex through her vibrating hands and increase her combat skills with hardened, yet flexible artificial muscles. They have an advanced artificial skin that can send electrical impulses that can cause stimulation or extreme pain.
+ <<elseif $activeSlave.fuckdoll > 0>>
+ $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ making her a convenient torso-only sex toy.
+ <<else>>
+ The most obvious thing about $activeSlave.slaveName is that she is a @@.pink;quadruple amputee@@: she has neither arms nor legs.
+ <</if>>
<</if>>
<</widget>>
@@ -12869,15 +12869,15 @@ she's
<<if $activeSlave.physicalAge >= 13>>
<<if $activeSlave.bellyImplant >= 31000>>
<<if canWalk($activeSlave)>>
- $possessiveCap middle is so massive that it is difficult for $object to move.
- <<if $activeSlave.muscles > 95>>
- However, $pronoun is so powerfully built that $pronoun can manage it with effort, using $possessive arms to support it.
- <<elseif $activeSlave.muscles > 30>>
- $pronounCap can barely manage to get to $possessive feet unaided, and usually walks with $possessive arms under $possessive belly to help take its weight.
- <<elseif $activeSlave.muscles > 5>>
- $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight.
- <<else>>
- $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
+ $possessiveCap middle is so massive that it is difficult for $object to move.
+ <<if $activeSlave.muscles > 95>>
+ However, $pronoun is so powerfully built that $pronoun can manage it with effort, using $possessive arms to support it.
+ <<elseif $activeSlave.muscles > 30>>
+ $pronounCap can barely manage to get to $possessive feet unaided, and usually walks with $possessive arms under $possessive belly to help take its weight.
+ <<elseif $activeSlave.muscles > 5>>
+ $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight.
+ <<else>>
+ $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
<</if>>
<<elseif tooBigBelly($activeSlave)>>
It is easily as large as $possessive torso, making $object at least half belly.
@@ -12885,31 +12885,31 @@ she's
It is easily as large as $possessive torso, making $object at least half belly.
<</if>>
<<if $activeSlave.bellyImplant >= 16000>>
- <<if $pregAccessibility == 1>>
- Fortunately for $possessive, the penthouse is adapted for daily life with a belly
- <<else>>
- $pronounCap has trouble living in your penthouse, which is not designed for girls with bellies
- <</if>>
- wider than a standard doorway.
+ <<if $pregAccessibility == 1>>
+ Fortunately for $possessive, the penthouse is adapted for daily life with a belly
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with bellies
+ <</if>>
+ wider than a standard doorway.
<</if>>
<</if>>
<<elseif $activeSlave.physicalAge >= 4>>
<<if $activeSlave.bellyImplant >= 14000>>
<<if canWalk($activeSlave)>>
- $possessiveCap middle is so massive that it is difficult for $object to move.
- <<if $activeSlave.muscles > 95>>
- However, $pronoun is so powerfully built that $pronoun can manage it with effort, using $possessive arms to support it.
- <<elseif $activeSlave.muscles > 30>>
- $pronounCap can barely manage to get to $possessive feet unaided, and usually walks with $possessive arms under $possessive belly to help take its weight.
- <<elseif $activeSlave.muscles > 5>>
- $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight.
- <<else>>
- $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
- <</if>>
+ $possessiveCap middle is so massive that it is difficult for $object to move.
+ <<if $activeSlave.muscles > 95>>
+ However, $pronoun is so powerfully built that $pronoun can manage it with effort, using $possessive arms to support it.
+ <<elseif $activeSlave.muscles > 30>>
+ $pronounCap can barely manage to get to $possessive feet unaided, and usually walks with $possessive arms under $possessive belly to help take its weight.
+ <<elseif $activeSlave.muscles > 5>>
+ $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight.
+ <<else>>
+ $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
+ <</if>>
<<elseif tooBigBelly($activeSlave)>>
It is easily bigger than $pronoun is, making $object mostly belly.
<<else>>
- It is easily as large as $possessive torso, making $object at least half belly.
+ It is easily as large as $possessive torso, making $object at least half belly.
<</if>>
<<if $activeSlave.bellyImplant >= 16000>>
<<if $pregAccessibility == 1>>
@@ -12997,35 +12997,35 @@ she's
and $possessive massive, drum-taut belly dominates $possessive frame.
<</if>>
<<elseif $activeSlave.inflation == 2>>
- $pronounCap is greatly distended with <<print $activeSlave.inflationType>>,
- <<if $activeSlave.physicalAge <= 3>>
+ $pronounCap is greatly distended with <<print $activeSlave.inflationType>>,
+ <<if $activeSlave.physicalAge <= 3>>
and $possessive swollen belly is nearly as big as $possessive toddlerish body.
- <<elseif $activeSlave.physicalAge <= 12>>
+ <<elseif $activeSlave.physicalAge <= 12>>
and $possessive swollen belly dominates $possessive poor little frame.
- <<elseif $activeSlave.height >= 185>>
+ <<elseif $activeSlave.height >= 185>>
but $possessive tall frame bears $possessive swollen belly well.
- <<elseif $activeSlave.height < 150>>
+ <<elseif $activeSlave.height < 150>>
and $possessive swollen belly dominates $possessive poor little frame.
- <<elseif $activeSlave.muscles > 30>>
+ <<elseif $activeSlave.muscles > 30>>
and $possessive fit body bears $possessive swollen belly well.
- <<else>>
+ <<else>>
and $possessive swollen belly dominates $possessive frame.
- <</if>>
+ <</if>>
<<elseif $activeSlave.inflation == 1>>
- $pronounCap is visibly swollen with <<print $activeSlave.inflationType>>,
- <<if $activeSlave.physicalAge <= 3>>
+ $pronounCap is visibly swollen with <<print $activeSlave.inflationType>>,
+ <<if $activeSlave.physicalAge <= 3>>
and $possessive sloshing belly looks obscene on $possessive toddlerish body.
- <<elseif $activeSlave.physicalAge <= 10>>
+ <<elseif $activeSlave.physicalAge <= 10>>
and $possessive sloshing belly looks huge on $possessive tiny frame.
- <<elseif $activeSlave.weight > 10>>
+ <<elseif $activeSlave.weight > 10>>
but $pronoun's sufficiently overweight that it's not obvious.
- <<elseif $activeSlave.height < 150>>
+ <<elseif $activeSlave.height < 150>>
and $possessive sloshing belly looks huge on $possessive tiny frame.
- <<elseif $activeSlave.weight <= -10>>
+ <<elseif $activeSlave.weight <= -10>>
$possessive thin form making $possessive sloshing belly very obvious.
- <<else>>
+ <<else>>
giving $possessive stomach a distinct curvature.
- <</if>>
+ <</if>>
<</if>>
<<if ($showClothing == 1) && ($saleDescription == 0)>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 57c3535b60a..65dc4e152ea 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -2379,17 +2379,17 @@ $possessiveCap
<</if>>
<<else>>
<<if $activeSlave.eyes > -1>>
- <<if $activeSlave.eyewear == "blurring contacts">>
- She's wearing contacts designed to blur her vision, making her clumsy.
- <</if>>
+ <<if $activeSlave.eyewear == "blurring contacts">>
+ She's wearing contacts designed to blur her vision, making her clumsy.
+ <</if>>
<<elseif $activeSlave.eyes == -1>>
- <<if $activeSlave.eyewear == "corrective contacts">>
- She's wearing contact lenses to correct her @@.yellow;nearsightedness@@.
- <<else>>
- She's @@.yellow;nearsighted@@, and a bit clumsy as a result.
- <</if>>
+ <<if $activeSlave.eyewear == "corrective contacts">>
+ She's wearing contact lenses to correct her @@.yellow;nearsightedness@@.
+ <<else>>
+ She's @@.yellow;nearsighted@@, and a bit clumsy as a result.
+ <</if>>
<<elseif $activeSlave.eyes < -1>>
- She is @@.red;blind@@, and moves very carefully as a result.
+ She is @@.red;blind@@, and moves very carefully as a result.
<</if>>
<</if>> /* CLOSES EYEWEAR */
<<else>>
--
GitLab