diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 3774e5c5b9c0878f68f27f5ca4e5bc4a52931b92..aefdee1a77ccb0b9f58e073a08aacdc52c6a0495 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,14 @@
0.10.7.1-1.3.x
+12/16/2018
+
+ 8
+ -fixes
+ -code cleanup
+ -custom shares removed from the corporation (too buggy)
+ -added faceShape to genetics
+
12/15/2018
7
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 848821e584a5e3a0d6393b87f4baabf948135954..cf6567723a2df392602120b80d607a877bfda2e2 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10116,6 +10116,7 @@ window.generateGenetics = (function() {
genes.race = setRace(father, mother, actor2);
genes.intelligence = setIntelligence(father, mother, activeMother, actor2);
genes.face = setFace(father, mother, activeMother, actor2);
+ genes.faceShape = setFaceShape(father, mother);
genes.eyeColor = setEyeColor(father, mother, actor2);
genes.hColor = setHColor(father, mother, actor2);
genes.underArmHStyle = setUnderArmHStyle(father, mother);
@@ -10553,6 +10554,21 @@ window.generateGenetics = (function() {
return Math.clamp(face, -100, 100);
}
+ // face shape
+ function setFaceShape(father, mother) {
+ let shape;
+ if (father !== 0) {
+ if (mother.faceShape == father.faceShape) {
+ shape = mother.faceShape;
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ return shape;
+ }
+
return generateGenetics;
})();
@@ -10677,7 +10693,10 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
@@ -10823,7 +10842,7 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
child.energy = 0;
child.anus = 0;
if (child.vagina > 0) {child.vagina = 0;}
@@ -10833,6 +10852,9 @@ window.generateChild = function(mother, ova, destination) {
child.balls = 1;
child.scrotum = 1;
}
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index accb3288ca1a616df595734c363801a69b77a667..664df179ecc357ce49d3d97c27b7242ea5b75626 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -679,6 +679,14 @@ __''Player Character''__
<br>Your eyes are <<textbox "$PC.eyeColor" $PC.eyeColor "Intro Summary">>
and hair is <<textbox "$PC.hColor" $PC.hColor "Intro Summary">>.
+
+ <br>Your face is ''$PC.faceShape''.
+ [[Normal|Intro Summary][$PC.faceShape = "normal"]] |
+ [[Androgynous|Intro Summary][$PC.faceShape = "androgynous"]] |
+ [[Masculine|Intro Summary][$PC.faceShape = "masculine"]] |
+ [[Cute|Intro Summary][$PC.faceShape = "cute"]] |
+ [[Sensual|Intro Summary][$PC.faceShape = "sensual"]] |
+ [[Exotic|Intro Summary][$PC.faceShape = "exotic"]]
<br>
Your preferred refreshment is <<textbox "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
@@ -883,7 +891,7 @@ __''Player Character''__
//Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.//
<br>
- You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and $PC.eyeColor eyes.
+ You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and $PC.eyeColor eyes. You have a PC.faceShape face.
<br>
Your preferred refreshment is <<textbox "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 9413bf97bb81ee38f959bf81f706388961d75a33..2d2b679855040709d5cbd90df0b5e00f6c77d743 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1974,7 +1974,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Roman Revivalist": setup.romanMaleSurnames
}>>
-<<set setup.FutureSocieties = ["FSSupremacist", "FSSubjugationist", "FSRepopulationFocus", "FSRestart", "FSSubjugationist", "FSGenderRadicalist", "FSGenderFundamentalist", "FSPaternalist", "FSDegradationist", "FSBodyPurist", "FSTransformationFetishist", "FSYouthPreferentialist", "FSMaturityPreferentialist", "FSSlimnessEnthusiast", "FSAssetExpansionist", "FSPastoralist", "FSPhysicalIdealist", "FSHedonisticDecadence", "FSChattelReligionist", "FSRomanRevivalist", "FSAztecRevivalist", "FSEgyptianRevivalist", "FSEdoRevivalist", "FSArabianRevivalist", "FSChineseRevivalist", "FSNull"]>>
+<<set setup.FutureSocieties = ["FSSupremacist", "FSSubjugationist", "FSRepopulationFocus", "FSRestart", "FSGenderRadicalist", "FSGenderFundamentalist", "FSPaternalist", "FSDegradationist", "FSBodyPurist", "FSTransformationFetishist", "FSYouthPreferentialist", "FSMaturityPreferentialist", "FSSlimnessEnthusiast", "FSAssetExpansionist", "FSPastoralist", "FSPhysicalIdealist", "FSHedonisticDecadence", "FSChattelReligionist", "FSRomanRevivalist", "FSAztecRevivalist", "FSEgyptianRevivalist", "FSEdoRevivalist", "FSArabianRevivalist", "FSChineseRevivalist", "FSNull"]>>
<<set setup.ArcologyNamesSupremacistAmerindian = ["Akilineq", "Amerindia", "Aquadoctan", "Cahokia", "Caral", "Chicora", "Cusco", "Indigenismo", "Norumbega", "Paititi", "Porcupine", "Red Power", "Saguenay", "The Confederated Tribes"]>>
<<set setup.ArcologyNamesSupremacistAsian = ["Eastern Sun", "Jade Empire", "Kalapa", "Mahoroba", "Penglai", "Shambhala", "Shangri-La", "Sinosphere", "The Celestial Temple", "Tian", "Zhonghua Minzu"]>>
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 33079725627307a888e2efc625c70e74e8fdf73d..87987638965a41da15fdd0d97fd67cd9fba03392 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -68,6 +68,7 @@ window.generateGenetics = (function() {
genes.race = setRace(father, mother, actor2);
genes.intelligence = setIntelligence(father, mother, activeMother, actor2);
genes.face = setFace(father, mother, activeMother, actor2);
+ genes.faceShape = setFaceShape(father, mother);
genes.eyeColor = setEyeColor(father, mother, actor2);
genes.hColor = setHColor(father, mother, actor2);
genes.underArmHStyle = setUnderArmHStyle(father, mother);
@@ -505,6 +506,21 @@ window.generateGenetics = (function() {
return Math.clamp(face, -100, 100);
}
+ // face shape
+ function setFaceShape(father, mother) {
+ let shape;
+ if (father !== 0) {
+ if (mother.faceShape == father.faceShape) {
+ shape = mother.faceShape;
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ return shape;
+ }
+
return generateGenetics;
})();
@@ -629,7 +645,10 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
@@ -775,7 +794,7 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
child.energy = 0;
child.anus = 0;
if (child.vagina > 0) {child.vagina = 0;}
@@ -785,6 +804,9 @@ window.generateChild = function(mother, ova, destination) {
child.balls = 1;
child.scrotum = 1;
}
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 8b369c63e7513933e87c9fa757476c16c68c8531..be72518eb06a933e4a1b6d49574f35618c20b926 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -3,7 +3,7 @@
You arrive at your favorite plastic surgeon for your appointment to find them as busy as ever, but you find yourself quickly hurried into an exam room by their cute assistant. She wastes no time in hurrying you into her office, stripping you down, measuring you and making sure you are healthy enough for surgery, all the while not so subtly running her hands across every part of you. "So, what can I help you with?"
<br><br>
-"You sure you want to mess with that lovely face?" She teases, caressing your cheek. "@@.yellowgreen;<<print cashFormat(5000)>>@@. Also wouldn't recommend changing you eyes or skin color; some security systems get real uppity over things like that. Though I s'pose race and hair can fall under that as well, but hey, we don't handle racial surgery and this isn't a hair salon, so nothing to worry about, right? Yes, I'm certain your systems will recognize you after we finish working on you, give us some credit."
+"You sure you want to mess with that lovely face?" She teases, caressing your cheek. "@@.yellowgreen;<<print cashFormat(5000)>>@@. Also wouldn't recommend changing your eyes, face shape or skin color; some security systems get real uppity over things like that. Though I s'pose race and hair can fall under that as well, but hey, we don't handle racial surgery and this isn't a hair salon, so nothing to worry about, right? Yes, I'm certain your systems will recognize you after we finish working on you, give us some credit."
<br>
You're @@.orange;$PC.actualAge years old.@@
<<if $PC.actualAge >= 65>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 3e6ca28aa51972f8b05b455b326bffa9b0751d1b..8cec8ffa091ff96f7faee134ebedce92ea845a2f 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -8,7 +8,7 @@
<</if>>
You pause for a moment from your busy day to day life to return to <<if $masterSuite != 0>>$masterSuiteName<<else>>your room<</if>> to consider some things about yourself.
-<br>You take yourself in a full length mirror. You are <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $PC.race <<if $PC.dick == 1 && $PC.vagina == 1>>futanari<<elseif $PC.dick == 1>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair and $PC.eyeColor eyes.
+<br>You take yourself in a full length mirror. You are <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $PC.race <<if $PC.dick == 1 && $PC.vagina == 1>>futanari<<elseif $PC.dick == 1>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair, $PC.eyeColor eyes and a perfect $PC.faceShape face.
<<if $PC.actualAge >= 65>>
You're @@.orange;$PC.actualAge@@ and definitely feeling it.<<if $PC.visualAge > $PC.actualAge>> You've taken measures to @@.lime;look an older $PC.visualAge,@@ though perhaps it might be time to undo it.<<elseif $PC.visualAge < $PC.actualAge>> You've taken measures to @@.lime;look a younger $PC.visualAge,@@ now if only your body agreed with your looks.<</if>>
<<elseif $PC.actualAge >= 50>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 410d72898196f4c5c83e5ae7e5f3f87925bdc54c..73fd353e12c1e66a72fb54d6d3f46f662130cced 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,7 +1,7 @@
:: pregmod widgets [nobr widget]
<<widget "initPC">>
- <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0}}>>
+ <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0}}>>
<<set WombInit($PC)>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 9d50eb673d1dfa9f3b99312177dce0bd03849f30..bbc7477bcf18ab549a87e9c9c90686eb12ad4cb8 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -70,6 +70,9 @@
<<if ndef $PC.surname>>
<<set $PC.surname = 0>>
<</if>>
+<<if ndef $PC.faceShape>>
+ <<set $PC.faceShape = "normal">>
+<</if>>
<<if ndef $bodyguardTrains>>
<<set $bodyguardTrains = 1>>
<</if>>
@@ -212,6 +215,9 @@
<<if def $minimumChildAge>>
<<unset $minimumChildAge>>
<</if>>
+<<if def $customValue>>
+ <<unset $customValue>>
+<</if>>
/* pregmod stuff */
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 46bcab1e9afb5aec573e12e98c685665537e451e..ea5fc7730a94ad05c79b98f2d4a67d8d1f3ce5f5 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -166,13 +166,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set _PrivateOwnershipPercentage = Math.trunc(($personalShares/_totalShares)*100)>>
<<set _PublicOwnershipPercentage = Math.trunc(($publicShares/_totalShares)*100)>>
-<<if $personalShares-20000 > $publicShares || $personalShares-20000 > $publicShares || $cash > $sharePrice*20000 || ($publicShares > 20000 && $cash >= $sharePrice*20000)>>
- <<if ndef $customValue>>
- <<set $customValue = 21000>>
- <</if>>
- <br><br>Custom amount:<<textbox "$customValue" $customValue "Corporation Developments">> <<print commaNum($customValue)>>
-<</if>>
-
<span id="CorpAction"> <br><br>
<<if _PrivateOwnershipPercentage < 51>>//You cannot give up majority control.//
@@ -233,17 +226,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $personalShares-$customValue > $publicShares>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $personalShares -= $customValue>>
- <<set $publicShares += $customValue>>
- <<set $cash += Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
- <<replace "#CorpAction">>
- <br>You sold <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ driving the share price down significantly.
- <</replace>>
- <</link>>
- <</if>>
<<else>>
//You cannot give up majority control.//
<</if>>
@@ -298,16 +280,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $personalShares-$customValue > $publicShares>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $publicShares += $customValue>>
- <<set $corpCash += Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
- <<replace "#CorpAction">>
- <br>The corporation issued <<print commaNum($customValue)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@ driving the share price down significantly.
- <</replace>>
- <</link>>
- <</if>>
<<else>>
//You cannot give up majority control.//
<</if>>
@@ -371,17 +343,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $cash > $sharePrice*$customValue>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $personalShares += $customValue>>
- <<set $cash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $corpCash += Math.ceil(($sharePrice*20000)*$customValue/10)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
- <<replace "#CorpAction">>
- <br>You purchased <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ from the corporation driving the share price down significantly.
- <</replace>>
- <</link>>
- <</if>>
<<else>>
//You are unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.//
<</if>>
@@ -437,16 +398,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $publicShares > $customValue && $cash >= $sharePrice*$customValue>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">> <<set $personalShares += $customValue>>
- <<set $publicShares -= $customValue>>
- <<set $cash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
- <<replace "#CorpAction">>
- <br>You bought <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ driving the share price up significantly.
- <</replace>>
- <</link>>
- <</if>>
<<elseif $publicShares > 1000>>
//You are unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.//
<<else>>
@@ -503,16 +454,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $publicShares > $customValue && $corpCash >= $sharePrice*$customValue>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $publicShares -= $customValue>>
- <<set $corpCash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
- <<replace "#CorpAction">>
- <br>The corporation bought back <<print commaNum($customValue)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ driving the share price up significantly.
- <</replace>>
- <</link>>
- <</if>>
<<elseif $publicShares > 1000>>
//The corporation is unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.//
<<else>>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index a98cc8dcbafa948dcb1f047bc5e3a6ec1ff9d70b..a4b89600a7a927ae8e888094f314e63b44d4817a 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -194,7 +194,7 @@ There's a display case behind your desk,
<</if>>
A small mirror resides on your desk, facing you.
-A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.markings == "heavily freckled">>, densely freckled<</if>> face stares back at you.
+A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.markings == "heavily freckled">>, densely freckled<</if>> $PC.faceShape face stares back at you.
<<if ($playerAging != 0) && $PC.birthWeek == 51>>You'll be turning <<print $PC.actualAge+1>> next week.<</if>>
<<PlayerBoobs>>
<<PlayerBelly>>