From f7a762497ac33ad6d34e59fb642e62a87ac7f63a Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 2 Dec 2019 12:42:06 -0500
Subject: [PATCH] more fixes
---
Changelog.txt | 1 +
src/events/intro/introSummary.tw | 6 +++---
src/events/intro/pcBodyIntro.tw | 6 +++---
src/init/storyInit.tw | 2 ++
src/js/familyTreeJS.js | 10 +---------
src/npc/acquisition.tw | 15 +++++++++++----
src/player/js/PlayerState.js | 8 ++++----
src/uncategorized/BackwardsCompatibility.tw | 19 +++++++++++--------
8 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index a917b6e5303..323c279aee7 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -4,6 +4,7 @@ Pregmod
0
-standardized player and slave objects
+ -cheat edit player and player testicle enhancement disabled for cleaning
-FS naming is now player selectable instead of a priority
-minor fixes and JSification
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index c06f53b128f..70826dc7786 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -892,11 +892,11 @@ __''Player Character''__
<<options _vagina_penis>>
You have a
- <<option 0 "Penis" "$PC.preg=0, $PC.pregType=0, $PC.dick=4, $PC.balls=3, $PC.scrotum=3, $PC.vagina=-1, $PC.ovaries=0">>
+ <<option 0 "Penis" "$PC.preg=0, $PC.pregType=0, $PC.dick=4, $PC.balls=3, $PC.scrotum=3, $PC.prostate=1, $PC.vagina=-1, $PC.ovaries=0">>
''penis''. Standard sex scenes; easiest reputation maintenance.
- <<option 1 "Vagina" "$PC.dick=0, $PC.balls=0, $PC.scrotum=0, $PC.vagina=1, $PC.ovaries=1">>
+ <<option 1 "Vagina" "$PC.dick=0, $PC.balls=0, $PC.prostate=0, $PC.scrotum=0, $PC.vagina=1, $PC.ovaries=1">>
''vagina''. Sex scene variations; most difficult reputation maintenance.
- <<option 2 "Penis and Vagina" "$PC.dick=4, $PC.balls=3, $PC.scrotum=3, $PC.vagina=1, $PC.ovaries=1">>
+ <<option 2 "Penis and Vagina" "$PC.dick=4, $PC.balls=3, $PC.scrotum=3, $PC.prostate=1, $PC.vagina=1, $PC.ovaries=1">>
''penis and vagina''. Sex scene variations; more difficult reputation maintenance; some unique opportunities, especially with breasts.
<</options>>
<br>
diff --git a/src/events/intro/pcBodyIntro.tw b/src/events/intro/pcBodyIntro.tw
index 7c734e9ac02..74ab2a63410 100644
--- a/src/events/intro/pcBodyIntro.tw
+++ b/src/events/intro/pcBodyIntro.tw
@@ -38,14 +38,14 @@ Behind the front of my tailored
<<if $PC.dick != 0>>
<<if $PC.vagina != -1>>
slacks, ''both a penis and a vagina.''
- [[Remove the penis|PC Body Intro][$PC.dick = 0, $PC.balls = 0, $PC.scrotum = 0]] | [[Remove the vagina|PC Body Intro][$PC.vagina = -1, $PC.ovaries = 0]]
+ [[Remove the penis|PC Body Intro][$PC.dick = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.prostate = 0]] | [[Remove the vagina|PC Body Intro][$PC.vagina = -1, $PC.ovaries = 0]]
<<else>>
slacks, a ''penis.''
- [[Switch to vagina|PC Body Intro][$PC.dick = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.genes = "XX", $PC.vagina = 1, $PC.ovaries = 1]] | [[Add a vagina|PC Body Intro][$PC.vagina = 1]]
+ [[Switch to vagina|PC Body Intro][$PC.dick = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.prostate = 0, $PC.genes = "XX", $PC.vagina = 1, $PC.ovaries = 1]] | [[Add a vagina|PC Body Intro][$PC.vagina = 1, $PC.ovaries = 1]]
<</if>>
<<else>>
skirt, a ''vagina.''
- [[Switch to penis|PC Body Intro][$PC.dick = 4, $PC.balls = 3, $PC.scrotum = 3, $PC.genes = "XY", $PC.vagina = -1, $PC.ovaries = 0]] | [[Add a penis|PC Body Intro][$PC.dick = 4]]
+ [[Switch to penis|PC Body Intro][$PC.dick = 4, $PC.balls = 3, $PC.scrotum = 3, $PC.prostate = 1, $PC.genes = "XY", $PC.vagina = -1, $PC.ovaries = 0]] | [[Add a penis|PC Body Intro][$PC.dick = 4, $PC.balls = 3, $PC.scrotum = 3, $PC.prostate = 1]]
<</if>>
<br>
//These options will affect sex scenes. Feminine options will increase difficulty.//
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 8262cd05c1d..ce45c4de98f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -218,6 +218,7 @@ You should have received a copy of the GNU General Public License along with thi
<<if $saveImported == 0>> /* new game (not NG+) */
<<set $PC = basePlayer()>>
+ <<run WombInit($PC)>>
<<set $freshPC = 0>>
<<set $cheater = 0>>
<<setupLastWeeksCash>>
@@ -421,6 +422,7 @@ You should have received a copy of the GNU General Public License along with thi
<</if>>
<<else>>
<<set $PC = basePlayer()>>
+ <<run WombInit($PC)>>
<<set $cheater = 0>>
<<set $cash = 0>>
<<run cashX(10000, "personalBusiness")>>
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index 213701f3e46..35e7cf1753d 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -139,15 +139,7 @@ window.renderFamilyTree = function(slaves, filterID) {
node.append('text')
.text(function(d) {
let ssym;
- if (d.ID === -1) {
- if (d.dick === 1 && d.vagina === 1) {
- ssym = '☿';
- } else if (d.dick === 1) {
- ssym = '♂';
- } else if (d.vagina === 1) {
- ssym = '♀';
- }
- } else if (d.dick > 0 && d.vagina > -1) {
+ if (d.dick > 0 && d.vagina > -1) {
ssym = '☿';
} else if (d.dick > 0) {
ssym = '♂';
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 617cb6c3334..54f162d8e16 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -7,7 +7,7 @@
<<if $saveImported == 1>><<set _valueOwed = 5000>><<else>><<set _valueOwed = 50000>><</if>>
<<if $freshPC == 1 || $saveImported == 0>>
<<set $PC.birthName = $PC.slaveName>>
- <<if $PC.slaveSurname != 0>><<set $PC.birthSurname = $PC.slaveSurname>><</if>>
+ <<if $PC.slaveSurname>><<set $PC.birthSurname = $PC.slaveSurname>><</if>>
<<if $PC.title == 1>>
<<set $PC.muscles = 50>>
<<else>>
@@ -18,11 +18,18 @@
<<set $PC.hips = 1>>
<<set $PC.muscles = 30>>
<</if>>
- <<if $PC.career == "servant">>
+ <<if $PC.career == "escort">>
+ <<set $PC.anus = 1>>
+ <<set $PC.clothes = "a slutty outfit">>
+ <<set $PC.intelligenceImplant = 15>>
+ <<elseif $PC.career == "servant">>
<<set $PC.geneticQuirks.fertility = 1>>
+ <<set $PC.clothes = "a nice maid outfit">>
+ <<set $PC.intelligenceImplant = 0>>
<</if>>
- <<if $PC.vagina != 0>>
- <<set $PC.ovaries = 1>>
+ <<if $PC.vagina == -1>>
+ <<set $PC.ovaries = 0>>
+ <<elseif $PC.vagina > 0>>
<<set $PC.vaginaLube = 1>>
<<set $PC.counter.birthsTotal = 0>>
<<if $PC.career == "servant">>
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 95e937702f6..7f29519748e 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -107,7 +107,7 @@ App.Entity.PlayerIndividualEyeState = class PlayerIndividualEyeState {
* * 2: impaired
* * 3: blind
*/
- this.vision = 2;
+ this.vision = 1;
/**
* current eye color
*/
@@ -248,7 +248,7 @@ App.Entity.PlayerState = class PlayerState {
this.birthName = "Anonymous";
/** Player's original surname
* @type {string|number} */
- this.birthSurname = 0;
+ this.birthSurname = "";
/** Player sex ("XX", "XY") */
this.genes = "XY";
// exclusive major player variables here
@@ -618,7 +618,7 @@ App.Entity.PlayerState = class PlayerState {
* * 70000-89999 - door-crowding
* * 90000-100000 - door-jamming
*/
- this.boobs = 0;
+ this.boobs = 100;
/** breast engorgement from unmilked tits */
this.boobsMilk = 0;
/**
@@ -734,7 +734,7 @@ App.Entity.PlayerState = class PlayerState {
*
* _* Descriptions vary for just how big 2 is, as such, it may be better to just go with 3_
*/
- this.butt = 0;
+ this.butt = 2;
/**
* butt implant type and size
*
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 71fcad5c362..37b961640a1 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -542,7 +542,7 @@
<<set _newPC.slaveName = $PC.name>>
<<set _newPC.slaveSurname = $PC.surname>>
<<set _newPC.birthName = $PC.name>>
- <<if $PC.slaveSurname != 0>>
+ <<if $PC.slaveSurname>>
<<set _newPC.birthSurname = $PC.surname>>
<<else>>
<<set _newPC.birthSurname = "">>
@@ -571,10 +571,10 @@
<<set _newPC.eye.origColor = $PC.origEye>>
<<set _newPC.eye.left.iris = $PC.eyeColor>>
<<set _newPC.eye.left.pupil = $PC.pupil>>
- <<set _newPC.eye.left.sclerae = $PC.sclerae>>
+ <<set _newPC.eye.left.sclera = $PC.sclerae>>
<<set _newPC.eye.right.iris = $PC.eyeColor>>
<<set _newPC.eye.right.pupil = $PC.pupil>>
- <<set _newPC.eye.right.sclerae = $PC.sclerae>>
+ <<set _newPC.eye.right.sclera = $PC.sclerae>>
<<set _newPC.faceShape = $PC.faceShape>>
<<set _newPC.skill.trading = $PC.trading>>
<<set _newPC.skill.warfare = $PC.warfare>>
@@ -598,7 +598,9 @@
<<set _newPC.counter.birthSelf = $PC.birthSelf>>
<<set _newPC.counter.birthLab = $PC.birthLab>>
<<set _newPC.counter.birthOther = $PC.birthOther>>
- <<set _newPC.counter.laborCount = $PC.laborCount>>
+ <<if def $PC.laborCount>>
+ <<set _newPC.counter.laborCount = $PC.laborCount>>
+ <</if>>
<<set _newPC.counter.slavesFathered = $PC.slavesFathered>>
<<set _newPC.counter.slavesKnockedUp = $PC.slavesKnockedUp>>
<<set _newPC.sexualEnergy = $PC.sexualEnergy>>
@@ -621,7 +623,7 @@
<<set _newPC.underArmHStyle = $PC.underArmHStyle>>
<<if $PC.dick == 1>>
<<set _newPC.dick = 4>>
- <<set __newPC.prostate = 1>>
+ <<set _newPC.prostate = 1>>
<<if $PC.ballsImplant == 4 || $PC.balls == 4>>
<<set _newPC.balls = 30>>
<<set _newPC.scrotum = 7>>
@@ -702,7 +704,7 @@
<<set _newPC.geneticQuirks = clone($PC.geneticQuirks)>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<set _newPC.muscles = 100>>
- <<elseif PC.title == 1>>
+ <<elseif $PC.title == 1>>
<<set _newPC.muscles = 50>>
<<else>>
<<set _newPC.muscles = 30>>
@@ -717,15 +719,16 @@
<<if $PC.career == "escort">>
<<set _newPC.anus = 1>>
<<set _newPC.clothes = "a slutty outfit">>
- <<set _newPC.education = 15>>
+ <<set _newPC.intelligenceImplant = 15>>
<<elseif $PC.career == "servant">>
<<set _newPC.clothes = "a nice maid outfit">>
- <<set _newPC.education = 0>>
+ <<set _newPC.intelligenceImplant = 0>>
<</if>>
<<set WombInit(_newPC)>>
<<set $PC = clone(_newPC)>>
+ Standardizing player object... Done!<br>
<</if>>
<<if ndef $PCWounded>>
--
GitLab