From b8b9072905907fe5ad52160015d9c98a762eac95 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 2 May 2018 20:20:34 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++
src/SecExp/seeUnit.tw | 2 +-
src/npc/fFeelings.tw | 2 +-
src/uncategorized/dispensary.tw | 14 +++++++++----
src/uncategorized/futureSociety.tw | 22 ++++++++++++--------
src/utility/miscWidgets.tw | 2 +-
6 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index dd1465a99d4..a8e16ac348f 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,9 @@
5/02/2018
+ 80
+ -more fixes
+
79
-various fixes
-work towards fuckable nipples
diff --git a/src/SecExp/seeUnit.tw b/src/SecExp/seeUnit.tw
index 3e26a8e9f3f..b65c6460af6 100644
--- a/src/SecExp/seeUnit.tw
+++ b/src/SecExp/seeUnit.tw
@@ -38,7 +38,7 @@
<<elseif $SFSupportLevel < 1 && $securityForceCreate == 1>>
There's little left to improve in the matrix. However support from $securityForceName might give some more room from improvement.
<<else>>
- There's little left to improve in the matrix. Your control systems are at top capacity and won't be able to handle bigger a drone unit.
+ There's little left to improve in the matrix. Your control systems are at top capacity and won't be able to handle a bigger drone unit.
<</if>>
<<if $secBots.equip < 3>>
<br>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 7fced52ab39..71cfe40dac5 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -152,7 +152,7 @@ My favorite part of my body i<<s>>
My tiny little bitch dick i<<s>> good for encouraging people to mole<<s>>t my butthole.
<</if>>
<<if $activeSlave.nipples == "fuckable">>
- I love my fuckables nipple<<s>>, it really feel<<s>> like I've got a pair of pu<<ss>>ie<<s>> on my che<<s>>t.
+ I love my fuckable nipple<<s>>, it really feel<<s>> like I've got a pair of pu<<ss>>ie<<s>> on my che<<s>>t.
<<elseif ($activeSlave.nipples != "tiny")>>
I love my big nipple<<s>>, it'<<s>> like having clit<<s>> on my che<<s>>t.
<</if>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index bed79523f47..9ae125a4cd1 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -648,9 +648,11 @@ Future Societies Research
<<else>>
The fabricator has been upgraded to manufacture tasty, extremely addictive, solid slave food in various familiar shapes and flavors. While they look and taste like real food, their consistency is all wrong. Slaves gorging on them are likely to experience steady weight gain.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, all food crafted will cause severe stomach cramps minutes after ingestion. Coupled with their addictive nature, it ought to be quite torturous.<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast > 50 && $arcologies[0].FSHedonisticDecadenceDietResearch == 0>>
+ <br>
[[Purchase diet recipes|Dispensary][$cash -= 10000*_PCSkillCheck,$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
- <br> Will prevent rampant weight gain from ruining your slim slaves.
+ <br>
+ Will prevent rampant weight gain from ruining your slim slaves.
<br>
<<elseif $arcologies[0].FSHedonisticDecadenceDietResearch == 1>>
A diet recipe is being utilized to prevent unwanted weight gain.
@@ -660,16 +662,20 @@ Future Societies Research
<<elseif $arcologies[0].FSHedonisticDecadenceResearch == 1>>
The fabricator has been upgraded to manufacture tasty, extremely addictive, solid slave food in various familiar shapes and flavors. While they look and taste like real food, their consistency is all wrong. Slaves gorging on them are likely to experience steady weight gain.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, all food crafted will cause severe stomach cramps minutes after ingestion. Coupled with their addictive nature, it ought to be quite torturous.<</if>>
<<if $arcologies[0].FSHedonisticDecadenceDietResearch == 0>>
+ <br>
[[Purchase diet recipes|Dispensary][$cash -= 10000*_PCSkillCheck,$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
- <br> Will prevent rampant unwanted weight gain from ruining your <<if $arcologies[0].FSSlimnessEnthusiast > 20>>slim <</if>>slaves.
+ <br>
+ Will prevent rampant unwanted weight gain from ruining your <<if $arcologies[0].FSSlimnessEnthusiast > 20>>slim <</if>>slaves.
<br>
<<elseif $arcologies[0].FSHedonisticDecadenceDietResearch == 1>>
A diet recipe is being utilized to prevent unwanted weight gain.
<br>
<</if>>
- [[Cancel solid slave food production|Dispensary][$arcologies[0].FSHedonisticDecadenceDietResearch = 0, $merchantFSWares.push("HedonisticDecadenceResearch")]]
- <br> Will //completely// remove this research.
+
+ <<link "Cancel solid slave food production" "Dispensary">><<set $arcologies[0].FSHedonisticDecadenceResearch = 0>><<set $merchantFSWares.push("HedonisticDecadenceResearch")>><</link>>
+ <br>
+ Will //completely// remove this research.
<br>
<<else>>
// Hedonistic Decadence focused research unavailable. //
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index e55068e780a..b0a7e9d4995 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -674,18 +674,22 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $arcologies[0].FSRestart != "unset">>
<<if $arcologies[0].FSRestartDecoration != 100>>
<br>''You are pursuing'' Eugenics.
-//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 20, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
+ //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 20, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
<<else>>
- <br>''You have established'' Eugenics. <<if $eugenicsFullControl != 1>>The Societal Elite will not permit you to abandon Eugenics.<<else>> //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 20, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>// <</if>><br>
-<</if>>
+ <br>''You have established'' Eugenics.
+ <<if $eugenicsFullControl != 1>>
+ The Societal Elite will not permit you to abandon Eugenics.
+ <<else>>
+ //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 2, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//
+ <</if>>
+ <br>
<<FSChangeDecoration "FSRestart">>
- <<if $arcologies[0].FSRestartDecoration == 100>>The Societal Elite exist as the highest class, allowing you access to all manner of benefits.<</if>>
- <</switch>>
- <<if $PAPublic == 1>>
- <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ The Societal Elite exist as the highest class, allowing you access to all manner of benefits
+ <<if $PAPublic == 1>>
+ <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
+ With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ <</if>>
<</if>>
- <</if>>
<<else>>
<<if ($FSCredits > 0)>>
<br>''''[[Eugenics|Future Society][$arcologies[0].FSRestart = 4, $FSCredits -= 1]]: rebuilding society using restrictive breeding programs reserved solely for society's finest.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 61763c855d1..100a680f4d6 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2730,7 +2730,7 @@ This experience
<<if ($args[0].oralSkill <= 30) && ($args[0].analSkill <= 30)>>
<<set _names.push("Cheap", "Fail", "Gutter")>>
<</if>>
-<<if args[0].nipples == "fuckable">>
+<<if $args[0].nipples == "fuckable">>
<<set _names.push("Nipplefuck", "Nipplecunt")>>
<<elseif ($args[0].nipples != "tiny") && ($args[0].nipples != "cute")>>
<<set _names.push("Pointy", "Titclit")>>
--
GitLab