diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index a5a9d374238b6dfb79375c2a97bb2856d0fcdec0..08a8bb0fc4bd56778caf3bf96eccb0f08ff781ab 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -715,9 +715,9 @@ App.Desc.scar = function(slave, surface) { case 4: return "burns"; case 5: - return ""; + return "a menacing scar"; case 6: - return ""; + return "an exotic scar"; case 7: if (surface === "belly") { return "a cSection"; @@ -755,7 +755,7 @@ App.Desc.scar = function(slave, surface) { counter++; surface = App.Desc.oppositeSides(bodyPart); if (slave.scar[surface.center]) { // center defined, body part has no mirror. - r += `${describeScarInt(slave, surface.center)} scared into the flesh of ${his} ${surface.center}`; + r += `${describeScarInt(slave, surface.center)} on ${his} ${surface.center}`; } else { // Center not defined, body part has a mirror. if (!slave.scar[surface.left] && !slave.scar[surface.right]) { // no marks @@ -764,16 +764,16 @@ App.Desc.scar = function(slave, surface) { } else if (slave.scar[surface.left] === slave.scar[surface.right]) { // matching places and marks // note that the slave.scar object won't have slave.scar["upper armS"] with an S defined, just the left and right, so we just use the left since we know they match. - r += `${describeScarInt(slave, surface.left)} scared into the flesh of both ${his} ${surface.both}`; + r += `${describeScarInt(slave, surface.left)} on both ${his} ${surface.both}`; } else if (slave.scar[surface.left] && slave.scar[surface.right]) { // matching places but different marks - r += `both ${describeScarInt(slave, surface.left)} scared into the flesh of ${his} ${surface.left}, and ${describeScarInt(slave, surface.right)} scared into ${his} ${surface.right}`; + r += `both ${describeScarInt(slave, surface.left)} on ${his} ${surface.left}, and ${describeScarInt(slave, surface.right)} scared into ${his} ${surface.right}`; } else if (slave.scar[surface.left]) { // left - r += `${describeScarInt(slave, surface.left)} scared into the flesh of ${his} ${surface.left}`; + r += `${describeScarInt(slave, surface.left)} on ${his} ${surface.left}`; } else if (slave.scar[surface.right]) { // right - r += `${describeScarInt(slave, surface.right)} scared into the flesh of ${his} ${surface.right}`; + r += `${describeScarInt(slave, surface.right)} on ${his} ${surface.right}`; } } if (counter === length) { @@ -790,23 +790,23 @@ App.Desc.scar = function(slave, surface) { } else { surface = App.Desc.oppositeSides(surface); if (slave.scar[surface.center]) { // center defined, body part has no mirror. - r += `${He} has ${describeScarInt(slave, surface.center)} scared into the flesh of ${his} ${surface.center}. `; + r += `${He} has ${describeScarInt(slave, surface.center)} on ${his} ${surface.center}. `; } else { // Center not defined, body part has a mirror. if (!slave.scar[surface.left] && !slave.scar[surface.right]) { // no marks } else if (slave.scar[surface.left] === slave.scar[surface.right]) { // matching places and marks // note that the slave.scar object won't have slave.scar["upper armS"] with an S defined, just the left and right, so we just use the left since we know they match. - r += `${He} has ${describeScarInt(slave, surface.left)} scared into the flesh of both ${his} ${surface.both}. `; + r += `${He} has ${describeScarInt(slave, surface.left)} on both ${his} ${surface.both}. `; } else if (slave.scar[surface.left] && slave.scar[surface.right]) { // matching places but different marks - r += `${He} has both ${describeScarInt(slave, surface.left)} scared into the flesh of ${his} ${surface.left}, and ${describeScarInt(slave, surface.right)} scared into ${his} ${surface.right}. `; + r += `${He} has both ${describeScarInt(slave, surface.left)} on ${his} ${surface.left}, and ${describeScarInt(slave, surface.right)} scared into ${his} ${surface.right}. `; } else if (slave.scar[surface.left]) { // left - r += `${He} has ${describeScarInt(slave, surface.left)} scared into the flesh of ${his} ${surface.left}. `; + r += `${He} has ${describeScarInt(slave, surface.left)} on ${his} ${surface.left}. `; } else if (describeScarInt(slave, surface.right)) { // right - r += `${He} has ${describeScarInt(slave, surface.right)} scared into the flesh of ${his} ${surface.right}. `; + r += `${He} has ${describeScarInt(slave, surface.right)} on ${his} ${surface.right}. `; } } } @@ -818,7 +818,7 @@ App.Desc.scar = function(slave, surface) { if (key === "belly" && setup.fakeBellies.includes(bellyAccessory) && slave.scar.belly) { r += `${value} scared on both ${his} real belly and ${his} fake one, `; } else { - r += `${value} scared into the flesh of ${his} ${key}, `; + r += `${value} on ${his} ${key}, `; } } if (r !== ``) { diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 1a40089777698b0cd5326f0e9923778d15623458..0f256457c863cae7344b213ab0408be4696e8ee0 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -1186,14 +1186,14 @@ Scars: <<case 3>> $His _scarName is marked with fresh scarring: <<case 4>> - $His _scarName is marked with burns: + $His _scarName is covered in burns: <<case 5>> $His _scarName is marked with a menacing scar: <<case 6>> $His _scarName is marked with an exotic scar: <<case 7>> <<if _scarName === "belly">> - $His _scarName is marked with a cSection: + $His _scarName is scarred from a cSection: <<else>> $His _scarName is marked with a surgical scar: <</if>> @@ -1212,7 +1212,7 @@ Scars: <</for>> <<if (jQuery.isEmptyObject($activeSlave.scar))>> <br> - $His skin is not r. + $His skin is not scarred. <</if>> <br> @@ -1225,7 +1225,7 @@ Use ''_printScar'' or choose another scar: | <<link "A menacing scar">> <<set $scarDesign.local = 5>> <<if $scarTarget.local === "entire body">> - <<set $scarTarget.local === "left cheek">> + <<set $scarTarget.local = "left cheek">> <</if>> <<goto "Body Modification">> <</link>> @@ -1233,7 +1233,7 @@ Use ''_printScar'' or choose another scar: | <<link "An exotic scar">> <<set $scarDesign.local = 6>> <<if $scarTarget.local === "entire body">> - <<set $scarTarget.local === "left cheek">> + <<set $scarTarget.local = "left cheek">> <</if>> <<goto "Body Modification">> <</link>> @@ -1247,7 +1247,14 @@ Or design your own: <<textbox "$scarDesign.local" $scarDesign.local "Body Modifi <br> Choose a site for scaring: -[[Entire body|Body Modification][$scarTarget.local = "entire body"]] +<<link "Entire body">> + <<set $scarTarget.local = "entire body">> + <<if $scarDesign.local === 5 || $scarDesign.local === 6>> + <<set $scarDesign.local = 1>> + <</if>> + <<goto "Body Modification">> +<</link>> + /* Sorted head to toe */ /* Head */ diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 02cca47726ccda7438c431006fbfd13a8f626972..873745977662f96b5047ad591fd176680c9e0a64 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -842,7 +842,12 @@ $He's <<if ($activeSlave.scar["belly"] == 7)>> <br> $He has an unsightly c-section scar. - [[Remove Caesarean scar|Surgery Degradation][$activeSlave.scar["belly"] = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "bellyscar"]] + <<link "Remove Caesarean scar">> + <<run delete $activeSlave.scar["belly"]>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>> + <<set $activeSlave.health -= 10,$surgeryType = "bellyscar">> + <<goto "Surgery Degradation">> + <</link>> <</if>> <br><br>