From 763519d132ce113b857034b9e2d2fbbe47e1603a Mon Sep 17 00:00:00 2001
From: Actoba <jmyles@jmyles.co.uk>
Date: Mon, 30 Jun 2014 23:31:36 +0100
Subject: [PATCH] Moved speed to create room for total initiative mod

---
 DnD_5e/DnD_5e.html | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/DnD_5e/DnD_5e.html b/DnD_5e/DnD_5e.html
index e0429fb00c..a4a646f4ed 100644
--- a/DnD_5e/DnD_5e.html
+++ b/DnD_5e/DnD_5e.html
@@ -116,27 +116,28 @@
 			
 			<div class="sheet-col-2-5">
 			
-				<h4 class="sheet-center">Hit Points <span class="sheet-pictos">k</span></h4>
+				<h4 class="sheet-center">Hit Points <span class="sheet-pictos">k</span> and Speed <span class="sheet-pictos">1</span></h4>
 				
 				<div class="sheet-row sheet-padb">
-					<div class="sheet-col-5-8 sheet-padr sheet-border-right">
+					<div class="sheet-col-1-2 sheet-padr sheet-border-right">
 						<div class="sheet-row">
 							<div class="sheet-col-1-2 sheet-small-label sheet-center"><input class="sheet-underlined" type="number" name="attr_HP" step="1"><br/>Current</div>
 							<div class="sheet-col-1-2 sheet-small-label sheet-center"><input class="sheet-underlined" type="number" name="attr_HP_max" min="1" step="1"><br/>Max</div>
 						</div>
 					</div>
 					
-					<div class="sheet-col-3-8 sheet-padl sheet-small-label sheet-center"><input class="sheet-underlined" type="number" name="attr_temp_HP" value="0" min="0" step="1" ><br/>Temporary</div>
+					<div class="sheet-col-1-4 sheet-padl sheet-padr sheet-border-right sheet-small-label sheet-center"><input class="sheet-underlined" type="number" name="attr_temp_HP" value="0" min="0" step="1" ><br/>Temp HP</div>
+					<div class="sheet-col-1-4 sheet-padl sheet-small-label sheet-center"><input class="sheet-underlined sheet-center" type="text" name="attr_speed" ><br/>Speed</div>
 				</div>
 			
 				<div class="sheet-row">
 				
 					<div class="sheet-col-1-2">
-						<h4 class="sheet-center">Speed and Initiative <span class="sheet-pictos">t</span></h4>
+						<h4 class="sheet-center">Initiative <span class="sheet-pictos">t</span></h4>
 						<div class="sheet-row sheet-padr">
-							<div class="sheet-col-1-3 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center" type="text" name="attr_speed" ><br/>Speed</div>
-							<div class="sheet-col-1-3 sheet-small-label sheet-center" title="Only enter additional bonuses to initiative here. Your Dex mod is already included in the macro button"><input class="sheet-underlined" type="number" name="attr_initiative" value="0" step="1"><br/>Init Bonus</div>
-							<div class="sheet-col-1-3 sheet-center"><button type="roll" class="sheet-initiative" name="roll_Initiative" class="sheet-large-button" value="@{selected|token_name} rolls a [[1d20 + @{selected|dexterity_mod} [Dexterity Mod] + @{selected|initiative} [Initiative Bonus] &{tracker}]] for initiative!">Initiative</button></div>
+							<div class="sheet-col-1-3 sheet-small-label sheet-center" title="Only enter additional bonuses to initiative here. Your Dex mod is already included in the macro button"><input class="sheet-underlined sheet-center" type="text" name="attr_initiative" value="0" step="1"><br/>Bonus</div>
+							<div class="sheet-col-1-3 sheet-small-label sheet-center"><input class="sheet-underlined" type="number" name="attr_initiative_overall" value="@{dexterity_mod} + @{initiative}" disabled="disabled"><br/>Total</div>
+							<div class="sheet-col-1-3 sheet-center"><button type="roll" class="sheet-initiative" name="roll_Initiative" class="sheet-large-button" value="@{selected|token_name} rolls a [[1d20 + @{selected|initiative_overall} [Initiative Mod] &{tracker}]] for initiative!">Initiative</button></div>
 						</div>
 					</div>