From deaee6ea0e2be95fae7c870f3f7785f181296124 Mon Sep 17 00:00:00 2001 From: Sotisi <Sotisi@tzi.de> Date: Fri, 8 Dec 2017 09:57:04 +0100 Subject: [PATCH] fixed description formatting --- src/uncategorized/longSlaveDescription.tw | 177 ++++++++++++++-------- 1 file changed, 117 insertions(+), 60 deletions(-) diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index f2fad170daf..9f542ec88f1 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1258,87 +1258,144 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <</if>> <</if>> -<<set _anyCareer = 0>> -<<if ($activeSlave.skillHG >= $masteredXP) || ($activeSlave.skillRC >= $masteredXP) || ($activeSlave.skillBG >= $masteredXP) || ($activeSlave.skillMD >= $masteredXP) || ($activeSlave.skillDJ >= $masteredXP) || ($activeSlave.skillNU >= $masteredXP) || ($activeSlave.skillTE >= $masteredXP) || ($activeSlave.skillAT >= $masteredXP) || ($activeSlave.skillST >= $masteredXP) || ($activeSlave.skillMM >= $masteredXP) || ($activeSlave.skillWA >= $masteredXP)>> - <<set _anyCareer = 1>> -<</if> -<<if _anyCareer == 1>> +<<set _numCareers = 0>> +<<if ($activeSlave.skillHG >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillRC >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillBG >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillMD >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillDJ >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillNU >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillTE >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillAT >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillST >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillMM >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillWA >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if _numCareers > 0>> She has working experience as a - <<set _commaNeeded = 0>> + <<set _totalCareers = _numCareers>> <<if $activeSlave.skillHG >= $masteredXP>> - Head Girl - <<set _commaNeeded = 1>> - <</if>> + <<if _numCareers == 1>> + Head Girl. + <<elseif _numCareers == 2>> + Head Girl and + <<else>> + Head Girl, + <</if>> + <<set _numCareers -= 1>> + <</if>> <<if $activeSlave.skillRC >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Recruiter - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Recruiter. + <<elseif _numCareers == 2>> + Recruiter and + <<else>> + Recruiter, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillBG >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - BodyGuard - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Bodyguard. + <<elseif _numCareers == 2>> + Bodyguard and + <<else>> + Bodyguard, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillMD >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Madam - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Madam. + <<elseif _numCareers == 2>> + Madam and + <<else>> + Madam, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillDJ >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - DJ - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + DJ. + <<elseif _numCareers == 2>> + DJ and + <<else>> + DJ, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillNU >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Nurse - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Nurse. + <<elseif _numCareers == 2>> + Nurse and + <<else>> + Nurse, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillTE >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Schoolteacher - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Schoolteacher. + <<elseif _numCareers == 2>> + Schoolteacher and + <<else>> + Schoolteacher, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillAT >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Attendant - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Attendant. + <<elseif _numCareers == 2>> + Attendant and + <<else>> + Attendant, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillST >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Stewardess - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Stewardess. + <<elseif _numCareers == 2>> + Stewardess and + <<else>> + Stewardess, + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillMM >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Milkmaid - <<set _commaNeeded = 1>> + <<if _numCareers == 1>> + Milkmaid. + <<else>> + Milkmaid and + <</if>> + <<set _numCareers -= 1>> <</if>> <<if $activeSlave.skillWA >= $masteredXP>> - <<if _commaNeeded == 1>> - , - <</if>> - Wardeness - <</if>> - . + Wardeness. + <</if>> <</if>> <<if $activeSlave.prestige > 0>> -- GitLab