From bd4cedcc7c2e001e242e7d5c28140647664bcc02 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 20 Jun 2018 11:38:12 -0400
Subject: [PATCH] fixes and tweaks
---
devNotes/twine JS | 6 ++++--
src/js/rulesAssistant.tw | 6 ++++--
src/uncategorized/neighborsDevelopment.tw | 18 +++++++++---------
src/uncategorized/reRecruit.tw | 1 +
src/uncategorized/slaveAssignmentsReport.tw | 2 ++
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 39d61f66d81..72a2dcf806a 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2549,8 +2549,10 @@ window.unparseExpr = function(expr) {
return "true";
case "false":
return "false";
- case "(number)": case "(string)":
- return expr.value;
+ case "(number)":
+ return expr.value;
+ case "(string)":
+ return '"' + expr.value + '"';
// names
case "(name)":
diff --git a/src/js/rulesAssistant.tw b/src/js/rulesAssistant.tw
index 088f0bd166f..b644b99790c 100644
--- a/src/js/rulesAssistant.tw
+++ b/src/js/rulesAssistant.tw
@@ -160,8 +160,10 @@ window.unparseExpr = function(expr) {
return "true";
case "false":
return "false";
- case "(number)": case "(string)":
- return expr.value;
+ case "(number)":
+ return expr.value;
+ case "(string)":
+ return '"' + expr.value + '"';
// names
case "(name)":
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index aed7671e7bb..a1b4d5f481a 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -837,7 +837,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $surgicalUpgradeGenitalia == "gelded">>
- It's an excellent market for your corporation's neutered slavegirls, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's neutered slavegirls, improving sales and helping social progress.
<<set $arcologies[$i].FSRestart += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $trainingUpgradeSexEd == "highly skilled">>
@@ -1117,7 +1117,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$i].FSTransformationFetishist += 1>>
<<set $corpCash += _corpBonus>>
<<elseif $surgicalUpgradeImplants == "absurd">>
- It's an excellent market for your corporation's absurdly implanted slaves, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's absurdly implanted slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSTransformationFetishist += 2>>
<<set $corpCash += _corpBonus*2>>
<</if>>
@@ -1284,7 +1284,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $drugUpgradeInjectionTwo == "supermassive">>
- It's an excellent market for your corporation's world-class tits and ass, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's world-class tits and ass, improving sales and helping social progress.
<<set $arcologies[$i].FSAssetExpansionist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $drugUpgradeInjectionTwo == "pastoral">>
@@ -1329,7 +1329,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $drugUpgradeInjectionTwo == "pastoral">>
- It's an excellent market for your corporation's world-class milk producers, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's world-class milk producers, improving sales and helping social progress.
<<set $arcologies[$i].FSPastoralist += 2>>
<<set $corpCash += _corpBonus*2>>
<</if>>
@@ -1367,7 +1367,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $drugUpgradeInjectionTwo == "pastoral">>
- It's an excellent market for your corporation's world-class cum producers, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's world-class cum producers, improving sales and helping social progress.
<<set $arcologies[$i].FSCummunism += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $drugUpgradeHormones == "XY">>
@@ -1411,7 +1411,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $generalUpgradeMuscle == "ripped">>
- It's an excellent market for your corporation's ripped chicks, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's ripped chicks, improving sales and helping social progress.
<<set $arcologies[$i].FSPhysicalIdealist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $generalUpgradeMuscle == "toned">>
@@ -1454,7 +1454,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $generalUpgradeBreaking == "care">>
- It's an excellent market for your corporation's well kept, happy slaves, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's well kept, happy slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSHedonisticDecadence += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $trainingUpgradeSexEd == "highly skilled">>
@@ -1532,7 +1532,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $trainingUpgradeSexEd == "highly skilled">>
- It's an excellent market for your corporation's holy sex slaves, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's holy sex slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSChattelReligionist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $trainingUpgradeSexEd == "competence">>
@@ -1788,7 +1788,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $corpIncorporated == 1>>
<<if $entrapmentUpgradeDevotionTwo == "devotion">>
- It's an excellent market for your corporation's harem-ready devotees, improving sales and helping social progress.
+ It's an @@.lightgreen;excellent market@@ for your corporation's harem-ready devotees, improving sales and helping social progress.
<<set $arcologies[$i].FSArabianRevivalist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $entrapmentUpgradeDevotionOne == "obedience">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 96abbef4718..ecdc9d936b2 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1763,6 +1763,7 @@ As you are heading back to your penthouse from overseeing a promising new store'
<<set $activeSlave.birthsTotal = 1>>
<<set $activeSlave.bellySag = 5>>
<<set $activeSlave.bellySagPreg = 5>>
+<<set $activeSlave.pubertyXX = 1>>
As you are heading back to your penthouse from inspecting a new line of sex shops, you hear a pained moan emanate from a nearby alley. Looking in, you find a heavily pregnant <<if $activeSlave.visualAge > 17>>girl<<elseif $activeSlave.visualAge > 12>>teenager<<else>>little girl<</if>> seated, legs spread as wide as she can, in a pool of her own fluids. Your medical training kicks in and you descend on the laboring woman, only to find she is well into giving birth. Judging by her exhaustion and the ever drying amniotic fluid and blood, she has been struggling for quite some time. The reason is evident,
<<if $activeSlave.visualAge <= 12>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 686b94f205e..4dde852b420 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -364,9 +364,11 @@
<</if>>
<</if>>
+/*
<<if ($slaves[$i].scars == 3)>>
<<set $slaves[$i].scarheal += 1>>
<</if>>
+*/
<<if $slaves[$i].fetish == "mindbroken" && $slaves[$i].relationship == -3>>
<<if def $slaves[$i].kindness && $slaves[$i].kindness > 0>>
<<set $slaves[$i].kindness-->>
--
GitLab