From e613ade7c1a97c43550df4141436f454636d6161 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Mon, 6 Jan 2020 18:54:40 -0800 Subject: [PATCH] Fix starting girl amputation (starting girls use activeSlave, not customSlave). --- src/npc/startingGirls/startingGirls.tw | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index c3f3b730197..314c928f1b1 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -587,18 +587,18 @@ __You are customizing this slave:__ /* TODO rewrite this so it looks like the rest (if possible expand options macro) */ Left arm: <span id = "ampLA"> - <<if hasLeftArm($customSlave)>>Yes + <<if hasLeftArm($activeSlave)>>Yes <<else>>No <</if>> </span> <<link "Remove">> - <<set $customSlave.arm.left = null>> + <<set $activeSlave.arm.left = null>> <<replace #ampLA>> No <</replace>> <</link>> <<link "Add">> - <<set $customSlave.arm.left = new App.Entity.LimbState()>> + <<set $activeSlave.arm.left = new App.Entity.LimbState()>> <<replace #ampLA>> Yes <</replace>> @@ -606,18 +606,18 @@ __You are customizing this slave:__ <br> Right arm: <span id = "ampRA"> - <<if hasRightArm($customSlave)>>Yes + <<if hasRightArm($activeSlave)>>Yes <<else>>No <</if>> </span> <<link "Remove">> - <<set $customSlave.arm.right = null>> + <<set $activeSlave.arm.right = null>> <<replace #ampRA>> No <</replace>> <</link>> <<link "Add">> - <<set $customSlave.arm.right = new App.Entity.LimbState()>> + <<set $activeSlave.arm.right = new App.Entity.LimbState()>> <<replace #ampRA>> Yes <</replace>> @@ -625,18 +625,18 @@ __You are customizing this slave:__ <br> Left leg: <span id = "ampLL"> - <<if hasLeftLeg($customSlave)>>Yes + <<if hasLeftLeg($activeSlave)>>Yes <<else>>No <</if>> </span> <<link "Remove">> - <<set $customSlave.leg.left = null>> + <<set $activeSlave.leg.left = null>> <<replace #ampLL>> No <</replace>> <</link>> <<link "Add">> - <<set $customSlave.leg.left = new App.Entity.LimbState()>> + <<set $activeSlave.leg.left = new App.Entity.LimbState()>> <<replace #ampLL>> Yes <</replace>> @@ -644,18 +644,18 @@ __You are customizing this slave:__ <br> Right leg: <span id = "ampRL"> - <<if hasRightLeg($customSlave)>>Yes + <<if hasRightLeg($activeSlave)>>Yes <<else>>No <</if>> </span> <<link "Remove">> - <<set $customSlave.leg.right = null>> + <<set $activeSlave.leg.right = null>> <<replace #ampRL>> No <</replace>> <</link>> <<link "Add">> - <<set $customSlave.leg.right = new App.Entity.LimbState()>> + <<set $activeSlave.leg.right = new App.Entity.LimbState()>> <<replace #ampRL>> Yes <</replace>> -- GitLab