From 8af5a7a301d31e439da0916720f6e10cd36d87e7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 1 Jul 2018 21:29:26 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 13 ++++++++
devNotes/twine JS.txt | 2 +-
src/js/rulesAssistantOptions.tw | 2 +-
src/uncategorized/prestigiousSlave.tw | 6 ++--
src/uncategorized/reNickname.tw | 2 +-
src/utility/extendedFamilyWidgets.tw | 34 +++++++++++---------
6 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c2fbca8c706..fe713ae13dd 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,19 @@
0.10.7.1-0.4.x
+7/01/2018
+
+ 13
+ -fixes
+ -cleaned up brother/sister text
+ -prestigious slave overhaul
+
+ 12
+ -fixes and updates to the RA
+ -The rival is more likely to take a hostage now
+ -fixed bugs and typos
+ -made slave rivals a little less rapey if slaves aren't allowed to rape each other
+
6/30/2018
11
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index c9fed88557d..3a6d774672f 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -13766,7 +13766,7 @@ window.rulesAssistantOptions = (function() {
["Permissive", "permissive"],
["Sapphic", "sapphic"],
["Masturbation", "masturbation"],
- ["Restritive", "restrictive"]
+ ["Restrictive", "restrictive"]
];
super("Release rules", pairs);
this.setValue(current_rule.set.releaseRules);
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 3a503be0878..048d6d3d989 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -1777,7 +1777,7 @@ window.rulesAssistantOptions = (function() {
["Permissive", "permissive"],
["Sapphic", "sapphic"],
["Masturbation", "masturbation"],
- ["Restritive", "restrictive"]
+ ["Restrictive", "restrictive"]
];
super("Release rules", pairs);
this.setValue(current_rule.set.releaseRules);
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 4932160194e..c15aee6d65f 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -1,9 +1,7 @@
:: Prestigious Slave [nobr]
-<<set $nextButton = "Back">>
-<<set $nextLink = "Buy Slaves">>
-<<set $returnTo = "Buy Slaves">>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves">>
+<<set $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
You check to see if any especially prestigious slaves are on auction. <<if $prestigeAuctioned == 1>>There are none available right now, but there probably will be next week.<<else>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index aa2daa34258..73c2e056631 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -993,7 +993,7 @@
<<case "mark">>
<<set $nickname = either("'Ass Kisser'", "'Breeder'", "'Chosen'", "'Connections'", "'Favors'", "'Mark'", "'Marked'", "'Special'")>>
- <<set $situationDesc = "an Elite Breeder. She has permanently been marked as the mother of societies children. If she isn't currently swelling with life, she will be soon. However, she is also granted special benefits befitting the mother of future generations of gifted children.">>
+ <<set $situationDesc = "is an Elite Breeder. She has permanently been marked as the mother of societies children. If she isn't currently swelling with life, she will be soon. However, she is also granted special benefits befitting the mother of future generations of gifted children.">>
<<set $applyDesc = "takes pride in her new nickname and the bond it displays between her and her sire. She has to make sure that it doesn't go to her head, though.">>
<<set $notApplyDesc = "understands that she is expected to obey and fuck just like any of your other slaves, regardless of her status as a breeder.">>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 2e37686f41f..f1eb9dd3018 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -723,16 +723,17 @@
<</if>>
<</for>>
<<if $children.length > 2>>
- <br>You are @@.lightgreen;sisters with
+ <br>@@.lightgreen;
<<for $j = 0; $j < $children.length; $j++>>
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
- and $children[$j].slaveName.@@
+ and $children[$j].slaveName
<</if>>
- <</for>>
+ <</for>>@@
+ are your sisters.
<<elseif $children.length > 1>>
- <br>You are sisters with @@.lightgreen;$children[0].slaveName and $children[1].slaveName.@@
+ <br>@@.lightgreen;$children[0].slaveName and $children[1].slaveName@@ are your sisters.
<<elseif $children.length > 0>>
<br>Your sister is @@.lightgreen;$children[0].slaveName.@@
<</if>>
@@ -749,16 +750,17 @@
<</if>>
<</for>>
<<if $children.length > 2>>
- <br>You are @@.lightgreen;brothers with
+ <br>@@.lightgreen;
<<for $j = 0; $j < $children.length; $j++>>
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
- and $children[$j].slaveName.@@
+ and $children[$j].slaveName
<</if>>
- <</for>>
+ <</for>>@@
+ are your brothers.
<<elseif $children.length > 1>>
- <br>You are brothers with @@.lightgreen;$children[0].slaveName and $children[1].slaveName.@@
+ <br>@@.lightgreen;$children[0].slaveName and $children[1].slaveName@@ are your brothers.
<<elseif $children.length > 0>>
<br>Your brother is @@.lightgreen;$children[0].slaveName.@@
<</if>>
@@ -775,16 +777,17 @@
<</if>>
<</for>>
<<if $children.length > 2>>
- <br>You are half-sisters with @@.lightgreen;
+ <br>@@.lightgreen;
<<for $j = 0; $j < $children.length; $j++>>
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
and $children[$j].slaveName@@.
<</if>>
- <</for>>
+ <</for>>@@
+ are your half-sisters.
<<elseif $children.length > 1>>
- <br>You are half-sisters with @@.lightgreen;$children[0].slaveName and $children[1].slaveName.@@
+ <br>@@.lightgreen;$children[0].slaveName and $children[1].slaveName@@ are your half-sisters.
<<elseif $children.length > 0>>
<br>You have one half-sister, @@.lightgreen;$children[0].slaveName.@@
<</if>>
@@ -801,16 +804,17 @@
<</if>>
<</for>>
<<if $children.length > 2>>
- <br>You are half-brothers with @@.lightgreen;
+ <br>@@.lightgreen;
<<for $j = 0; $j < $children.length; $j++>>
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
- and $children[$j].slaveName.@@
+ and $children[$j].slaveName.
<</if>>
- <</for>>
+ <</for>>@@
+ are your half-brothers.
<<elseif $children.length > 1>>
- <br>You are half-brothers with @@.lightgreen;$children[0].slaveName and $children[1].slaveName.@@
+ <br>@@.lightgreen;$children[0].slaveName and $children[1].slaveName@@ are your half-brothers.
<<elseif $children.length > 0>>
<br>You have one half-brother, @@.lightgreen;$children[0].slaveName.@@
<</if>>
--
GitLab