diff --git a/Changelog.txt b/Changelog.txt
index 01c43c94873ba06a27f64372dd1d42c293153ece..b5ef521fd3f63d2a9f2115207da7cbf15d0e309f 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,6 +2,7 @@ Pregmod
0.10.7.1-3.1.x
+ -eye object overhaul
-added overflow feedback to demand
-added pit assign/remove rules to the RA
-fixes and cleaning
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 5e112cd441b3d553bb57fc1fbf1e082a0493d2bd..403be6e627eec52fda8b2ce3c787548b74266065 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -1049,7 +1049,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
} else if (slave.attrXY <= 85) {
if (slave.attrXX <= 15) {
- r += ` ${His} sexual disgust with men makes ${him} a poor slut.`;
+ r += ` ${His} sexual disgust with women makes ${him} a poor slut.`;
} else if (slave.attrXX <= 85) {
r += ` ${His} indifference to men and women makes ${him} a poor slut.`;
} else if (slave.attrXX <= 95) {
@@ -1394,7 +1394,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.nipples === "fuckable") {
mammaryUse *= 2;
}
- let penetrativeUse = 0;
+ penetrativeUse = 0;
if (canDoVaginal(slave) && slave.clit > 1) {
penetrativeUse += (V.penetrativeUseWeight + (slave.skill.vaginal / 30) + slave.clit);
}
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index cd9bf07b52090d1391acff79d74f994d9eb081b2..cddbe51476ba97ea1222c469acbd20367dfa3c22 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -1120,7 +1120,7 @@ window.saWhore = (function saWhore() {
}
} else if (slave.attrXY <= 85) {
if (slave.attrXX <= 15) {
- r += ` ${His} sexual disgust with men makes ${him} a poor whore.`;
+ r += ` ${His} sexual disgust with women makes ${him} a poor whore.`;
} else if (slave.attrXX <= 85) {
r += ` ${His} indifference to men and women makes ${him} a poor whore.`;
} else if (slave.attrXX <= 95) {
@@ -1476,7 +1476,7 @@ window.saWhore = (function saWhore() {
if (slave.nipples === "fuckable") {
mammaryUse *= 2;
}
- let penetrativeUse = 0;
+ penetrativeUse = 0;
if (canDoVaginal(slave) && slave.clit > 1) {
penetrativeUse += (V.penetrativeUseWeight + (slave.skill.vaginal / 30) + slave.clit);
}
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index e0110d3a93c7d624c20470b7e90aa6a92f8f77c3..5618518cf7614ab90cc8bd27c367d5e21537a471 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -102,7 +102,7 @@ Economic forecast:
<<else>>
Current nationality distributions are [[Adjust the slave trade|Customize Slave Trade][$customWA = 0, $customVariety = 1]] | [[Stop customizing|Intro Summary][delete $customVariety]]
<<if ndef $nationalitiescheck>> /* NGP: regenerate $nationalitiescheck from previous game's $nationalities array */
- <<silently>><<include "Customize Slave Trade">><</silently>>
+ <div id="SilentlyButWithStyle" style="display: none;"><<include "Customize Slave Trade">></div>
<</if>>
<br style="clear:both"><hr style="margin:0">
<<set _len = Object.keys($nationalitiescheck).length>>
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 17b8c6211631009455eda771477be7275123470f..1e125bf1c755c78a549de50976b58b8540034d91 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -2515,6 +2515,7 @@ App.Entity.SlaveState = class SlaveState {
porn: {
fame: {}
},
+ rules: {},
skill: {},
custom: {},
};
diff --git a/src/js/surgery.js b/src/js/surgery.js
index bbdff3f18441d3843366313ba35dfc166f1a58b6..cd8dd7642ffc9968fd05b538a66652a2d219873c 100644
--- a/src/js/surgery.js
+++ b/src/js/surgery.js
@@ -553,7 +553,7 @@ window.eyeSurgery = function(slave, side, action) {
}
function addEye(slave) {
- slave.eye[side] = new App.Entity.EyeState();
+ slave.eye[side] = new App.Entity.SingleEyeState();
resetEyeColor(slave, side);
}
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 600cf11a7a563fcb19c87fd1370854b3861aaff0..c03143a04e2d9b42f5fb35358cfc6460564d9f89 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -561,22 +561,22 @@
<<run delete $args[0].auricle>>
<</if>>
-<<if ndef _Slave.readyProsthetics>>
- <<set _Slave.readyProsthetics = []>>
+<<if ndef $args[0].readyProsthetics>>
+ <<set $args[0].readyProsthetics = []>>
<</if>>
-<<if def _Slave.readyLimbs>>
- <<for _k = 0; _k < _Slave.readyLimbs.length; _k++>>
- <<switch _Slave.readyLimbs[_k].type>>
+<<if def $args[0].readyLimbs>>
+ <<for _k = 0; _k < $args[0].readyLimbs.length; _k++>>
+ <<switch $args[0].readyLimbs[_k].type>>
<<case -1>>
- <<run addProsthetic(_Slave, "basicL")>>
+ <<run addProsthetic($args[0], "basicL")>>
<<case -2>>
- <<run addProsthetic(_Slave, "sexL")>>
+ <<run addProsthetic($args[0], "sexL")>>
<<case -3>>
- <<run addProsthetic(_Slave, "beautyL")>>
+ <<run addProsthetic($args[0], "beautyL")>>
<<case -4>>
- <<run addProsthetic(_Slave, "combatL")>>
+ <<run addProsthetic($args[0], "combatL")>>
<<case -5>>
- <<run addProsthetic(_Slave, "cyberneticL")>>
+ <<run addProsthetic($args[0], "cyberneticL")>>
<</switch>>
<</for>>
<</if>>
@@ -1249,7 +1249,7 @@ $activeSlave.slaveName is up for review:
<<widget "PlayerSkin">>
<<replace #skin>>
- You have $PC.skin skin.
+ You have $PC.origSkin skin.
<</replace>>
<</widget>>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 25f6e1ba852d22febeef056df1eb6142bb1b93ba..7d042a64219b2b0f02049ba593764c8e466edd07 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -53,4 +53,5 @@ You <<if $cash >= _fee>>have<<else>>lack<</if>> the funds to bring more than $sl
Select up to $slavesToImportMax slaves to be imported into a new game and then click [[here.|init][$saveImported = 1,$oldCareer = "undefined",$slavesToImport = 0]]
+<br>
<<print App.UI.SlaveList.listNGPSlaves()>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 12f7f021310e0d2bb7bbe1254c215577beda21f4..6861bfed9a2d4e72faa0b8af5503f5a9683bdedc 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1695,7 +1695,7 @@
<</if>>
<<else>>
successfully @@.green;increases $his attraction to girls@@ by pleasuring $him when $he's around them.
- <<set $slaves[$i].attrXX += 7+$assistant+$assistant>>
+ <<set $slaves[$i].attrXX += 4+$assistant+$assistant>>
<<if $slaves[$i].energy < 80>>
This has the secondary effect of slightly @@.green;enhancing $his libido.@@
<<set $slaves[$i].energy++>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 37345b29a2c5e88c476f3304f4d0013187637884..b1f5f33024f02e735cb51521a642cc8cb42d19f4 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -432,7 +432,7 @@
<<set _seed -= (6 - (6*$slaves[$i].skill.entertainment/100))>>
<<set _seed -= (3 - $slaves[$i].face)>>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant < -15>>
- <<set _seed = Math.min(_seed, (($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10)>>
+ <<set _seed = Math.min(_seed, ($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10)>>
<</if>>
<<if _seed < 0>> /*catches overload from very high entertainment*/
<<set $recruiterProgress += _seed/10>>