diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw index 81ba6af24f27800939123ed72a319afe2fb3dc00..ad283eba29856fdd222d8a922abb19408d6d2ce0 100644 --- a/src/js/DefaultRules.tw +++ b/src/js/DefaultRules.tw @@ -1535,7 +1535,7 @@ window.DefaultRules = (function() { } function ProcessPregnancyDrugs(slave, rule) { - if (slave.pregKnown == 1 && rule.pregSpeed != "nds" && slave.breedingMark != 1 && slave.indentureRestrictions < 1 && slave.broodmother == 0) { + if (slave.pregKnown == 1 && rule.pregSpeed != "no default setting" && slave.breedingMark != 1 && slave.indentureRestrictions < 1 && slave.broodmother == 0) { if (rule.pregSpeed == "slow" && slave.preg < 35) { slave.pregControl = "slow gestation" r += `<br>slave.slaveName is pregnant, so she has been put on the gestation slowing agents.` diff --git a/src/js/rulesAssistant.tw b/src/js/rulesAssistant.tw index 9278e161f2cd978ae91f8f853d6a296ab84f3775..9f595633523e4f1dca833391d031191fd6e55fa6 100644 --- a/src/js/rulesAssistant.tw +++ b/src/js/rulesAssistant.tw @@ -66,7 +66,7 @@ window.autoSurgerySelector = function(slave, ruleset) { return (rule.autoSurgery == 1) && this.currentRules.contains(rule.ID); }, slave); - var surgery = {eyes: "no default setting", lactation: "no default setting", cosmetic: "nds", accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: "nds", bodyhair: "nds", hair: "nds", bellyImplant: "no default setting"}; + var surgery = {eyes: "no default setting", lactation: "no default setting", cosmetic: "no default setting", accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: "no default setting", bodyhair: "no default setting", hair: "no default setting", bellyImplant: "no default setting"}; var i, key, ruleSurgery; for (i in appRules) @@ -74,7 +74,7 @@ window.autoSurgerySelector = function(slave, ruleset) { ruleSurgery = appRules[i].surgery; for (key in ruleSurgery) { - if (ruleSurgery[key] != "no default setting" || ruleSurgery[key] != "nds") + if (ruleSurgery[key] != "no default setting" || ruleSurgery[key] != "no default setting") { surgery[key] = ruleSurgery[key]; } diff --git a/src/uncategorized/autosurgerySettings.tw b/src/uncategorized/autosurgerySettings.tw index d3cbdf8375f5536fdda2e7d16aedfbdcc2ef11d7..079ecaf7023041ed2053c8fe1c9788d94483aa45 100644 --- a/src/uncategorized/autosurgerySettings.tw +++ b/src/uncategorized/autosurgerySettings.tw @@ -143,9 +143,9 @@ Cosmetic surgery: <br> -<<if ($currentRule.surgery.cosmetic !== "nds")>> +<<if ($currentRule.surgery.cosmetic !== "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.cosmetic = "nds">> + <<set $currentRule.surgery.cosmetic = "no default setting">> <<RASurgeryChangeCosmetic>> <</link>> | <<else>> @@ -421,9 +421,9 @@ Orifice tightening: <br> -<<if ($currentRule.surgery.holes != "nds")>> +<<if ($currentRule.surgery.holes != "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.holes = "nds">> + <<set $currentRule.surgery.holes = "no default setting">> <<RASurgeryChangeHoles>> <</link>> | <<else>> @@ -458,9 +458,9 @@ Orifice tightening: <</if>> <br> -<<if ($currentRule.surgery.bodyhair != "nds")>> +<<if ($currentRule.surgery.bodyhair != "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.bodyhair = "nds">> + <<set $currentRule.surgery.bodyhair = "no default setting">> <<RASurgeryBodyHair>> <</link>> | <<else>> @@ -497,9 +497,9 @@ Orifice tightening: <</if>> <br> -<<if ($currentRule.surgery.hair != "nds")>> +<<if ($currentRule.surgery.hair != "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.hair = "nds">> + <<set $currentRule.surgery.hair = "no default setting">> <<RASurgeryHair>> <</link>> | <<else>> @@ -523,4 +523,4 @@ Orifice tightening: <<else>> Removal <</if>> -</span> \ No newline at end of file +</span> diff --git a/src/uncategorized/initRules.tw b/src/uncategorized/initRules.tw index 97f0eda7b928bb0b2337380553121462459a3a4b..87d7caad95a099c64025929ed8f04fcdec5fb488 100644 --- a/src/uncategorized/initRules.tw +++ b/src/uncategorized/initRules.tw @@ -224,7 +224,7 @@ eyes: "no default setting", lactation: "no default setting", prostate: "no default setting", - cosmetic: "nds", + cosmetic: "no default setting", accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", @@ -234,7 +234,7 @@ butt: "no default setting", faceShape: "no default setting", lips: "no default setting", - holes: "nds" + holes: "no default setting" }, underArmHColor: "no default setting", underArmHStyle: "no default setting", @@ -346,7 +346,7 @@ eyes: "no default setting", lactation: "no default setting", prostate: "no default setting", - cosmetic: "nds", + cosmetic: "no default setting", accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", @@ -356,7 +356,7 @@ butt: "no default setting", faceShape: "no default setting", lips: "no default setting", - holes: "nds" + holes: "no default setting" }, underArmHColor: "no default setting", underArmHStyle: "no default setting", diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw index 6b4c290ed7408bb91dab37479ca36fc39409716c..6b645e211669646c1cea60007c62ea29aae18211 100644 --- a/src/uncategorized/rulesAssistant.tw +++ b/src/uncategorized/rulesAssistant.tw @@ -17,7 +17,7 @@ <<if ndef $currentRule.facility>> <<set $currentRule.facility = []>> <</if>> <<if ndef $currentRule.excludeFacility>> <<set $currentRule.excludeFacility = []>> <</if>> <<if ndef $currentRule.drug>> <<set $currentRule.drug = "no default setting">> <</if>> - <<if ndef $currentRule.pregSpeed>> <<set $currentRule.pregSpeed = "nds">> <</if>> + <<if ndef $currentRule.pregSpeed>> <<set $currentRule.pregSpeed = "no default setting">> <</if>> <<if $currentRule.growth.boobs != "no default setting">><<set $currentRule.growth.boobs = Number($currentRule.growth.boobs), $currentRule.growth.boobs = Math.clamp($currentRule.growth.boobs,0,48000)>><</if>> @@ -140,7 +140,7 @@ List of rules: <br> <<link "Add a new rule">> - <<set _tempRule = {aphrodisiacs: "no default setting", condition: {id: "false"}, releaseRules: "no default setting", clitSetting: "no default setting", clitSettingXY: "no default setting", clitSettingXX: "no default setting", clitSettingEnergy: "no default setting", speechRules: "no default setting", clothes: "no default setting", collar: "no default setting", shoes: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", aVirginDickAccessory: "no default setting", dickAccessory: "no default setting", bellyAccessory: "no default setting", aVirginButtplug: "no default setting", buttplug: "no default setting", eyeColor: "no default setting", makeup: "no default setting", nails: "no default setting", hColor: "no default setting", hLength: "no default setting", hStyle: "no default setting", pubicHColor: "no default setting", pubicHStyle: "no default setting", nipplesPiercing: "no default setting", areolaePiercing: "no default setting", clitPiercing: "no default setting", vaginaLube: "no default setting", vaginaPiercing: "no default setting", dickPiercing: "no default setting", anusPiercing: "no default setting", lipsPiercing: "no default setting", tonguePiercing: "no default setting", earPiercing: "no default setting", nosePiercing: "no default setting", eyebrowPiercing: "no default setting", navelPiercing: "no default setting", corsetPiercing: "no default setting", boobsTat: "no default setting", buttTat: "no default setting", vaginaTat: "no default setting", dickTat: "no default setting", lipsTat: "no default setting", anusTat: "no default setting", shouldersTat: "no default setting", armsTat: "no default setting", legsTat: "no default setting", backTat: "no default setting", stampTat: "no default setting", curatives: "no default setting", livingRules: "no default setting", relationshipRules: "no default setting", standardPunishment: "no default setting", standardReward: "no default setting", diet: "no default setting", dietCum: "no default setting", dietMilk: "no default setting", muscles: "no default setting", XY: "no default setting", XX: "no default setting", gelding: "no default setting", preg: "no default setting", growth: {boobs: "no default setting", butt: "no default setting", lips: "no default setting", dick: "no default setting", balls: "no default setting"}, autoSurgery: 0, autoBrand: 0, pornFameSpending: "no default setting", dietGrowthSupport: 0, eyewear: "no default setting", assignment: [], excludeAssignment: [], setAssignment: "no default setting", facility: [], excludeFacility: [], excludeSpecialSlaves: true, facilityRemove: false, removalAssignment: "rest", selectedSlaves: [], excludedSlaves: [], surgery: {eyes: "no default setting", lactation: "no default setting", prostate: "no default setting", cosmetic: "nds", accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hair: "nds", bodyhair:"nds", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: "nds", bellyImplant: "no default setting"}, underArmHColor: "no default setting", underArmHStyle: "no default setting", drug: "no default setting", eyes: "no default setting", pregSpeed: "nds", bellyImplantVol: -1}>> + <<set _tempRule = {aphrodisiacs: "no default setting", condition: {id: "false"}, releaseRules: "no default setting", clitSetting: "no default setting", clitSettingXY: "no default setting", clitSettingXX: "no default setting", clitSettingEnergy: "no default setting", speechRules: "no default setting", clothes: "no default setting", collar: "no default setting", shoes: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", aVirginDickAccessory: "no default setting", dickAccessory: "no default setting", bellyAccessory: "no default setting", aVirginButtplug: "no default setting", buttplug: "no default setting", eyeColor: "no default setting", makeup: "no default setting", nails: "no default setting", hColor: "no default setting", hLength: "no default setting", hStyle: "no default setting", pubicHColor: "no default setting", pubicHStyle: "no default setting", nipplesPiercing: "no default setting", areolaePiercing: "no default setting", clitPiercing: "no default setting", vaginaLube: "no default setting", vaginaPiercing: "no default setting", dickPiercing: "no default setting", anusPiercing: "no default setting", lipsPiercing: "no default setting", tonguePiercing: "no default setting", earPiercing: "no default setting", nosePiercing: "no default setting", eyebrowPiercing: "no default setting", navelPiercing: "no default setting", corsetPiercing: "no default setting", boobsTat: "no default setting", buttTat: "no default setting", vaginaTat: "no default setting", dickTat: "no default setting", lipsTat: "no default setting", anusTat: "no default setting", shouldersTat: "no default setting", armsTat: "no default setting", legsTat: "no default setting", backTat: "no default setting", stampTat: "no default setting", curatives: "no default setting", livingRules: "no default setting", relationshipRules: "no default setting", standardPunishment: "no default setting", standardReward: "no default setting", diet: "no default setting", dietCum: "no default setting", dietMilk: "no default setting", muscles: "no default setting", XY: "no default setting", XX: "no default setting", gelding: "no default setting", preg: "no default setting", growth: {boobs: "no default setting", butt: "no default setting", lips: "no default setting", dick: "no default setting", balls: "no default setting"}, autoSurgery: 0, autoBrand: 0, pornFameSpending: "no default setting", dietGrowthSupport: 0, eyewear: "no default setting", assignment: [], excludeAssignment: [], setAssignment: "no default setting", facility: [], excludeFacility: [], excludeSpecialSlaves: true, facilityRemove: false, removalAssignment: "rest", selectedSlaves: [], excludedSlaves: [], surgery: {eyes: "no default setting", lactation: "no default setting", prostate: "no default setting", cosmetic: "no default setting", accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hair: "no default setting", bodyhair:"no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: "no default setting", bellyImplant: "no default setting"}, underArmHColor: "no default setting", underArmHStyle: "no default setting", drug: "no default setting", eyes: "no default setting", pregSpeed: "no default setting", bellyImplantVol: -1}>> <<for _tempRule.ID = 1, _r = 0; _r < _length; _r++>> @@ -1333,7 +1333,7 @@ Contraceptives for fertile slaves: <br> <<if $pregSpeedControl > 0 >> Pregnancy control agents for pregnant slaves: <span id = "pregSpeedControl"></span> -<<rbutton "$currentRule.pregSpeed" "nds">> No changes | +<<rbutton "$currentRule.pregSpeed" "no default setting">> No changes | <<rbutton "$currentRule.pregSpeed" "none">> None | <<rbutton "$currentRule.pregSpeed" "fast">> Fast gestation | <<rbutton "$currentRule.pregSpeed" "slow">> Slow gestation | @@ -2352,7 +2352,7 @@ Relationship rules: <span id="relation">''$currentRule.relationshipRules.''</spa <<set $currentRule.surgery.faceShape = "normal">> <<set $currentRule.surgery.lips = 0>> <<set $currentRule.surgery.holes = 0>> - <<set $currentRule.pregSpeed = "nds">> + <<set $currentRule.pregSpeed = "no default setting">> <<elseif ($currentRule.ID == 2)>> <<set $currentRule.name = "Disobedient Slaves">> @@ -2430,7 +2430,7 @@ Relationship rules: <span id="relation">''$currentRule.relationshipRules.''</spa <<set $currentRule.surgery.faceShape = "no default setting">> <<set $currentRule.surgery.lips = "no default setting">> <<set $currentRule.surgery.holes = 0>> - <<set $currentRule.pregSpeed = "nds">> + <<set $currentRule.pregSpeed = "no default setting">> <<elseif ($currentRule.ID == 3)>> <<set $currentRule.name = "Unhealthy Slaves">> @@ -2507,7 +2507,7 @@ Relationship rules: <span id="relation">''$currentRule.relationshipRules.''</spa <<set $currentRule.surgery.faceShape = "no default setting">> <<set $currentRule.surgery.lips = "no default setting">> <<set $currentRule.surgery.holes = 0>> - <<set $currentRule.pregSpeed = "nds">> + <<set $currentRule.pregSpeed = "no default setting">> <</if>> <<set $defaultRules[$r-1] = $currentRule>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 09db7a012bd70e2f5ca8250e0cd18f98f50c96a2..fc045cc0e36ea5932913e8c1a519e659f373846d 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -2476,9 +2476,9 @@ Your brand design is ''$brandDesign.'' <br> - <<if ($currentRule.surgery.cosmetic !== "nds")>> + <<if ($currentRule.surgery.cosmetic !== "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.cosmetic = "nds">> + <<set $currentRule.surgery.cosmetic = "no default setting">> <<RASurgeryChangeCosmetic>> <</link>> | <<else>> @@ -2753,9 +2753,9 @@ Your brand design is ''$brandDesign.'' <</if>> <br> - <<if ($currentRule.surgery.holes != "nds")>> + <<if ($currentRule.surgery.holes != "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.holes = "nds">> + <<set $currentRule.surgery.holes = "no default setting">> <<RASurgeryChangeHoles>> <</link>> | <<else>> @@ -2794,9 +2794,9 @@ Your brand design is ''$brandDesign.'' <</if>> <br> - <<if ($currentRule.surgery.bodyhair != "nds")>> + <<if ($currentRule.surgery.bodyhair != "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.bodyhair = "nds">> + <<set $currentRule.surgery.bodyhair = "no default setting">> <<RASurgeryBodyHair>> <</link>> | <<else>> @@ -2838,9 +2838,9 @@ Your brand design is ''$brandDesign.'' <</if>> <br> - <<if ($currentRule.surgery.hair != "nds")>> + <<if ($currentRule.surgery.hair != "no default setting")>> <<link "No default setting">> - <<set $currentRule.surgery.hair = "nds">> + <<set $currentRule.surgery.hair = "no default setting">> <<RASurgeryHair>> <</link>> | <<else>>