From a9a7ead2dfec487840d2378b7eea1be10dabdd57 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 6 Feb 2020 00:10:01 -0500
Subject: [PATCH] bg
---
src/uncategorized/bgSelect.tw | 53 ++++++++++++++++++++----------
src/uncategorized/headGirlSuite.tw | 3 ++
2 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw
index b705ac6c4b0..929a6ac4018 100644
--- a/src/uncategorized/bgSelect.tw
+++ b/src/uncategorized/bgSelect.tw
@@ -1,22 +1,41 @@
:: BG Select [nobr]
<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Bodyguard">>
-<<if ($Bodyguard != 0)>>
- <<set $Bodyguard = getSlave($Bodyguard.ID)>>
- <<setLocalPronouns $Bodyguard>>
- ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard.<br><br>$He will remain close to you at all times and guard your person.
-<<else>>
- You have not selected a bodyguard.
-<</if>>
-<br><br>
-<<if $bodyguardTrains == 0>>
- Your Bodyguard ''is not allowed'' to train potential successors. [[Allow training|BG Select][$bodyguardTrains = 1]]
-<<else>>
- Your Bodyguard ''is allowed'' to train potential successors. [[Stop training|BG Select][$bodyguardTrains = 0]]
-<</if>>
+<p class="scene-intro">
+</p>
-<br><br>''Appoint a bodyguard from your devoted slaves:''
-<br><br>[[None|Main][removeJob($Bodyguard, "guard you")]]
-<br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "Main")>>
+<p>
+ <<if ($Bodyguard != 0)>>
+ <<set $Bodyguard = getSlave($Bodyguard.ID)>>
+ <<setLocalPronouns $Bodyguard>>
+ <span class="slave-name"><<= SlaveFullName($Bodyguard)>></span>
+ is serving as your bodyguard. $He will remain close to you at all times and guard your person.
+ <<else>>
+ You have not selected a bodyguard.
+ <</if>>
+</p>
+
+<div>
+ <<if $bodyguardTrains == 0>>
+ Your Bodyguard ''is not allowed'' to train potential successors.
+ <div class="choices">
+ [[Allow training|BG Select][$bodyguardTrains = 1]]
+ </div>
+ <<else>>
+ Your Bodyguard ''is allowed'' to train potential successors.
+ <div class="choices">
+ [[Stop training|BG Select][$bodyguardTrains = 0]]
+ </div>
+ <</if>>
+</div>
+
+<div style="font-weight:bold">
+ Appoint a bodyguard from your devoted slaves:
+</div>
+<div class="choices">
+ [[None|Main][removeJob($Bodyguard, "guard you")]]
+</div>
+<p>
+ <<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "Main")>>
+</p>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index 7695751c6bc..50d70b602fb 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -7,6 +7,9 @@
<</if>>
<<set _i = $slaves.findIndex(function(s) { return s.assignment == "live with your Head Girl"; })>>
+<p class="scene-intro">
+</p>
+
<<if $HeadGirl == 0>>
You have no Head Girl appointed to live in $HGSuiteName.
<<link "Select Head Girl">><<goto "HG Select">><</link>>
--
GitLab