From 9d04932ab90bdfef7ba937d74c4efe6159535f64 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 1 Sep 2017 04:00:37 -0400
Subject: [PATCH] name flipper update and more drug tinkering.
---
src/npc/acquisition.tw | 2 +-
src/pregmod/fMarry.tw | 18 ++----------------
src/uncategorized/longSlaveDescription.tw | 4 ++--
src/uncategorized/matchmaking.tw | 18 ++----------------
src/uncategorized/peConcubineInterview.tw | 8 +-------
src/uncategorized/rename.tw | 2 +-
src/uncategorized/saDrugs.tw | 6 +++---
src/utility/descriptionWidgetsFlesh.tw | 2 +-
src/utility/miscWidgets.tw | 10 +++++-----
9 files changed, 18 insertions(+), 52 deletions(-)
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index a6264657192..9e0c82f90b9 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -130,7 +130,7 @@ You arrive at your new arcology, $arcologies[0].name, and head straight to the p
<br><br>
//Congratulations. I am a personal assistant program, and it is my pleasure to assist you,
<<switch $PC.nationality>>
-<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $PC.surname>>$PC.surname <</if>>$PC.name,
<<default>>
$PC.name<<if $PC.surname>> $PC.surname<</if>>,
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index b27cc6ef470..5748b5bb499 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -564,23 +564,9 @@ You tell $activeSlave.slaveName that you're going to marry her. (A proposal, of
<<elseif $assistantAppearance == "schoolgirl">>
"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reationType == 0>>only starts when you push her head to your crotch<<elseif _reationType == 1>>eagerly complies<<elseif _reationType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
<<elseif $assistantAppearance == "angel">>
- "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join
- <<switch $PC.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- <<if $PC.surname>>$PC.surname <</if>>$PC.name
- <<default>>
- $PC.name<<if $PC.surname>> $PC.surname<</if>>
- <</switch>>
- in their bedroom and consummate this marriage." The slave <<if _reationType == 0>>stares blankly<<else>>looks confused<</if>>. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
+ "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join <<PlayerName>> in their bedroom and consummate this marriage." The slave <<if _reationType == 0>>stares blankly<<else>>looks confused<</if>>. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
<<elseif $assistantAppearance == "cherub">>
- "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of
- <<switch $PC.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- <<if $PC.surname>>$PC.surname <</if>>$PC.name's
- <<default>>
- $PC.name<<if $PC.surname>> $PC.surname<</if>>'s
- <</switch>>
- bedroom, of course." $assistantName hides her face in her hands at the thought.
+ "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<PlayerName>>'s bedroom, of course." $assistantName hides her face in her hands at the thought.
<<elseif $assistantAppearance == "incubus">>
"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reationType == 0>>only starts when you push her head to your crotch<<elseif _reationType == 1>>eagerly complies<<elseif _reationType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
<<elseif $assistantAppearance == "succubus">>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 0bc29a0653c..3dc8ccaf718 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -307,7 +307,7 @@ She comes to you for an inspection
$activeSlave.birthName.
<<else>>
<<switch $activeSlave.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
<<default>>
$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
@@ -327,7 +327,7 @@ She comes to you for an inspection
<<else>>
$activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>> is not its original name: it was once called
<<switch $activeSlave.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
<<default>>
$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 236ae3af90f..d6397eb6ad3 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -271,23 +271,9 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
<<elseif $assistantAppearance == "schoolgirl">>
"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
<<elseif $assistantAppearance == "angel">>
- "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join
- <<switch $PC.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- <<if $PC.surname>>$PC.surname <</if>>$PC.name
- <<default>>
- $PC.name<<if $PC.surname>> $PC.surname<</if>>
- <</switch>>
- in their bedroom and consummate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
+ "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join <<PlayerName>> in their bedroom and consummate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
<<elseif $assistantAppearance == "cherub">>
- "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of
- <<switch $PC.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- <<if $PC.surname>>$PC.surname <</if>>$PC.name's
- <<default>>
- $PC.name<<if $PC.surname>> $PC.surname<</if>>'s
- <</switch>>
- bedroom, of course." $assistantName hides her face in her hands at the thought.
+ "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<PlayerName>>'s bedroom, of course." $assistantName hides her face in her hands at the thought.
<<elseif $assistantAppearance == "incubus">>
"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
<<elseif $assistantAppearance == "succubus">>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index 7ac4dd0f48d..65f5bbce620 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -63,13 +63,7 @@ You receive an official communication from a popular talk show hosted in one of
<</if>>
They seat themselves in comfortable leather chairs and the interview begins in earnest.
<br>
- The host asks her some soft, nonjudgemental questions about her life and how she became your slave. Then he hits her: "So, $activeSlave.slaveName. Tell us about
- <<switch $PC.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- <<if $PC.surname>>$PC.surname <</if>>$PC.name."
- <<default>>
- $PC.name<<if $PC.surname>> $PC.surname<</if>>."
- <</switch>>
+ The host asks her some soft, nonjudgemental questions about her life and how she became your slave. Then he hits her: "So, $activeSlave.slaveName. Tell us about <<PlayerName>>."
<<if $activeSlave.devotion > 95>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
@@.green;Without a moment's hesitation,@@ she lisps, "I love <<if $PC.title != 0>>him. He'th tho handthome, and," she manages to blush prettily, "he'th tho good to me."<<else>>her. The'th tho pretty, and," she manages to blush cutely, "the'th tho good to me."<</if>>
diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw
index f71ee22274b..adf1fe5eddc 100644
--- a/src/uncategorized/rename.tw
+++ b/src/uncategorized/rename.tw
@@ -18,7 +18,7 @@
<<else>>
angrily tries to resist her new name, insisting that her name is
<<switch $activeSlave.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
<<default>>
$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index a4966ee6522..63f21f6e752 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -383,10 +383,10 @@
<</if>>
<<case "penis enhancement" "intensive penis enhancement">>
- <<set _growth = 60+($injectionUpgrade*20)>>
+ <<set _growth = 60-($injectionUpgrade*10)>>
<<if _intensive>><<set _growth -= 20>><</if>>
<<if ($slaves[$i].dick > 0)>>
- <<if (random(1,100) > _growth-($slaves[$i].dick*5))>>
+ <<if (random(1,100) > _growth+($slaves[$i].dick*5))>>
@@.lime;$possessiveCap cock grows painfully,@@ becoming both longer and girthier.
<<set $slaves[$i].dick++>>
<<else>>
@@ -440,7 +440,7 @@
<<else>>
<<set _growth = 60+($injectionUpgrade*20)>>
<<if _intensive>><<set _growth -= 20>><</if>>
- <<if (random(1,100) > _growth-($slaves[$i].balls*5))>>
+ <<if (random(1,100) > _growth+($slaves[$i].balls*5))>>
@@.lime;$possessiveCap balls swell painfully.@@
<<set $slaves[$i].balls++>>
<<else>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index d4df63a4681..b581eed847c 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -5973,7 +5973,7 @@ $pronounCap has
<<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.pregSource; })>>
<<if _lsd != -1>>
<<switch $slaves[_lsd].nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $slaves[_lsd].slaveSurname>><<set _daddy = $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveName>><<else>><<set _daddy = $slaves[_lsd].slaveName>><</if>>
<<default>>
<<set _daddy = $slaves[_lsd].slaveName>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 75554d4053c..459a88a7770 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -602,7 +602,7 @@
<<switch $PC.nationality>>
-<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $PC.surname>><<set $PCTitle = $PC.surname>><<set $PCTitle += " " + $PC.name>><<else>><<set $PCTitle = $PC.name>><</if>>
<<default>>
<<set $PCTitle = $PC.name>>
@@ -2725,9 +2725,9 @@ This experience
<</widget>>
/* see how they are on a single line? This permits "."s and other things to be appended directly onto the widget result */
-<<widget "PlayerName">><<switch $PC.nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><</widget>>
+<<widget "PlayerName">><<switch $PC.nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><</widget>>
-<<widget "SlaveFullName">><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><</widget>>
+<<widget "SlaveFullName">><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><</widget>>
<<widget "PoliteRudeTitle">><<switch $args[0].nationality>><<case "Japanese">><<if $args[0].trust > 0>>$PC.name<<if $PC.title > 0>>kun<<else>>chan<</if>><<else>><<if $PC.surname>><<print $PC.surname>><<else>><<print $PC.name>><<s>>an<</if>><</if>><<default>><<if $args[0].intelligence < -2>><<Master>><<elseif $args[0].intelligence > 1>><<if $PC.title > 0>>Ma<<s>>ther<<else>>Mi<<s>>tre<<ss>><</if>><<elseif $args[0].trust > 0>>$PC.name<<else>><<if $PC.surname>>$PC.surname<<else>>$PC.name<</if>><</if>><</switch>><</widget>>
@@ -2737,7 +2737,7 @@ This experience
*/
<<widget "EventNameLink">>
<<switch $args[0].nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>>
<<default>>
<<set _name = $args[0].slaveName>>
@@ -2745,7 +2745,7 @@ This experience
<</switch>>
/*
<<switch $activeSlave.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
<<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname + " " + $args[0].slaveName>><</if>>
<<default>>
<<if $args[0].slaveSurname>><<set _name = $args[0].slaveName + " " + $args[0].slaveSurname>><</if>>
--
GitLab