From cd800232f0af95ef6dfb017c4fc9020e2430f150 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 16 Jun 2019 13:06:05 -0500
Subject: [PATCH] CheatFix
---
src/cheats/PCCheatMenuCheatDatatypeCleanup.tw | 10 +-
src/js/vignettes.js | 128 +++++++++++++++++-
src/uncategorized/RETS.tw | 2 +-
3 files changed, 131 insertions(+), 9 deletions(-)
diff --git a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
index 227c60dffbc..df5252953ae 100644
--- a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
+++ b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
@@ -30,11 +30,6 @@
<<set $tempSlave.belly = 0>>
<<set $tempSlave.pregWeek = 0>>
<</if>>
-<<run PCDatatypeCleanup()>>
-<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
-<<set $upgradeMultiplierMedicine = upgradeMultiplierMedicine()>>
-<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
-<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
<<if $tempSlave.boobs == 0>>
<<set $tempSlave.boobsBonus = 0>>
@@ -59,4 +54,9 @@
You perform the dark rituals, pray to the dark gods, and sell your soul for the power to reshape your body and life at will. What a cheater!
<<set $PC = clone($tempSlave)>>
+<<run PCDatatypeCleanup()>>
+<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
+<<set $upgradeMultiplierMedicine = upgradeMultiplierMedicine()>>
+<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
+<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
<<unset $tempSlave>>
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 81578b6acee..21135e14a13 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -381,7 +381,7 @@ window.GetVignette = function GetVignette(slave) {
effect: -1,
});
vignettes.push({
- text: `${he} tried to preach ${his} faith to one of $his} customers, causing him to leave in a huff,`,
+ text: `${he} tried to preach ${his} faith to one of ${his} customers, causing him to leave in a huff,`,
type: "cash",
effect: -1,
});
@@ -955,6 +955,13 @@ window.GetVignette = function GetVignette(slave) {
});
}
if (slave.balls === 0 && slave.dick > 0) {
+ if (canTalk(slave)) {
+ vignettes.push({
+ text: `a doctor ordered ${him} to describe the gelding process in detail and was fascinated by the small scars where ${his} balls used to be,`,
+ type: "cash",
+ effect: 1,
+ });
+ }
vignettes.push({
text: `a slave trainer privately studied ${him} as an example of a slave with well done gelding surgery,`,
type: "cash",
@@ -1500,6 +1507,23 @@ window.GetVignette = function GetVignette(slave) {
effect: -1,
});
}
+ if (slave.balls === 0 && slave.dick > 0) {
+ vignettes.push({
+ text: `a customer asked why ${his} useless dick wasn't removed along with ${his} balls,`,
+ type: "cash",
+ effect: 0,
+ });
+ vignettes.push({
+ text: `a customer hit ${his} dick a few times to see if gelding reduces sensitivity,`,
+ type: "health",
+ effect: -1,
+ });
+ vignettes.push({
+ text: `an approving customer commented that being gelded made it plain ${he} wasn't human,`,
+ type: "rep",
+ effect: 1,
+ });
+ }
vignettes.push({
text: `a rich customer had fun seeing how much money he could cram in ${his} holes without using any lube,`,
type: "cash",
@@ -1520,6 +1544,11 @@ window.GetVignette = function GetVignette(slave) {
type: "rep",
effect: 1,
});
+ vignettes.push({
+ text: `a sex machine salesman hired ${him} to demonstrate his products and fucked ${his} holes brutally,`,
+ type: "health",
+ effect: -1,
+ });
}
if (V.arcologies[0].FSBodyPurist !== "unset") {
if (slave.boobsImplant > 0) {
@@ -1757,7 +1786,39 @@ window.GetVignette = function GetVignette(slave) {
effect: 1,
});
}
-
+ if (V.seeAge !== 0) {
+ if (slave.birthWeek >= 51) {
+ if (V.arcologies[0].FSDegradationist !== "unset") {
+ if (slave.voice !== 0) {
+ vignettes.push({
+ text: `a group of frat boys found out it was ${his} birthday and took turns spanking ${him} until ${he} couldn't sit down and ${his} voice was hoarse,`,
+ type: "health",
+ effect: -1,
+ });
+ }
+ vignettes.push({
+ text: `${he} was given a paddle and ordered to request harsh birthday spankings from all of ${his} customers,`,
+ type: "health",
+ effect: -1,
+ });
+ }
+ vignettes.push({
+ text: `a favorite customer gave ${him} a lighthearted birthday spanking and a big tip,`,
+ type: "cash",
+ effect: 1,
+ });
+ }
+ }
+ vignettes.push({
+ text: `a visiting tourist got a crush on ${him} and gave ${him} repeat business,`,
+ type: "cash",
+ effect: 1,
+ });
+ vignettes.push({
+ text: `a prominent citizen rented ${him} for his birthday party,`,
+ type: "cash",
+ effect: 1,
+ });
vignettes.push({
text: `one of the companies with an office in your arcology retained ${him} for a team-building bukkake party for its employees,`,
type: "rep",
@@ -2734,6 +2795,13 @@ window.GetVignette = function GetVignette(slave) {
}
}
if (slave.balls === 0 && slave.dick > 0) {
+ if (canTalk(slave)) {
+ vignettes.push({
+ text: `a doctor ordered ${him} to describe the gelding process in detail and was fascinated by the small scars where ${his} balls used to be,`,
+ type: "rep",
+ effect: 1,
+ });
+ }
vignettes.push({
text: `a slave trainer pointed ${him} out as an example of a slave with well done gelding surgery,`,
type: "rep",
@@ -3286,6 +3354,23 @@ window.GetVignette = function GetVignette(slave) {
effect: 0,
});
}
+ if (slave.balls === 0 && slave.dick > 0) {
+ vignettes.push({
+ text: `a citizen asked why ${his} useless dick wasn't removed along with ${his} balls,`,
+ type: "rep",
+ effect: 0,
+ });
+ vignettes.push({
+ text: `a citizen hit ${his} dick a few times to see if gelding reduces sensitivity,`,
+ type: "health",
+ effect: -1,
+ });
+ vignettes.push({
+ text: `an approving citizen commented that being gelded made it plain ${he} wasn't human,`,
+ type: "rep",
+ effect: 1,
+ });
+ }
if (slave.visualAge > 40) {
vignettes.push({
text: `a citizen wrote a note on ${his} face that said: 'Retire it to an arcade',`,
@@ -3313,6 +3398,11 @@ window.GetVignette = function GetVignette(slave) {
type: "rep",
effect: 1,
});
+ vignettes.push({
+ text: `a sex machine salesman used ${him} to demonstrate his products and fucked ${his} holes brutally,`,
+ type: "health",
+ effect: -1,
+ });
}
if (V.arcologies[0].FSBodyPurist !== "unset") {
if (slave.boobsImplant > 0) {
@@ -3550,7 +3640,39 @@ window.GetVignette = function GetVignette(slave) {
effect: 1,
});
}
-
+ if (V.seeAge !== 0) {
+ if (slave.birthWeek >= 51) {
+ if (V.arcologies[0].FSDegradationist !== "unset") {
+ if (slave.voice !== 0) {
+ vignettes.push({
+ text: `a group of frat boys found out it was ${his} birthday and took turns spanking ${him} until ${he} couldn't sit down and ${his} voice was hoarse,`,
+ type: "health",
+ effect: -1,
+ });
+ }
+ vignettes.push({
+ text: `${he} was given a paddle and ordered to request harsh birthday spankings from all of ${his} citizens,`,
+ type: "health",
+ effect: -1,
+ });
+ }
+ vignettes.push({
+ text: `a favorite citizen gave ${him} a lighthearted birthday spanking and a big tip,`,
+ type: "cash",
+ effect: 1,
+ });
+ }
+ }
+ vignettes.push({
+ text: `a visiting tourist got a crush on ${him} and gave ${him} repeat business,`,
+ type: "rep",
+ effect: 1,
+ });
+ vignettes.push({
+ text: `a prominent citizen invited ${him} to his birthday party,`,
+ type: "rep",
+ effect: 1,
+ });
vignettes.push({
text: `one of the companies with an office in your arcology brought ${him} in for a team-building bukkake party for its employees,`,
type: "rep",
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index aa56f7a8250..fd6d7f4e9e5 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -914,7 +914,7 @@ The slaves are about to go to bed; they're naked, and the horny $activeSlave.sla
<<elseif !_vaginal && $subSlave.butt > 3>>
"You've got <<s>>uch a ni<<c>>e a<<ss>>," $he wheedles. "It'<<s>> ju<<s>>t <<s>>o big, and round, and, um, out there." $He swallows, getting distracted.
<<elseif $subSlave.boobShape == "perky">>
- "Your tit<<s>> are incredible," $he wheedles. "<<if $subSlave.boobs > 800>>They're magical. There'<<s>> no other explanation for them being <<s>>o huge and <<s>>till perky.<<elseif $subSlave.boobs > 400>>They're <<s>>o perky and perfect.<<else>>They're <<s>>o tiny and cute!<</if>> I want you<<if !_vaginal>>r a<<ss>><</if>> <<s>>o much!"
+ "Your tit<<s>> are incredible," $he wheedles. "<<if $subSlave.boobs > 800>>They're magical. There'<<s>> no other e<<x>>planation for them being <<s>>o huge and <<s>>till perky.<<elseif $subSlave.boobs > 400>>They're <<s>>o perky and perfect.<<else>>They're <<s>>o tiny and cute!<</if>> I want you<<if !_vaginal>>r a<<ss>><</if>> <<s>>o much!"
<<elseif $subSlave.boobShape == "torpedo-shaped">>
"Your torpedoe<<s>> are incredible," $he wheedles. "<<if $subSlave.boobs > 400>>The way they <<s>>way when you move <<sh>>ould be again<<s>>t the rule<<s>>.<<else>>They're <<s>>o tiny and cute!<</if>> I want you<<if !_vaginal>>r a<<ss>><</if>> <<s>>o much!"
<<elseif $subSlave.muscles > 30>>
--
GitLab