Skip to content
Snippets Groups Projects
Commit 50d6b577 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-dev' into 'pregmod-master'

saInflation.js make cow a slave object

See merge request pregmodfan/fc-pregmod!6305
parents 4e6e7c1c 098d6f8f
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ window.saInflation = (function saInflation() { ...@@ -30,7 +30,7 @@ window.saInflation = (function saInflation() {
dupeTextFlag = 0; dupeTextFlag = 0;
if (slave.inflationMethod === 3) { if (slave.inflationMethod === 3) {
cow = slave.inflationType === "milk" ? V.slaveIndices[slave.milkSource] : V.slaveIndices[slave.cumSource]; cow = slave.inflationType === "milk" ? getSlave(slave.milkSource) : getSlave(slave.cumSource);
} }
({ ({
...@@ -68,8 +68,8 @@ window.saInflation = (function saInflation() { ...@@ -68,8 +68,8 @@ window.saInflation = (function saInflation() {
slave.inflationType = "none"; slave.inflationType = "none";
slave.inflationMethod = 0; slave.inflationMethod = 0;
SetBellySize(slave); SetBellySize(slave);
} else if (slave.inflationType === "milk" && slave.inflationMethod === 3 && V.slaves[cow].lactation === 0) { } else if (slave.inflationType === "milk" && slave.inflationMethod === 3 && cow.lactation === 0) {
r.push(`${V.slaves[cow].slaveName} is no longer lactating and thus can no longer keep slave.slaveName filled with milk. <span class="yellow">${His} inflation regimen has been ended.</span>`); r.push(`${cow.slaveName} is no longer lactating and thus can no longer keep slave.slaveName filled with milk. <span class="yellow">${His} inflation regimen has been ended.</span>`);
slave.inflation = 0; slave.inflation = 0;
slave.inflationType = "none"; slave.inflationType = "none";
slave.inflationMethod = 0; slave.inflationMethod = 0;
...@@ -81,8 +81,8 @@ window.saInflation = (function saInflation() { ...@@ -81,8 +81,8 @@ window.saInflation = (function saInflation() {
slave.inflationType = "none"; slave.inflationType = "none";
slave.inflationMethod = 0; slave.inflationMethod = 0;
SetBellySize(slave); SetBellySize(slave);
} else if (slave.inflationType === "cum" && slave.inflationMethod === 3 && V.slaves[cow].balls === 0) { } else if (slave.inflationType === "cum" && slave.inflationMethod === 3 && cow.balls === 0) {
r.push(`${V.slaves[cow].slaveName} no longer has testicles and thus can no longer keep slave.slaveName filled with cum. <span class="yellow">${His} inflation regimen has been ended.</span>`); r.push(`${cow.slaveName} no longer has testicles and thus can no longer keep slave.slaveName filled with cum. <span class="yellow">${His} inflation regimen has been ended.</span>`);
slave.inflation = 0; slave.inflation = 0;
slave.inflationType = "none"; slave.inflationType = "none";
slave.inflationMethod = 0; slave.inflationMethod = 0;
...@@ -106,28 +106,27 @@ window.saInflation = (function saInflation() { ...@@ -106,28 +106,27 @@ window.saInflation = (function saInflation() {
slave.bellyFluid = 2000; slave.bellyFluid = 2000;
SetBellySize(slave); SetBellySize(slave);
} }
} /* else if ((slave.inflationType === "milk" || slave.inflationType === "cum") && slave.inflationMethod === 3) { } else if ((slave.inflationType === "milk" || slave.inflationType === "cum") && slave.inflationMethod === 3) {
harvest = (slave.inflationType === "milk") ? Math.trunc(milkAmount(cow) / 14) : Math.trunc(cumAmount(cow) / 70); harvest = (slave.inflationType === "milk") ? Math.trunc(milkAmount(cow) / 14) : Math.trunc(cumAmount(cow) / 70);
if (slave.inflation === 3 && harvest < 8) { if (slave.inflation === 3 && harvest < 8) {
r.push(`${V.slaves[cow].slaveName} is having trouble producing the requested amount of ${slave.inflationType}`); r.push(`${cow.slaveName} is having trouble producing the requested amount of ${slave.inflationType}`);
if (harvest < 2) { if (harvest < 2) {
r.push(`needed to even fill ${him}. <span class="yellow">${His} inflation regimen has been ended.</span>`); r.push(`needed to even fill ${him}. <span class="yellow">${His} inflation regimen has been ended.</span>`);
} else if (harvest < 4) { } else if (harvest < 4) {
r.push(`so ${his} serving of ${slave.inflationType === "cum" ? 'cum' : 'milk'} has been reduced to a mere two liters.`); r.push(`so ${his} serving has been reduced to a mere two liters.`);
} else { } else {
r.push(`so ${his} serving of ${slave.inflationType === "cum" ? 'cum' : 'milk'} has been reduced to four liters.`); r.push(`so ${his} serving has been reduced to four liters.`);
} }
} else if (slave.inflation === 2 && harvest < 4) { } else if (slave.inflation === 2 && harvest < 4) {
if (harvest < 2) { if (harvest < 2) {
r.push(`needed to even fill ${him}. <span class="yellow">${His} inflation regimen has been ended.</span>`); r.push(`needed to even fill ${him}. <span class="yellow">${His} inflation regimen has been ended.</span>`);
} else { } else {
r.push(`so ${his} serving of ${slave.inflationType === "cum" ? 'cum' : 'milk'} has been reduced to two liters.`); r.push(`so ${his} serving has been reduced to two liters.`);
} }
} else if (slave.inflation === 1 && harvest < 2) { } else if (slave.inflation === 1 && harvest < 2) {
r.push(`and can't even give ${him} a simple meal. <span class="yellow">${His} inflation regimen has been ended.</span>`); r.push(`and can't even give ${him} a simple meal. <span class="yellow">${His} inflation regimen has been ended.</span>`);
} }
} }
*/
} }
/** /**
...@@ -346,10 +345,10 @@ window.saInflation = (function saInflation() { ...@@ -346,10 +345,10 @@ window.saInflation = (function saInflation() {
} else if (slave.inflationMethod === 2) { } else if (slave.inflationMethod === 2) {
r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`); r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`);
} else if (slave.inflationMethod === 3) { } else if (slave.inflationMethod === 3) {
r.push(`suckles from ${V.slaves[cow].slaveName} until ${his} stomach is`); r.push(`suckles from ${cow.slaveName} until ${his} stomach is`);
V.slaves[cow].lactationDuration = 2; cow.lactationDuration = 2;
V.slaves[cow].boobs -= V.slaves[cow].boobsMilk; cow.boobs -= cow.boobsMilk;
V.slaves[cow].boobsMilk = 0; cow.boobsMilk = 0;
} }
if (slave.inflation === 3) { if (slave.inflation === 3) {
r.push(`<span class="red">painfully bloated</span> with nearly two gallons`); r.push(`<span class="red">painfully bloated</span> with nearly two gallons`);
...@@ -373,10 +372,10 @@ window.saInflation = (function saInflation() { ...@@ -373,10 +372,10 @@ window.saInflation = (function saInflation() {
} else if (slave.inflationMethod === 2) { } else if (slave.inflationMethod === 2) {
r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`); r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`);
} else if (slave.inflationMethod === 3) { } else if (slave.inflationMethod === 3) {
r.push(`sucks from ${V.slaves[cow].slaveName} until ${his} stomach is`); r.push(`sucks from ${cow.slaveName} until ${his} stomach is`);
V.slaves[cow].lactationDuration = 2; cow.lactationDuration = 2;
V.slaves[cow].boobs -= V.slaves[cow].boobsMilk; cow.boobs -= cow.boobsMilk;
V.slaves[cow].boobsMilk = 0; cow.boobsMilk = 0;
} }
if (slave.inflation === 3) { if (slave.inflation === 3) {
r.push(`<span class="red">painfully bloated</span> with nearly two gallons`); r.push(`<span class="red">painfully bloated</span> with nearly two gallons`);
...@@ -424,10 +423,10 @@ window.saInflation = (function saInflation() { ...@@ -424,10 +423,10 @@ window.saInflation = (function saInflation() {
} else if (slave.inflationMethod === 2) { } else if (slave.inflationMethod === 2) {
r.push(`fill ${his} rear with nearly`); r.push(`fill ${his} rear with nearly`);
} else if (slave.inflationMethod === 3) { } else if (slave.inflationMethod === 3) {
r.push(`keep suckling from ${V.slaves[cow].slaveName} until ${he} is filled with nearly`); r.push(`keep suckling from ${cow.slaveName} until ${he} is filled with nearly`);
V.slaves[cow].lactationDuration = 2; cow.lactationDuration = 2;
V.slaves[cow].boobs -= V.slaves[cow].boobsMilk; cow.boobs -= cow.boobsMilk;
V.slaves[cow].boobsMilk = 0; cow.boobsMilk = 0;
} }
if (slave.inflation === 3) { if (slave.inflation === 3) {
r.push(`two gallons of milk, `); r.push(`two gallons of milk, `);
...@@ -461,7 +460,7 @@ window.saInflation = (function saInflation() { ...@@ -461,7 +460,7 @@ window.saInflation = (function saInflation() {
} else if (slave.inflationMethod === 2) { } else if (slave.inflationMethod === 2) {
r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`); r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`);
} else if (slave.inflationMethod === 3) { } else if (slave.inflationMethod === 3) {
r.push(`sucks ${V.slaves[cow].slaveName}'s ${(V.slaves[cow].dick > 0) ? `cock` : `cum hole`} until ${his} stomach is`); r.push(`sucks ${cow.slaveName}'s ${(cow.dick > 0) ? `cock` : `cum hole`} until ${his} stomach is`);
} }
if (slave.inflation === 3) { if (slave.inflation === 3) {
r.push(`<span class="red">painfully bloated</span> with nearly two gallons`); r.push(`<span class="red">painfully bloated</span> with nearly two gallons`);
...@@ -490,7 +489,7 @@ window.saInflation = (function saInflation() { ...@@ -490,7 +489,7 @@ window.saInflation = (function saInflation() {
} else if (slave.inflationMethod === 2) { } else if (slave.inflationMethod === 2) {
r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`); r.push(`fills ${his} rectum from the dairy tap until ${his} stomach is`);
} else if (slave.inflationMethod === 3) { } else if (slave.inflationMethod === 3) {
r.push(`sucks ${V.slaves[cow].slaveName}'s ${(V.slaves[cow].dick > 0) ? `cock` : `cum hole`} until ${his} stomach is`); r.push(`sucks ${cow.slaveName}'s ${(cow.dick > 0) ? `cock` : `cum hole`} until ${his} stomach is`);
} }
if (slave.inflation === 3) { if (slave.inflation === 3) {
r.push(`<span class="red">painfully bloated</span> with nearly two gallons`); r.push(`<span class="red">painfully bloated</span> with nearly two gallons`);
...@@ -538,7 +537,7 @@ window.saInflation = (function saInflation() { ...@@ -538,7 +537,7 @@ window.saInflation = (function saInflation() {
} else if (slave.inflationMethod === 2) { } else if (slave.inflationMethod === 2) {
r.push(`fill ${his} rear with nearly`); r.push(`fill ${his} rear with nearly`);
} else if (slave.inflationMethod === 3) { } else if (slave.inflationMethod === 3) {
r.push(`sucks ${V.slaves[cow].slaveName}'s ${(V.slaves[cow].dick > 0) ? `cock` : `cum hole`} until ${he} is filled with nearly`); r.push(`sucks ${cow.slaveName}'s ${(cow.dick > 0) ? `cock` : `cum hole`} until ${he} is filled with nearly`);
} }
if (slave.inflation === 3) { if (slave.inflation === 3) {
r.push(`two gallons of cum, `); r.push(`two gallons of cum, `);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment