From 7112b7f24d76f11fbd33594acde3d06eebcb040f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 4 Dec 2019 17:03:05 -0500
Subject: [PATCH] PC datatype cleanup
---
src/js/datatypeCleanupJS.js | 101 +++++++++++++-------
src/uncategorized/BackwardsCompatibility.tw | 6 +-
2 files changed, 71 insertions(+), 36 deletions(-)
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 4e19c77bb58..44dee151d29 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -13,7 +13,7 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() {
* @param {App.Entity.SlaveState} slave
*/
function SlaveDataSchemeCleanup(slave) {
- migrateRules(slave);
+ migrateRules(slave);
migratePorn(slave);
migrateSkills(slave);
migrateCounters(slave);
@@ -1575,6 +1575,7 @@ window.childMiscellaneousDatatypeCleanup = function childMiscellaneousDatatypeCl
child.accent = Math.clamp(+child.accent, 0, 3) || 0;
};
+/* Make sure any new PC variables put into use are added to this! */
window.PCDatatypeCleanup = function PCDatatypeCleanup() {
const PC = V.PC;
@@ -1582,48 +1583,74 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
PC.title = Math.clamp(+PC.title, 0, 1) || 1;
}
if (PC.dick !== 0) {
- PC.dick = Math.clamp(+PC.dick, 0, 1) || 1;
+ PC.dick = Math.clamp(+PC.dick, 0, 5) || 4;
+ }
+ if (PC.vagina !== -1) {
+ PC.vagina = Math.clamp(+PC.vagina, 0, 5) || 0;
+ }
+ if (typeof PC.genes !== "string") {
+ PC.genes = "XY";
+ }
+ if (typeof PC.genes !== "string") {
+ PC.genes = "XY";
+ }
+ if (typeof PC.race !== "string") {
+ PC.race = "white";
+ }
+ if (typeof PC.skin !== "string") {
+ PC.skin = "Stateless";
+ }
+ if (typeof PC.markings !== "string") {
+ PC.markings = "none";
+ }
+ if (typeof PC.hColor !== "string") {
+ PC.hColor = "blonde";
+ }
+ if (typeof PC.eye.origColor !== "string") {
+ PC.nationality = "blue";
}
- PC.vagina = Math.clamp(+PC.vagina, 0, 1) || 0;
PC.belly = Math.max(+PC.belly, 0) || 0;
PC.fertPeak = Math.clamp(+PC.fertPeak, 0, 4) || 0;
PC.pregMood = Math.clamp(+PC.pregMood, 0, 2) || 0;
- PC.labor = Math.clamp(+PC.labor, 0, 1) || 0;
- PC.births = Math.max(+PC.births, 0) || 0;
- PC.boobs = Math.clamp(+PC.boobs, 0, 1) || 0;
- PC.boobsBonus = Math.clamp(+PC.boobsBonus, -3, 3) || 0;
- PC.boobsImplant = Math.clamp(+PC.boobsImplant, 0, 1) || 0;
- PC.butt = Math.clamp(+PC.butt, 0, 3) || 0;
- PC.buttImplant = Math.clamp(+PC.buttImplant, 0, 1) || 0;
- PC.balls = Math.clamp(+PC.balls, 0, 3) || 0;
- PC.ballsImplant = Math.clamp(+PC.ballsImplant, 0, 4) || 0;
+ PC.boobs = Math.clamp(+PC.boobs, 100, 1500) || 100;
+ PC.boobsImplant = Math.clamp(+PC.boobsImplant, 0, 1000) || 0;
+ PC.butt = Math.clamp(+PC.butt, 0, 5) || 2;
+ PC.buttImplant = Math.clamp(+PC.buttImplant, 0, 5) || 0;
+ PC.balls = Math.clamp(+PC.balls, 0, 100) || 0;
+ PC.ballsImplant = Math.clamp(+PC.ballsImplant, 0, 100) || 0;
+ PC.prostate = Math.clamp(+PC.prostate, 0, 1) || 0;
PC.degeneracy = Math.max(+PC.degeneracy, 0) || 0;
PC.birthWeek = Math.clamp(+PC.birthWeek, 0, 51) || 0;
if (PC.sexualEnergy !== 0) {
PC.sexualEnergy = +PC.sexualEnergy || 4;
}
+ if (typeof PC.refreshment !== "string") {
+ PC.refreshment = "cigar";
+ }
PC.refreshmentType = Math.clamp(+PC.refreshmentType, 0, 6) || 0;
- PC.trading = Math.clamp(+PC.trading, -100, 100) || 0;
- PC.warfare = Math.clamp(+PC.warfare, -100, 100) || 0;
- PC.slaving = Math.clamp(+PC.slaving, -100, 100) || 0;
- PC.engineering = Math.clamp(+PC.engineering, -100, 100) || 0;
- PC.medicine = Math.clamp(+PC.medicine, -100, 100) || 0;
- PC.hacking = Math.clamp(+PC.hacking, -100, 100) || 0;
- PC.cumTap = Math.max(+PC.cumTap, 0) || 0;
+ PC.skill.trading = Math.clamp(+PC.skill.trading, -100, 100) || 0;
+ PC.skill.warfare = Math.clamp(+PC.skill.warfare, -100, 100) || 0;
+ PC.skill.slaving = Math.clamp(+PC.skill.slaving, -100, 100) || 0;
+ PC.skill.engineering = Math.clamp(+PC.skill.engineering, -100, 100) || 0;
+ PC.skill.medicine = Math.clamp(+PC.skill.medicine, -100, 100) || 0;
+ PC.skill.hacking = Math.clamp(+PC.skill.hacking, -100, 100) || 0;
+ PC.skill.cumTap = Math.max(+PC.skill.cumTap, 0) || 0;
PC.mother = +PC.mother || 0;
PC.father = +PC.father || 0;
- PC.birthElite = Math.max(+PC.birthElite, 0) || 0;
- PC.birthMaster = Math.max(+PC.birthMaster, 0) || 0;
- PC.birthDegenerate = Math.max(+PC.birthDegenerate, 0) || 0;
- PC.birthClient = Math.max(+PC.birthClient, 0) || 0;
- PC.birthOther = Math.max(+PC.birthOther, 0) || 0;
- PC.birthArcOwner = Math.max(+PC.birthArcOwner, 0) || 0;
- PC.birthCitizen = Math.max(+PC.birthCitizen, 0) || 0;
- PC.birthSelf = Math.max(+PC.birthSelf, 0) || 0;
- PC.birthLab = Math.max(+PC.birthLab, 0) || 0;
- PC.birthFutaSis = Math.max(+PC.birthFutaSis, 0) || 0;
- PC.slavesFathered = Math.max(+PC.slavesFathered, 0) || 0;
- PC.slavesKnockedUp = Math.max(+PC.slavesKnockedUp, 0) || 0;
+ PC.labor = Math.clamp(+PC.labor, 0, 1) || 0;
+ PC.counter.birthsTotal = Math.max(+PC.counter.birthsTotal, 0) || 0;
+ PC.counter.birthElite = Math.max(+PC.counter.birthElite, 0) || 0;
+ PC.counter.birthMaster = Math.max(+PC.counter.birthMaster, 0) || 0;
+ PC.counter.birthDegenerate = Math.max(+PC.counter.birthDegenerate, 0) || 0;
+ PC.counter.birthClient = Math.max(+PC.counter.birthClient, 0) || 0;
+ PC.counter.birthOther = Math.max(+PC.counter.birthOther, 0) || 0;
+ PC.counter.birthArcOwner = Math.max(+PC.counter.birthArcOwner, 0) || 0;
+ PC.counter.birthCitizen = Math.max(+PC.counter.birthCitizen, 0) || 0;
+ PC.counter.birthSelf = Math.max(+PC.counter.birthSelf, 0) || 0;
+ PC.counter.birthLab = Math.max(+PC.counter.birthLab, 0) || 0;
+ PC.counter.birthFutaSis = Math.max(+PC.counter.birthFutaSis, 0) || 0;
+ PC.counter.slavesFathered = Math.max(+PC.counter.slavesFathered, 0) || 0;
+ PC.counter.slavesKnockedUp = Math.max(+PC.counter.slavesKnockedUp, 0) || 0;
PC.intelligence = 100;
PC.face = 100;
PC.actualAge = Math.clamp(+PC.actualAge, 14, 80) || 35;
@@ -1641,6 +1668,16 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
PC.mpreg = 0; /* So knockMeUp() may be used with the PC */
PC.lactation = Math.max(+PC.lactation, 0) || 0;
PC.lactationDuration = Math.max(+PC.lactationDuration, 0) || 0;
+ PC.muscles = Math.clamp(+PC.muscles, -100, 100) || 50;
+ PC.hLength = Math.clamp(+PC.hLength, 0, 150) || 2;
+ PC.voice = Math.clamp(+PC.voice, 1, 3) || 1;
+ PC.majorInjury = Math.max(+PC.majorInjury, 0) || 0;
+ if (typeof PC.rules.living !== "string") {
+ PC.rules.living = "normal";
+ }
+ if (typeof PC.rules.lactation !== "string") {
+ PC.rules.lactation = "none";
+ }
App.Entity.Utils.migratePronouns(PC);
generatePlayerPronouns(PC);
@@ -1659,8 +1696,6 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
PC.ageImplant = 0;
PC.voiceImplant = 0;
PC.accent = 0;
- PC.shoulders = 0;
- PC.shouldersImplant = 0;
};
window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() {
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 1c75b504b9c..6ae7ce33ed5 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -774,9 +774,9 @@
<<set $PC = clone(_newPC)>>
Standardizing player object... Done!<br>
<</if>>
-/*
- <<run PCDatatypeCleanup()>> Needs massive revisions and for now, everything should be getting set by the object/onverter.
-*/
+
+<<run PCDatatypeCleanup()>>
+
<<run BCReserveInit()>>
<<if ndef $universalRulesImmobileSlavesMaintainMuscles>>
--
GitLab