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

Merge branch 'limbFunction2' into 'pregmod-master'

limb cleanup

Closes #944

See merge request pregmodfan/fc-pregmod!5270
parents b2c63710 25ebd15c
No related branches found
No related tags found
1 merge request!5270limb cleanup
...@@ -28,7 +28,7 @@ The implant is small, and went off too far ahead to do anything more than stun. ...@@ -28,7 +28,7 @@ The implant is small, and went off too far ahead to do anything more than stun.
<br><br> <br><br>
<<if $Bodyguard != 0>> <<if $Bodyguard != 0>>
<<if $Bodyguard.amp <= -4>> <<if getLimbCount($Bodyguard, 105) === 4>>
$Bodyguard.slaveName glances at you to check that $his principal is alive, $his P-Limbs already entering combat mode. $He becomes more inhuman by the moment, $Bodyguard.slaveName glances at you to check that $his principal is alive, $his P-Limbs already entering combat mode. $He becomes more inhuman by the moment,
<<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>> <<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>>
$his calves unfolding to reveal stabilizers that slide down and broaden $his ground contact. The targeting programs in $his arms allow $him to fire $his light machine gun from the hip, and $he places a precise burst in each target. $his calves unfolding to reveal stabilizers that slide down and broaden $his ground contact. The targeting programs in $his arms allow $him to fire $his light machine gun from the hip, and $he places a precise burst in each target.
......
...@@ -1703,25 +1703,14 @@ Work on $him structurally: ...@@ -1703,25 +1703,14 @@ Work on $him structurally:
<br>&nbsp;&nbsp;&nbsp;&nbsp; <br>&nbsp;&nbsp;&nbsp;&nbsp;
<</if>> <</if>>
/* PROSTHETICS */
/* TODO Arkerthan
I have a nice version, but it depends on the new limb system, so we have to do with this for now.
*/
<br> <br>
<<if !isAmputee($activeSlave)>> /* PROSTHETICS */
Limbs: //This is a temporary solution while limb mechanics are being reworked.//<br> <<= App.Desc.limbs($activeSlave)>>
Left arm: <<print idToDescription(getLeftArmID($activeSlave))>><br> <<if isAmputee($activeSlave)>>
Right arm: <<print idToDescription(getRightArmID($activeSlave))>><br>
Left leg: <<print idToDescription(getLeftLegID($activeSlave))>><br>
Right leg: <<print idToDescription(getRightLegID($activeSlave))>>
<<else>>
$He is a quadruple amputee
<<if $activeSlave.PLimb == 1>> <<if $activeSlave.PLimb == 1>>
and has been implanted with a basic PLimb interface. $He has been implanted with a basic PLimb interface.
<<elseif $activeSlave.PLimb == 2>> <<elseif $activeSlave.PLimb == 2>>
and has been implanted with an advanced PLimb interface. $He has been implanted with an advanced PLimb interface.
<<else>>
and has not been equipped with prosthetics.
<</if>> <</if>>
<</if>> <</if>>
<br> <br>
...@@ -1729,9 +1718,9 @@ I have a nice version, but it depends on the new limb system, so we have to do w ...@@ -1729,9 +1718,9 @@ I have a nice version, but it depends on the new limb system, so we have to do w
<<if hasAnyNaturalLimbs($activeSlave)>> <<if hasAnyNaturalLimbs($activeSlave)>>
<<if $activeSlave.indentureRestrictions < 1 && $seeExtreme == 1>> <<if $activeSlave.indentureRestrictions < 1 && $seeExtreme == 1>>
<<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP1"}) == -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP2"}) == -1>> <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP1"}) == -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP2"}) == -1>>
[[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp"]] //This will greatly restrict $him// [[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp"]] //This will greatly restrict $him//
<<else>> <<else>>
[[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp1"]] //This will greatly restrict $him// [[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp1"]] //This will greatly restrict $him//
<</if>> <</if>>
<</if>> <</if>>
<<elseif isAmputee($activeSlave) && $activeSlave.PLimb == 0>> <<elseif isAmputee($activeSlave) && $activeSlave.PLimb == 0>>
......
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