From 446fa25dab233cfd7ddaba3fed3bce215583e30d Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Sun, 10 Dec 2017 03:01:10 +1300 Subject: [PATCH] minor fixes. --- src/uncategorized/masterSuite.tw | 4 ++-- src/uncategorized/newSlaveIntro.tw | 1 + src/uncategorized/schoolroomReport.tw | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw index 003b7a1c08e..2009678333b 100644 --- a/src/uncategorized/masterSuite.tw +++ b/src/uncategorized/masterSuite.tw @@ -128,7 +128,7 @@ It's is full of luxuries of all kinds. The slaves here live free of want or worr None of your slaves are serving here. <</if>> -<br> [[Remodel the suite around a luxurious pit for group sex|Master Suite][$cash -= _Tmult1, $masterSuiteUpgradeLuxury = 2,$PC.engineering += 1,$PC.slaving += 1]] //Costs _Tmult1; will encourage fucktoys to fuck each other// +<br> [[Remodel the suite around a luxurious pit for group sex|Master Suite][$cash -= _Tmult1, $masterSuiteUpgradeLuxury = 2] //Costs _Tmult1; will encourage fucktoys to fuck each other// <<elseif $masterSuiteUpgradeLuxury == 2>> @@ -219,7 +219,7 @@ The true focus of the suite is, however, the fuckpit. This stepped depression in is desolate and unpopulated. <</if>> -<br> [[Refit the suite to the height of traditional opulence|Master Suite][$cash -= _Tmult1, $masterSuiteUpgradeLuxury = 1,$PC.engineering += 1,$PC.slaving += 1]] //Costs _Tmult1; will focus the suite on you// +<br> [[Refit the suite to the height of traditional opulence|Master Suite][$cash -= _Tmult1, $masterSuiteUpgradeLuxury = 1] //Costs _Tmult1; will focus the suite on you// <<else>> diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index c21d4a8db47..01e5a4a8b34 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -1869,3 +1869,4 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if </span> +<<set $PC.slaving += .1,$PC.trading += .1>> diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index 6eac66752a3..00872254298 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -49,15 +49,12 @@ <</if>> <<if setup.schoolteacherCareers.includes($Schoolteacher.career)>> She has experience with students and learning from her life before she was a slave, making her more effective. -<<<<<<< HEAD <<set _idleBonus++>> <<elseif $Schoolteacher.skillTE >= $masteredXP>> She has experience with students and learning from working for you, making her more effective. <<set _idleBonus++>> -======= <<elseif $Schoolteacher.skillTE >= $masteredXP>> She has experience with students and learning from working for you, making her more effective. ->>>>>>> upstream/pregmod-master <<else>> <<set $slaves[_FLs].skillTE += random(1,($Schoolteacher.intelligence+4)*2)>> <</if>> -- GitLab