From c7382dafe5285847310e59091572188cf0fc7dc5 Mon Sep 17 00:00:00 2001 From: Arkerthan <arkerthan@gmail.com> Date: Mon, 5 Aug 2019 19:58:53 +0200 Subject: [PATCH] fix logic --- src/uncategorized/bodyModification.tw | 15 ++++++++------- src/uncategorized/longSlaveDescription.tw | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 634878a9b8e..0e26a8a945c 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -1292,13 +1292,14 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica $scarTarget.local, or the <</if>> <<if _right>> - <<link "right">> - <<set $scarTarget.local = _rightTarget>> - <<set $scarApplied = 1>> - <<run App.Medicine.Modification.addScar($activeSlave, _rightTarget, $scarDesign.local)>> - <<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> - <<set $degradation += 10>> - <<goto "Body Modification">> + <<link "right">> + <<set $scarTarget.local = _rightTarget>> + <<set $scarApplied = 1>> + <<run App.Medicine.Modification.addScar($activeSlave, _rightTarget, $scarDesign.local)>> + <<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> + <<set $degradation += 10>> + <<goto "Body Modification">> + <</link>> <</if>><<if !_left || !_right>> $scarTarget.local<</if>>? <<else>> <<if $activeSlave.scar.hasOwnProperty($scarTarget.local)>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 66425ea18b8..84f7ce2a3d1 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1882,7 +1882,7 @@ $He is <<if hasAnyNaturalArms($activeSlave)>> <<if $activeSlave.weight > 190>> - $He has <<if hasBothNaturalArms($activeSlave)>>hugely thick arms<<else>>a hugely thick arm<</if>> with sagging fat rolls<</if>><<if $activeSlave.muscles > 5>> and<<else>>.<</if>> + $He has <<if hasBothNaturalArms($activeSlave)>>hugely thick arms<<else>>a hugely thick arm<</if>> with sagging fat rolls<<if $activeSlave.muscles > 5>> and<<else>>.<</if>> <<elseif $activeSlave.weight > 160>> $He has <<if hasBothNaturalArms($activeSlave)>>thick arms<<else>>a thick arm<</if>> with drooping fat folds<<if $activeSlave.muscles > 5>> and<<else>>.<</if>> <<elseif $activeSlave.weight > 130>> @@ -1910,7 +1910,7 @@ $He is <</if>> <<if $activeSlave.skill.combat > 0>> - $He is @@.aquamarine;skilled at combat:@@ $he is comfortable with the use of modern firearms and edged weapons, and $his hands <<if !hasBothArms($activeChild)>>would be deadly weapons if $he had <<if !hasAnyArms($activeChild)>>any<<else>>more than one<</if>><<else>><<if getArmCount($activeChild, 5) + getArmCount($activeChild, 6) > 1>>would be deadly weapons even if they weren't full of deadly weapons already<<else>>are deadly weapons<</if>>. + $He is @@.aquamarine;skilled at combat:@@ $he is comfortable with the use of modern firearms and edged weapons, and $his hands <<if !hasBothArms($activeChild)>>would be deadly weapons if $he had <<if !hasAnyArms($activeChild)>>any<<else>>more than one<</if>><<else>><<if getArmCount($activeChild, 5) + getArmCount($activeChild, 6) > 1>>would be deadly weapons even if they weren't full of deadly weapons already<<else>>are deadly weapons<</if>><</if>>. <</if>> <</if>> -- GitLab