diff --git a/src/interaction/wardrobeUse.js b/src/interaction/wardrobeUse.js index 2d00eea7b39aada17f8919ed60c5119b6b59abb9..ed249dadbac321db8fb066a8af86812328ab3bf7 100644 --- a/src/interaction/wardrobeUse.js +++ b/src/interaction/wardrobeUse.js @@ -93,7 +93,7 @@ App.UI.Wardrobe.collar = function(slave) { if (slave.fuckdoll !== 0) { return; } - // <<collarDescription>> + // <<= App.Desc.collar($activeSlave)>> let el = document.createElement('div'); let label = document.createElement('div'); diff --git a/src/npc/descriptions/style/collar.js b/src/npc/descriptions/style/collar.js index 4dd8d63f7046c6bae3e842c941d65c04db5571b6..add1e5c611c66014016bf8316baf662b29309512 100644 --- a/src/npc/descriptions/style/collar.js +++ b/src/npc/descriptions/style/collar.js @@ -2,7 +2,7 @@ * @param {App.Entity.SlaveState} slave * @returns {string} */ -App.Desc.clothing = function(slave) { +App.Desc.collar = function(slave) { const r = []; let daddy; const pregCollar = either(1, 2, 3); @@ -28,14 +28,9 @@ App.Desc.clothing = function(slave) { r.push(`"Knock me up!"`); } else if (slave.pregKnown === 1) { if (slave.pregType === 0) { - r.push(`"1`); + r.push(`"1 baby`); } else { - r.push(`${slave.pregType}`); - } - if (slave.pregType > 1) { - r.push(`babies`); - } else { - r.push(`baby`); + r.push(`${slave.pregType} babies`); } r.push(`on board!"`); } else { @@ -44,8 +39,8 @@ App.Desc.clothing = function(slave) { } else if (pregCollar === 2) { if (slave.pregWeek < 0) { r.push(`"${num(slave.pregWeek * -1)}`); - if (slave.pregWeek !== -1) { - r.push(`weeks`); + if (slave.pregWeek === -1) { + r.push(`week`); } else { r.push(`weeks`); } @@ -72,7 +67,7 @@ App.Desc.clothing = function(slave) { r.push(`"Put a baby in me today!"`); } else if (slave.pregSource === -1) { r.push(`"Womb claimed by my ${WrittenMaster(slave)}!"`); - } else if ((slave.pregSource === 0 || slave.pregSource === -2 || slave.pregSource === -5)) { + } else if (slave.pregSource === 0 || slave.pregSource === -2 || slave.pregSource === -5) { r.push(`"Baby made by slutting around!"`); } else if (slave.pregSource === -7) { r.push(`"My baby was made with science!"`); @@ -131,9 +126,9 @@ App.Desc.clothing = function(slave) { if (slave.collar === "cruel retirement counter") { r.push(`heavy metal collar`); } else { - r.push(`nice collar, almost a necklace, `); + r.push(`nice collar, almost a necklace,`); } - r.push(` with a small numerical display reading`); + r.push(`with a small numerical display reading`); if (slave.indenture > -1) { r.push(`${slave.indenture}, the number of weeks left in ${his} indenture.`); } else if (V.policies.retirement.sex > 0) { diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 822d42e674e25d36ccce1126c6c289c60dfdef3b..bcb8415400947af71b7a41ac986777af78a7ea2e 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1915,7 +1915,7 @@ $He is <<if ($showClothing == 1) && ($saleDescription == 0)>> <<if $activeSlave.fuckdoll == 0>> - <<collarDescription>> + <<= App.Desc.collar($activeSlave)>> <<= App.Desc.faceAccessory($activeSlave)>> <<= App.Desc.mouthAccessory($activeSlave)>> <<if ($activeSlave.relationship > 4)>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 4053c32719b04526580855fa44ba35bbc445d489..626dc4abdd3cac43671a7ca01fd97723ca642199 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -1,9 +1,5 @@ :: clothing description widgets [widget nobr] -<<widget "collarDescription">> - -<</widget>> - <<widget "armwearDescription">> /* check clothing descriptions from above for glove references */ <<if (hasAnyArms($activeSlave))>>