Skip to content
Snippets Groups Projects
Commit fca160df authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-dev' into 'pregmod-master'

fix brand healthDamage error

See merge request pregmodfan/fc-pregmod!6434
parents 97c3b7ec e66b26dc
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<</if>> <</if>>
<<if $brandApplied>> <<if $brandApplied>>
The smell of burnt flesh hangs in the air. Being branded @@.red;has hurt $his health a little.@@ The smell of burnt flesh hangs in the air. Being branded @@.red;has hurt $his health a little.@@
<<run healthDamage($slaves[$i], 10)>> <<run healthDamage($activeSlave, 10)>>
<<unset $brandApplied>> <<unset $brandApplied>>
<</if>> <</if>>
<<if $scarApplied>> <<if $scarApplied>>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
The best way to apply scarring to the entire body is with a good old fashioned whip. $His body is a mess of crisscrossed lines<<if hasAnyNaturalLimbs($activeSlave)>>, and $his <<if getLimbCount($activeSlave, 1) > 1>>limbs twisted so violently in their restraints that they too have<<else>>only limb twists so violently in its restraints that it too has<</if>> become scarred<</if>>. The best way to apply scarring to the entire body is with a good old fashioned whip. $His body is a mess of crisscrossed lines<<if hasAnyNaturalLimbs($activeSlave)>>, and $his <<if getLimbCount($activeSlave, 1) > 1>>limbs twisted so violently in their restraints that they too have<<else>>only limb twists so violently in its restraints that it too has<</if>> become scarred<</if>>.
<</switch>> <</switch>>
No matter how you chose to apply it, scarring so much of $his body has @@.red; hurt $his health.@@ No matter how you chose to apply it, scarring so much of $his body has @@.red; hurt $his health.@@
<<run healthDamage($slaves[$i], 20)>> <<run healthDamage($activeSlave, 20)>>
<<else>> <<else>>
<<if $activeSlave.scar[$scarTarget.local][$scarDesign.local] > 0>> <<if $activeSlave.scar[$scarTarget.local][$scarDesign.local] > 0>>
This is not the first time $he was scarred like this. This is not the first time $he was scarred like this.
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<</switch>> <</switch>>
No matter how you chose to apply it, being scarred @@.red; hurt $his health a little.@@ No matter how you chose to apply it, being scarred @@.red; hurt $his health a little.@@
<<run healthDamage($slaves[$i], 10)>> <<run healthDamage($activeSlave, 10)>>
<</if>> <</if>>
Afterwards you seal the wounds with a white medical spray. Infection is no risk to $activeSlave.slaveName thanks to your curatives, but in order to form obvious scar tissue you had to keep air out and delay normal healing as long as possible. Afterwards you seal the wounds with a white medical spray. Infection is no risk to $activeSlave.slaveName thanks to your curatives, but in order to form obvious scar tissue you had to keep air out and delay normal healing as long as possible.
<<unset $scarApplied>> <<unset $scarApplied>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment