From b8f761ae95eaaa30f602e9ae2c3ebf0a4babb449 Mon Sep 17 00:00:00 2001
From: Andreas J <2890634+Anduh@users.noreply.github.com>
Date: Mon, 27 Jan 2020 22:18:17 +0200
Subject: [PATCH] D6 Space: add button to weapons, fix weaponname, cleanup
 attributes (#5822)

---
 D6_Space/D6Space.css  |  20 +++
 D6_Space/D6Space.html | 291 +++++++++++++++++++++++++-----------------
 2 files changed, 197 insertions(+), 114 deletions(-)

diff --git a/D6_Space/D6Space.css b/D6_Space/D6Space.css
index f384fcc998..fb32595dc6 100644
--- a/D6_Space/D6Space.css
+++ b/D6_Space/D6Space.css
@@ -70,3 +70,23 @@
 .charsheet label.sheet-areaLabel{
     margin:5px;
 }
+
+/* New CSS */
+.charsheet .sheet-flexrow{
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-evenly;
+}
+
+.charsheet input[type=text].sheet-attrtext{
+    font-weight: bold;
+    font-size: 15px;
+}
+
+.charsheet button[type=roll].sheet-attrtext{
+    font-weight: bold;
+    font-size: 25px;
+    height: 22px;
+    width: 22px;
+    padding-top: 5px;
+}
diff --git a/D6_Space/D6Space.html b/D6_Space/D6Space.html
index 7e6c94f8c0..4cd3847280 100644
--- a/D6_Space/D6Space.html
+++ b/D6_Space/D6Space.html
@@ -34,128 +34,169 @@
             </div>
         </div>
     </div>
+
+
     <div name="attributes" class="sheet-section">
+
     	<div class="sheet-3colrow">
+
     		<div class="sheet-col">
-				<div name="Agility" class="sheet-bold sheet-border">               
-                        <button type='roll' value='/roll (@{agilitydice} - 1)d6 + 1d6! + @{agilitypip}' >Agility</button>
-                        <div style="float:right;">
-                            <input type="number" name="attr_agilitydice" class="sheet-smallnumber"  min="1" value="3"/>D 
-                            +<input type="number" name="attr_agilitypip" class="sheet-smallnumber" min="0" max="2" value="0"/>
-                        </div>
-            
+				<div name="Agility" class="sheet-bold sheet-border">
+                    <div class="flexrow">
+                        <button type='roll' value='/roll (@{agilitydice} - 1)d6 + 1d6! + @{agilitypip}' class="attrtext"></button>
+                        <input name="attr_AttrName1" type="text" class="skilltext attrtext" value="Agility">
+                        <input type="number" name="attr_agilitydice" class="sheet-smallnumber"  min="1" value="3"/>
+                        <span>D+</span>
+                        <input type="number" name="attr_agilitypip" class="sheet-smallnumber" min="0" max="2" value="0"/>                     
+                    </div>          
+
                     <fieldset class="repeating_agilskills">
-                        <button  type="roll" value="/r (@{agilskilldice} - 1)d6 + 1d6! + @{agilskillpip}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_agilskillname"/> 
-                          <div class="sheet-right">
-                          <input type="number" name="attr_agilskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>D 
-                          +<input type="number" name="attr_agilskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
-                          </div>
-                    </fieldset>
-            </div>
-				<div name="Strength" class="sheet-bold sheet-border">
-                        <button type='roll' class="astext" value='/roll (@{strength} - 1)d6 + 1d6! + @{strengthpip}' >Strength</button>
-                        <div style="float:right;">
-                            <input type="number" name="attr_strength" class="sheet-smallnumber" min="1" value="3"/>D
-                            +<input type="number" name="attr_strengthpip" class="sheet-smallnumber" min="0" max="2" value="0"/>  
+                        <div class="flexrow">
+                            <button  type="roll" value="/r (@{agilskilldice} - 1)d6 + 1d6! + @{agilskillpip}"></button>
+                            <input class="sheet-skilltext" type="text" name="attr_agilskillname"/> 
+                            <input type="number" name="attr_agilskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>
+                            <span>D+</span>
+                            <input type="number" name="attr_agilskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>                           
                         </div>
-            
-                    <fieldset class="repeating_strskills">
-                        <button  type="roll" value="/r (@{strskilldice} - 1)d6 + 1d6! + @{strskillpip}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_strskillname"/> 
-                          <div class="sheet-right">
-                          <input type="number" name="attr_strskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>D 
-                          +<input type="number" name="attr_strskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
-                          </div>
                     </fieldset>
-            </div>
+                </div>
+
+
+				<div name="Strength" class="sheet-bold sheet-border">
+                    <div class="flexrow">
+                        <button type='roll' value='/roll (@{strength} - 1)d6 + 1d6! + @{strengthpip}' class="astext attrtext"></button>
+                        <input name="attr_AttrName2" type="text" class="skilltext attrtext" value="Strength">
+                        <input type="number" name="attr_strength" class="sheet-smallnumber" min="1" value="3"/>
+                        <span>D+</span>
+                        <input type="number" name="attr_strengthpip" class="sheet-smallnumber" min="0" max="2" value="0"/>  
+                    </div>
+
+                    <fieldset class="repeating_strskills">
+                        <div class="flexrow">
+                            <button  type="roll" value="/r (@{strskilldice} - 1)d6 + 1d6! + @{strskillpip}"></button>
+                            <input class="sheet-skilltext" type="text" name="attr_strskillname"/> 
+                            <input type="number" name="attr_strskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>
+                            <span>D+</span>
+                            <input type="number" name="attr_strskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>                            
+                        </div>
+
+                    </fieldset>
+                </div>
     		</div>
+
     		<div class="sheet-col">
+
 				<div name="Perception" class="sheet-bold sheet-border">
-                        <button type='roll' class="astext" value='/roll (@{perception} - 1)d6 + 1d6! + @{perceptionpip}' >Perception</button>
-                        <div style="float:right;">
-                            <input type="number" name="attr_perception" class="sheet-smallnumber"  min="1" value="3"/>D 
-                            +<input type="number" name="attr_perceptionpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
-            	         </div>
+                    <div class="flexrow">
+                        <button type='roll' value='/roll (@{perception} - 1)d6 + 1d6! + @{perceptionpip}' class="astext attrtext"></button>
+                        <input name="attr_AttrName3" type="text" class="skilltext attrtext" value="Perception">
+                        <input type="number" name="attr_perception" class="sheet-smallnumber"  min="1" value="3"/>
+                        <span>D+</span>
+                        <input type="number" name="attr_perceptionpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
+                    </div>
 
                     <fieldset class="repeating_percskills">
-                        <button  type="roll" value="/r (@{percskilldice} - 1)d6 + 1d6! + @{percskillpip}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_percskillname"/> 
-                          <div class="sheet-right">
-                          <input type="number" name="attr_percskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>D 
-                          +<input type="number" name="attr_percskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
-                          </div>
+                        <div class="flexrow">
+                            <button  type="roll" value="/r (@{percskilldice} - 1)d6 + 1d6! + @{percskillpip}"></button>
+                            <input class="sheet-skilltext" type="text" name="attr_percskillname"/> 
+                            <input type="number" name="attr_percskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>
+                            <span>D+</span>
+                            <input type="number" name="attr_percskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>                            
+                        </div>
                     </fieldset>
-            </div>                    
-            <div name="Knowledge" class="sheet-bold sheet-border">
-                        <button type='roll' value='/roll (@{knowledge} - 1)d6 + 1d6! + @{knowledgepip}' >Knowledge</button>
-                        <div style="float:right;">
-                            <input type="number" name="attr_knowledge" class="sheet-smallnumber" min="1" value="3"/>D 
-                            +<input type="number" name="attr_knowledgepip" class="sheet-smallnumber" min="0" max="2" value="0"/>
+                </div>   
+
+                <div name="Knowledge" class="sheet-bold sheet-border">
+                    <div class="flexrow">
+                        <button type='roll' value='/roll (@{knowledge} - 1)d6 + 1d6! + @{knowledgepip}' class="attrtext"></button>
+                        <input name="attr_AttrName4" type="text" class="skilltext attrtext" value="Knowledge">
+                        <input type="number" name="attr_knowledge" class="sheet-smallnumber" min="1" value="3"/>
+                        <span>D+</span>
+                        <input type="number" name="attr_knowledgepip" class="sheet-smallnumber" min="0" max="2" value="0"/>             
+                    </div>
+
+                    <fieldset class="repeating_knowskills">
+                        <div class="flexrow">
+                            <button  type="roll" value="/r (@{knowskilldice} - 1)d6 + 1d6! + @{knowskillpip}"></button>
+                            <input class="sheet-skilltext" type="text" name="attr_knowskillname"/> 
+                            <input type="number" name="attr_knowskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>
+                            <span>D+</span>
+                            <input type="number" name="attr_knowskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
                         </div>
 
-                    <fieldset class="repeating_knowskills">  
-                        <button  type="roll" value="/r (@{knowskilldice} - 1)d6 + 1d6! + @{knowskillpip}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_knowskillname"/> 
-                          <div class="sheet-right">
-                          <input type="number" name="attr_knowskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>D 
-                          +<input type="number" name="attr_knowskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
-                          </div>
                     </fieldset>
-            </div>                    
-            <div name="Metaphysics" class="sheet-bold sheet-border">
-                        <button  type='roll' value='/roll (@{metaphysic} - 1)d6 + 1d6! + @{metaphysicpip}' >Metaphysics</button>
-                        <div style="float:right;">
-                            <input type="number" name="attr_metaphysic" class="sheet-smallnumber" min="0" value="0"/>D
-                            +<input type="number" name="attr_metaphysicpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
-	                     </div>
+                </div>
+
+                <div name="Metaphysics" class="sheet-bold sheet-border">
+                    <div class="flexrow">
+                        <button  type='roll' value='/roll (@{metaphysic} - 1)d6 + 1d6! + @{metaphysicpip}' class="attrtext"></button>
+                        <input name="attr_AttrName5" type="text" class="skilltext attrtext" value="Metaphysics">
+                        <input type="number" name="attr_metaphysic" class="sheet-smallnumber" min="0" value="0"/>
+                        <span>D+</span>
+                        <input type="number" name="attr_metaphysicpip" class="sheet-smallnumber" min="0" max="2" value="0"/>                       
+                    </div>
             
-                    <fieldset class="repeating_metaphysicskills">         
-                        <button  type="roll" value="/r (@{metaphysicskilldice} - 1)d6 + 1d6! + @{metaphysicskillpip}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_metaphysicskillname"/> 
-                          <div class="sheet-right">
-                          <input type="number" name="attr_metaphysicskilldice" class="sheet-smallnumber sheet-shortnumber" min="0" value="0"/>D 
-                          +<input type="number" name="attr_metaphysicskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
-                          </div>
-                    </fieldset>
-             </div>             		
-    		</div>
-    		<div class="sheet-col">
-    		   <div name="Technical" class="sheet-bold sheet-border">
-                        <button type='roll' class="astext" value='/roll (@{technical} - 1)d6 + 1d6! + @{technicalpip}' >Technical</button>
-                        <div style="float:right;">
-                            <input type="number" name="attr_technical" class="sheet-smallnumber" min="1" value="3"/>D 
-                            +<input type="number" name="attr_technicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>    
+                    <fieldset class="repeating_metaphysicskills">
+                        <div class="flexrow">
+                            <button  type="roll" value="/r (@{metaphysicskilldice} - 1)d6 + 1d6! + @{metaphysicskillpip}"></button>
+                            <input class="sheet-skilltext" type="text" name="attr_metaphysicskillname"/> 
+                            <input type="number" name="attr_metaphysicskilldice" class="sheet-smallnumber sheet-shortnumber" min="0" value="0"/>
+                            <span>D+</span>
+                            <input type="number" name="attr_metaphysicskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>                         
                         </div>
-
-                    <fieldset class="repeating_techskills">   
-                        <button  type="roll" value="/r (@{techskilldice} - 1)d6 + 1d6! + @{techskillpip}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_techskillname"/> 
-                          <div class="sheet-right">
-                          <input type="number" name="attr_techskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>D 
-                          +<input type="number" name="attr_techskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
-                          </div>
                     </fieldset>
-            </div>            
-            <div name="Mechanical" class="sheet-bold sheet-border">
-                        <button type='roll'value='/roll (@{mechanical} - 1)d6 + 1d6! + @{mechanicalpip}' >Mechanical</button>
-                        <div style="float:right;">
-                            <input type="number" name="attr_mechanical" class="sheet-smallnumber" min="1" value="3"/>D
-                            +<input type="number" name="attr_mechanicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
-		                  </div>
+                 </div>
+
+    		</div>
+
+
+    		<div class="sheet-col">
+    		    <div name="Technical" class="sheet-bold sheet-border">
+                    <div class="flexrow">
+                        <button type='roll' value='/roll (@{technical} - 1)d6 + 1d6! + @{technicalpip}' class="astext attrtext"></button>
+                        <input name="attr_AttrName6" type="text" class="skilltext attrtext" value="Technical">
+                        <input type="number" name="attr_technical" class="sheet-smallnumber" min="1" value="3"/>
+                        <span>D+</span>
+                        <input type="number" name="attr_technicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>                        
+                    </div>
+
+                    <fieldset class="repeating_techskills">
+                        <div class="flexrow">
+                            <button  type="roll" value="/r (@{techskilldice} - 1)d6 + 1d6! + @{techskillpip}"></button>
+                            <input class="sheet-skilltext" type="text" name="attr_techskillname"/>
+                            <input type="number" name="attr_techskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>
+                            <span>D+</span>
+                            <input type="number" name="attr_techskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>                       
+                        </div> 
+
+                    </fieldset>
+                </div>
+
+                <div name="Mechanical" class="sheet-bold sheet-border">
+                    <div class="flexrow">
+                        <button type='roll' value='/roll (@{mechanical} - 1)d6 + 1d6! + @{mechanicalpip}' class="attrtext"></button>
+                        <input name="attr_AttrName2" type="text" class="skilltext attrtext" value="Mechanical">
+                        <input type="number" name="attr_mechanical" class="sheet-smallnumber" min="1" value="3"/>
+                        <span>D+</span>
+                        <input type="number" name="attr_mechanicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>                        
+                    </div>
 
                     <fieldset class="repeating_mechskills">
-                        <button  type="roll" value="/r (@{mechskilldice} - 1)d6 + 1d6! + @{mechskillpip}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_mechskillname"/> 
-                          <div class="sheet-right">
-                          <input type="number" name="attr_mechskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>D 
-                          +<input type="number" name="attr_mechskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
-                          </div>
+                        <div class="flexrow">
+                            <button  type="roll" value="/r (@{mechskilldice} - 1)d6 + 1d6! + @{mechskillpip}"></button>
+                            <input class="sheet-skilltext" type="text" name="attr_mechskillname"/> 
+                            <input type="number" name="attr_mechskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>
+                            <span>D+</span>
+                            <input type="number" name="attr_mechskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>                         
+                        </div> 
                     </fieldset>
-             </div>
+                </div>
     		</div>
+
     	</div>
     </div>
+
+
     <div name="characterfeatures" class="sheet-section">
     	<div class="sheet-3colrow">
     	<div class="sheet-col">
@@ -172,6 +213,8 @@
     	</div>
     	</div>
     </div>
+
+
     <div name="characterbasics" class="sheet-section">
         <div class='sheet-3colrow'>
             <div class='sheet-col'>
@@ -207,7 +250,10 @@
             </div>
         </div>
     </div>
+
+
     <div name="weapons" class="sheet-section">
+
     	<div name="armor" class="sheet-border">
 	  		<label>Armor Type <input type="text" name="attr_armorname"/>  Armor Value <input type="number" name="attr_armorvalue" class="sheet-smallnumber" min="0" value="0"/>D+
          <input type="number" name="attr_armorvaluepip" class="sheet-smallnumber" min="0" max="2" value="0"/>  Notes <input type="text" name="attr_armornotes"/></label>
@@ -216,25 +262,40 @@
          	<input type="number" name="attr_addarmorvaluepip" class="sheet-smallnumber" min="0" max="2" value="0"/>  Notes <input type="text" name="attr_addarmornotes"/></label>
          </fieldset>	   
     	</div>
+
+
     	<div name="weapon" class="sheet-border">
-	  		<label>Weapon Type <input type="text" name="attr_weaponname"/>  Damage <input type="number" name="attr_dmg" class="sheet-smallnumber" min="0" value="0"/>D+
-         <input type="number" name="attr_dmgpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
-         Range: S/M/L 
-         <input type="number" name="attr_rangeS" class="sheet-smallnumber" min="0"/> / 
-         <input type="number" name="attr_rangeM" class="sheet-smallnumber" min="0"/> / 
-         <input type="number" name="attr_rangeL" class="sheet-smallnumber" min="0"/>
-         Ammo <input type="number" name="attr_ammo" class="sheet-smallnumber" min="0" value="0"/></label>
-         <fieldset class="repeating_addweapon">
-				<label>Weapon Type <input type="text"/>  Damage <input type="number" name="attr_adddmg" class="sheet-smallnumber" min="0" value="0"/>D+
-         	<input type="number" name="attr_adddmgpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
-         	Range: S/M/L 
-         	<input type="number" name="attr_addrangeS" class="sheet-smallnumber" min="0"/> / 
-         	<input type="number" name="attr_addrangeM" class="sheet-smallnumber" min="0"/> / 
-	         <input type="number" name="attr_addrangeL" class="sheet-smallnumber" min="0"/>
-       		Ammo <input type="number" name="attr_addammo" class="sheet-smallnumber" min="0" value="0"/></label>
-         </fieldset>	   
+	  		<label>Weapon Type 
+                <input type="text" name="attr_weaponname"/>  Damage
+                <input type="number" name="attr_dmg" class="sheet-smallnumber" min="0" value="0"/>D+
+                <input type="number" name="attr_dmgpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
+            Range: S/M/L 
+                <input type="number" name="attr_rangeS" class="sheet-smallnumber" min="0"/> / 
+                <input type="number" name="attr_rangeM" class="sheet-smallnumber" min="0"/> / 
+                <input type="number" name="attr_rangeL" class="sheet-smallnumber" min="0"/>
+                Ammo
+                <input type="number" name="attr_ammo" class="sheet-smallnumber" min="0" value="0"/>
+                <button name="roll_weapon" type="roll" value="&{template:default} {{name=**@{weaponname} Damage**}} {{Roll=[[(@{dmg} - 1)d6 + 1d6! + @{dmgpip}]]}} "></button>
+            </label>
+            
+            <fieldset class="repeating_addweapon">
+    			<label>Weapon Type 
+                    <input name="attr_weaponname" type="text"/>  Damage <input type="number" name="attr_adddmg" class="sheet-smallnumber" min="0" value="0"/>D+
+                 	<input type="number" name="attr_adddmgpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
+                 	Range: S/M/L 
+                 	<input type="number" name="attr_addrangeS" class="sheet-smallnumber" min="0"/> / 
+                 	<input type="number" name="attr_addrangeM" class="sheet-smallnumber" min="0"/> / 
+        	        <input type="number" name="attr_addrangeL" class="sheet-smallnumber" min="0"/>
+               		Ammo 
+                    <input type="number" name="attr_addammo" class="sheet-smallnumber" min="0" value="0"/>
+                    <button name="roll_damage" type="roll" value="&{template:default} {{name=**@{weaponname} Damage**}} {{Roll=[[(@{adddmg} - 1)d6 + 1d6! + @{adddmgpip}]]}}"></button>
+                </label>
+                
+            </fieldset>	   
     	</div>
     </div>
+
+
     <div name="equipment" class="sheet-section">
     	<div class="sheet-2colrow">
     		<div class="sheet-col">
@@ -253,6 +314,8 @@
          </div>    		
     	</div>
     </div>
+
+
     <div name="additionalinfo" class="sheet-section">    
       <div class="sheet-4colrow">
     		<div class="sheet-col">