diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 20545982b49eb8f68280ad5aae9960417f91d4e9..1ceb069520c5fbecc5c8c3e6f17e421bd6fed117 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -2551,6 +2551,7 @@ window.emptyDefaultRule = function emptyDefaultRule() {
nails: "no default setting",
hColor: "no default setting",
hLength: "no default setting",
+ haircuts: "no default setting",
hStyle: "no default setting",
pubicHColor: "no default setting",
pubicHStyle: "no default setting",
@@ -2631,6 +2632,7 @@ window.emptyDefaultRule = function emptyDefaultRule() {
pregSpeed: "no default setting",
bellyImplantVol: -1,
teeth: "no default setting",
+ label: "no default setting",
}
};
return rule;
@@ -2869,7 +2871,7 @@ window.Height = (function(){
"Finnish": 165.3, "French Guianan": 157, "French Polynesian": undefined, "French": 162.5, "Gabonese": 158.4, "Gambian": 157.8, "Georgian": 160.5, "German": 162.8, "Ghanan": 158.5,
"Greek": 165, "Greenlandic": undefined, "Grenadian": undefined, "Guamanian": undefined, "Guatemalan": 147.3, "Guinean": 158.8, "Guyanese": 157.9, "Haitian": 158.6, "Honduran": 152.0, "Hungarian": 164,
"I-Kiribati": undefined, "Icelandic": 168, "Indian": 151.9, "Indonesian": 147, "Iranian": 157.2, "Iraqi": 155.8, "Irish": 163, "Israeli": 166, "Italian": 162.5, "Ivorian": 158.9,
- "Jamaican": 160.8, "Japanese": 158, "Jordanian": 158.2, "Kazakh": 159.8, "Kenyan": 159.4, "Kittitian": 156.9, "Korean": 156.15, "Kosovan": undefined, "Kurdish": undefined, "Kuwaiti": 156.1,
+ "Jamaican": 160.8, "Japanese": 158, "Jordanian": 158.2, "Kazakh": 159.8, "Kenyan": 159.4, "Kittitian": 156.9, "Korean": 156.15, "Kosovan": 165.7, "Kurdish": undefined, "Kuwaiti": 156.1,
"Kyrgyz": 158.6, "Laotian": undefined, "Latvian": 165.7, "Lebanese": 165, "Liberian": 157.3, "Libyan": 160.5, "a Liechtensteiner": 164.3, "Lithuanian": 167.5, "Luxembourgian": 164.8,
"Macedonian": undefined, "Malagasy": 154.3, "Malawian": 155, "Malaysian": 154.7, "Maldivian": undefined, "Malian": 160.4, "Maltese": 159.9, "Marshallese": undefined, "Mauritanian": undefined,
"Mauritian": undefined, "Mexican": 154, "Micronesian": undefined, "Moldovan": 161.2, "Monégasque": undefined, "Mongolian": 157.7, "Montenegrin": 168.4, "Moroccan": 158.5, "Mosotho": 157.6,
@@ -2895,8 +2897,8 @@ window.Height = (function(){
"Egyptian": 170.3, "Emirati": 170.3, "Equatoguinean": undefined, "Eritrean": undefined, "Estonian": 179.1, "Ethiopian": undefined, "Fijian": 170.4, "Filipina": 163.5, "Finnish": 178.9,
"French Guianan": 168, "French Polynesian": undefined, "French": 175.6, "Gabonese": undefined, "Gambian": 168, "Georgian": 172.7, "German": 175.4, "Ghanan": 169.5, "Greek": 177, "Greenlandic": undefined,
"Grenadian": undefined, "Guamanian": undefined, "Guatemalan": 157.5, "Guinean": undefined, "Guyanese": 168.6, "Haitian": undefined, "Honduran": undefined, "Hungarian": 176, "I-Kiribati": undefined, "Icelandic": 181,
- "Indian": 164.7, "Indonesian": 158, "Iranian": 170.3, "Iraqi": 165.4, "Irish": 177, "Israeli": 177, "Italian": 176.5, "Ivorian": undefined, "Jamaican": 171.8, "Japanese": 172, "Jordanian": undefined,
- "Kazakh": 169, "Kenyan": 170.0, "Kittitian": 164.4, "Korean": 168.15, "Kosovan": undefined, "Kurdish": undefined, "Kuwaiti": 169.2, "Kyrgyz": 170.4, "Laotian": 160.5, "Latvian": 174.2, "Lebanese": 176,
+ "Indian": 164.7, "Indonesian": 158, "Iranian": 170.3, "Iraqi": 165.4, "Irish": 177, "Israeli": 177, "Italian": 176.5, "Ivorian": 170.1, "Jamaican": 171.8, "Japanese": 172, "Jordanian": undefined,
+ "Kazakh": 169, "Kenyan": 170.0, "Kittitian": 164.4, "Korean": 168.15, "Kosovan": 179.5, "Kurdish": undefined, "Kuwaiti": 169.2, "Kyrgyz": 170.4, "Laotian": 160.5, "Latvian": 174.2, "Lebanese": 176,
"Liberian": undefined, "Libyan": 171.3, "a Liechtensteiner": 175.4, "Lithuanian": 177.2, "Luxembourgian": 179.9, "Macedonian": undefined, "Malagasy": 161.5, "Malawian": 166, "Malaysian": 166.3,
"Maldivian": undefined, "Malian": 171.3, "Maltese": 169.9, "Marshallese": undefined, "Mauritanian": undefined, "Mauritian": undefined, "Mexican": 167, "Micronesian": undefined, "Moldovan": undefined,
"Monégasque": undefined, "Mongolian": 168.4, "Montenegrin": 183.2, "Moroccan": 172.7, "Mosotho": undefined, "Motswana": undefined, "Mozambican": undefined, "Namibian": undefined, "Nauruan": undefined,
@@ -10837,17 +10839,6 @@ window.HSM = function() {
else if (State.variables.PC.hacking >= 100)
return .75;
}
-
-/*:: Slave Summary Widgets JS [script]*/
-
-window.clearSummaryCache = function clearSummaryCache(slave) {
- if (!slave)
- setup.summaryCache = {};
- else if (slave instanceof Object && slave.ID !== Infinity && slave.ID !== -Infinity)
- setup.summaryCache[slave.ID] = undefined;
- else
- setup.summaryCache[slave] = undefined;
-};
/*:: colorModeJS [script]*/
@@ -11066,6 +11057,7 @@ window.DefaultRules = (function() {
ProcessSmartPiercings(slave, rule);
ProcessTattoos(slave, rule);
ProcessPorn(slave, rule);
+ ProcessLabel(slave, rule);
return r;
}
@@ -12782,6 +12774,18 @@ window.DefaultRules = (function() {
}
}
+ if (rule.haircuts !== undefined && (rule.haircuts !== "no default setting")) {
+ if (slave.bald != 1) {
+ if (rule.haircuts === 1 && slave.haircuts !== 1) {
+ r += `<br>${slave.slaveName}'s hair will now be maintained at ${lengthToEitherUnit(slave.hLength)} long.`;
+ slave.haircuts = 1;
+ } else if (rule.haircuts === 0 && slave.haircuts !== 0) {
+ r += `<br>${slave.slaveName}'s hair length will no longer be maintained.`;
+ slave.haircuts = 0;
+ }
+ }
+ }
+
if (rule.pubicHColor !== undefined && (rule.pubicHColor !== "no default setting")) {
if (slave.pubicHStyle != "bald" && slave.pubicHStyle != "hairless") {
if ((slave.pubicHColor !== rule.pubicHColor)) {
@@ -13184,6 +13188,13 @@ window.DefaultRules = (function() {
}
}
}
+
+ function ProcessLabel(slave, rule) {
+ if (rule.label !== "no default setting" && slave.customLabel !== rule.label) {
+ slave.customLabel = rule.label;
+ r += `<br>${slave.slaveName}'s label has been set to ${rule.label}`;
+ }
+ }
return DefaultRules;
})();
@@ -14080,6 +14091,7 @@ window.rulesAssistantOptions = (function() {
this.appendChild(new AutosurgerySection());
this.appendChild(new RegimenSection());
this.appendChild(new BehaviourSection());
+ this.appendChild(new OtherSection());
}
render() {
@@ -14150,6 +14162,13 @@ window.rulesAssistantOptions = (function() {
this.appendChild(new PornList());
}
}
+
+ class OtherSection extends Section {
+ constructor() {
+ super("Other Settings");
+ this.appendChild(new LabelList());
+ }
+ }
class CosmeticSection extends Section {
constructor() {
@@ -14159,6 +14178,7 @@ window.rulesAssistantOptions = (function() {
this.appendChild(new MakeupList());
this.appendChild(new NailsList());
this.appendChild(new HairLengthList());
+ this.appendChild(new HaircutsList());
this.appendChild(new HairColourList());
this.appendChild(new HairStyleList());
this.appendChild(new PubicHairColourList());
@@ -15266,6 +15286,20 @@ window.rulesAssistantOptions = (function() {
this.onchange = (value) => current_rule.set.hLength = value;
}
}
+
+ class HaircutsList extends List {
+ constructor() {
+ const pairs = [
+ ["no default setting"],
+ ["maintain hair length", 1],
+ ["do not maintain hair length", 0]
+ ];
+ super("Hair length maintenance", pairs);
+ this.setValue(current_rule.set.haircuts);
+ this.onchange = (value) => current_rule.set.haircuts = value;
+ }
+ }
+
class HairColourList extends List {
constructor() {
const pairs = [
@@ -16307,6 +16341,17 @@ window.rulesAssistantOptions = (function() {
}
}
+ class LabelList extends List {
+ constructor() {
+ const items = [
+ ["no default setting"],
+ ];
+ super("Custom label", items, true);
+ this.setValue(current_rule.set.label);
+ this.onchange = (value) => current_rule.set.label = value;
+ }
+ }
+
return rulesAssistantOptions;
})();
@@ -17559,7 +17604,7 @@ window.SlaveSummaryUncached = (function(){
short_race(slave);
else if (V.abbreviateRace === 2)
long_race(slave);
- r += `</span>`;
+ r += `</span> `;
}
if (V.abbreviateNationality === 1)
short_nationality(slave);
@@ -17568,7 +17613,7 @@ window.SlaveSummaryUncached = (function(){
if (V.abbreviatePhysicals === 1)
short_skin(slave);
else
- r += `<span class="pink">${slave.skin.charAt(0).toUpperCase() + slave.skin.slice(1)} skin.</span>`;
+ r += `<span class="pink">${slave.skin.charAt(0).toUpperCase() + slave.skin.slice(1)} skin.</span> `;
if (V.abbreviateGenitalia === 1)
short_genitals(slave);
else if (V.abbreviateGenitalia === 2)
@@ -17617,14 +17662,14 @@ window.SlaveSummaryUncached = (function(){
short_sex_skills(slave);
if (slave.combatSkill > 0)
r += `C`;
- r += `</span>`;
+ r += `</span> `;
short_prestige(slave);
} else if (V.abbreviateSkills === 2) {
long_intelligence(slave);
long_sex_skills(slave);
if (slave.combatSkill > 0)
r += `Trained fighter.`;
- r += `</span>`;
+ r += `</span> `;
long_prestige(slave);
}
if (V.abbreviateMental === 1) {
@@ -18376,7 +18421,7 @@ window.SlaveSummaryUncached = (function(){
} else if (slave.pregType >= 20) {
r += `a brood of offspring.`;
} else if (slave.pregType >= 10) {
- r += `slave.pregType babies.`;
+ r += `${slave.pregType} babies.`;
} else if (slave.pregType === 9) {
r += `nonuplets.`;
} else if (slave.pregType === 8) {
@@ -20124,7 +20169,7 @@ window.SlaveSummaryUncached = (function(){
let _SSkills = (slave.analSkill + slave.oralSkill);
r += `<span class="aquamarine">`;
if (((_SSkills + slave.whoreSkill + slave.entertainSkill) >= 400) && ((slave.vagina < 0) || (slave.vaginalSkill >= 100))) {
- r += `Masterful Sex Slave.`;
+ r += `Masterful Sex Slave. `;
} else {
_SSkills += slave.vaginalSkill;
if (_SSkills > 180) {
@@ -20138,6 +20183,7 @@ window.SlaveSummaryUncached = (function(){
} else {
r += `Sexually unskilled${V.summaryStats? `[${Math.trunc(_SSkills)}]` : ''}.`;
}
+ r += " ";
if (slave.whoreSkill >= 100) {
r += `Masterful whore${V.summaryStats? `[${slave.whoreSkill}]`: ''}.`;
} else if (slave.whoreSkill >= 60) {
@@ -20147,6 +20193,7 @@ window.SlaveSummaryUncached = (function(){
} else if (slave.whoreSkill >= 10) {
r += `Basic whore${V.summaryStats? `[${slave.whoreSkill}]`: ''}.`;
}
+ r += " ";
if (slave.entertainSkill >= 100) {
r += `Masterful entertainer${V.summaryStats? `[${slave.entertainSkill}]`: ''}.`;
} else if (slave.entertainSkill >= 60) {
@@ -20156,8 +20203,8 @@ window.SlaveSummaryUncached = (function(){
} else if (slave.entertainSkill >= 10) {
r += `Basic entertainer${V.summaryStats? `[${slave.entertainSkill}]`: ''}.`;
}
+ r += " ";
}
- r += " ";
}
function long_prestige(slave) {
@@ -21963,3 +22010,4 @@ window.SlaveSummaryUncached = (function(){
return SlaveSummaryUncached;
})();
+