From 77051a6002d48f9bb63f8540aad2573a2e698cd1 Mon Sep 17 00:00:00 2001 From: Arkerthan <arkerthan@gmail.com> Date: Wed, 29 Apr 2020 17:44:00 +0200 Subject: [PATCH] fix changing skin tone during intro being overwritten --- src/pregmod/pcAppearanceIntro.tw | 52 +++++++++++++-------------- src/pregmod/widgets/pregmodWidgets.tw | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw index ed4ee69b37b..d61a263a080 100644 --- a/src/pregmod/pcAppearanceIntro.tw +++ b/src/pregmod/pcAppearanceIntro.tw @@ -95,130 +95,130 @@ What is your skin tone? </div> <div id = "skin"> - You have $PC.origSkin skin. + You have $PC.skin skin. </div> <<link "Pure White">> - <<set $PC.origSkin = "pure white">> + <<set $PC.skin = "pure white">> <<PlayerSkin>> <</link>> | <<link "Ivory">> - <<set $PC.origSkin = "ivory">> + <<set $PC.skin = "ivory">> <<PlayerSkin>> <</link>> | <<link "White">> - <<set $PC.origSkin = "white">> + <<set $PC.skin = "white">> <<PlayerSkin>> <</link>> | <<link "Extremely Pale">> - <<set $PC.origSkin = "extremely pale">> + <<set $PC.skin = "extremely pale">> <<PlayerSkin>> <</link>> | <<link "Very Pale">> - <<set $PC.origSkin = "very pale">> + <<set $PC.skin = "very pale">> <<PlayerSkin>> <</link>> | <<link "Pale">> - <<set $PC.origSkin = "pale">> + <<set $PC.skin = "pale">> <<PlayerSkin>> <</link>> | <<link "Extremely Fair">> - <<set $PC.origSkin = "extremely fair">> + <<set $PC.skin = "extremely fair">> <<PlayerSkin>> <</link>> | <<link "Very Fair">> - <<set $PC.origSkin = "very fair">> + <<set $PC.skin = "very fair">> <<PlayerSkin>> <</link>> | <<link "Fair">> - <<set $PC.origSkin = "fair">> + <<set $PC.skin = "fair">> <<PlayerSkin>> <</link>> | <<link "Light">> - <<set $PC.origSkin = "light">> + <<set $PC.skin = "light">> <<PlayerSkin>> <</link>> | <<link "Light Olive">> - <<set $PC.origSkin = "light olive">> + <<set $PC.skin = "light olive">> <<PlayerSkin>> <</link>> | <<link "Tan">> - <<set $PC.origSkin = "tan">> + <<set $PC.skin = "tan">> <<PlayerSkin>> <</link>> | <<link "Olive">> - <<set $PC.origSkin = "olive">> + <<set $PC.skin = "olive">> <<PlayerSkin>> <</link>> | <<link "Bronze">> - <<set $PC.origSkin = "bronze">> + <<set $PC.skin = "bronze">> <<PlayerSkin>> <</link>> | <<link "Dark Olive">> - <<set $PC.origSkin = "dark olive">> + <<set $PC.skin = "dark olive">> <<PlayerSkin>> <</link>> | <<link "Dark">> - <<set $PC.origSkin = "dark">> + <<set $PC.skin = "dark">> <<PlayerSkin>> <</link>> | <<link "Light Beige">> - <<set $PC.origSkin = "light beige">> + <<set $PC.skin = "light beige">> <<PlayerSkin>> <</link>> | <<link "Beige">> - <<set $PC.origSkin = "beige">> + <<set $PC.skin = "beige">> <<PlayerSkin>> <</link>> | <<link "Dark Beige">> - <<set $PC.origSkin = "dark beige">> + <<set $PC.skin = "dark beige">> <<PlayerSkin>> <</link>> | <<link "Light Brown">> - <<set $PC.origSkin = "light brown">> + <<set $PC.skin = "light brown">> <<PlayerSkin>> <</link>> | <<link "Brown">> - <<set $PC.origSkin = "brown">> + <<set $PC.skin = "brown">> <<PlayerSkin>> <</link>> | <<link "Dark Brown">> - <<set $PC.origSkin = "dark brown">> + <<set $PC.skin = "dark brown">> <<PlayerSkin>> <</link>> | <<link "Black">> - <<set $PC.origSkin = "black">> + <<set $PC.skin = "black">> <<PlayerSkin>> <</link>> | <<link "Ebony">> - <<set $PC.origSkin = "ebony">> + <<set $PC.skin = "ebony">> <<PlayerSkin>> <</link>> | <<link "Pure Black">> - <<set $PC.origSkin = "pure black">> + <<set $PC.skin = "pure black">> <<PlayerSkin>> <</link>> </p> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 228518821db..901b945419e 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -604,7 +604,7 @@ $activeSlave.slaveName is up for review: <<widget "PlayerSkin">> <<replace #skin>> - You have $PC.origSkin skin. + You have $PC.skin skin. <</replace>> <</widget>> -- GitLab