From dfeee271af27d76e839cc7c58e6c288adedbb18d Mon Sep 17 00:00:00 2001
From: William Diehl <williamdiehl@hotmail.com>
Date: Sat, 2 Oct 2021 07:51:39 -0700
Subject: [PATCH 1/3] New skills from Homefront book/fixed spelling

---
 Robotech The Macross Saga (SMG)/robotech.html | 48 +++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/Robotech The Macross Saga (SMG)/robotech.html b/Robotech The Macross Saga (SMG)/robotech.html
index 1858399ded..b97dc92c66 100644
--- a/Robotech The Macross Saga (SMG)/robotech.html	
+++ b/Robotech The Macross Saga (SMG)/robotech.html	
@@ -323,15 +323,18 @@
 <script type="text/worker">
     const skills = [
         "Adept Negotiator",
+        "Alpha Strike",
         "Ambush Tactics",
         "Angelic Grace",
         "Blend In",
+        "By The Book",
         "Close Quarters",
         "Contacts Everywhere",
         "Cover Your Buddy",
         "Counter Position",
         "Escape Artist",
         "Exology",
+        "Fade To Black",
         "Flash Move",
         "Grand Presence",
         "Heavy Encryption",
@@ -339,6 +342,8 @@
         "I Can Fix It",
         "Infiltration Specialist",
         "Ironclad Strategy",
+        "Keep Pushing Forward",
+        "Last Stand",
         "Machinations",
         "Man-at-Arms",
         "Multi-Process",
@@ -354,20 +359,25 @@
         "Strafing Run",
         "Survival Expert",
         "Tradecraft",
+        "Treasure Hunt",
+        "Valued Opinion",
         "Wing & A Prayer"
     ];
 
     const benefits = [
         "Compromise",
+        "Get Everything",
         "Surprise",
         "Poise",
         "Unsuspecting",
+        "Coordination",
         "Personal",
         "Support",
         "Aid",
         "Respond",
         "Escape",
         "Familiarity",
+        "Stealth",
         "Unpredictable",
         "Attention",
         "Lock",
@@ -375,6 +385,8 @@
         "Repair",
         "Obscure",
         "Plan",
+        "Make Progress",
+        "Desperation",
         "Uncover",
         "Expertise",
         "Cope",
@@ -390,20 +402,25 @@
         "Skirmish",
         "Endure",
         "Tricks",
-        "Lucks"
+        "Uncover",
+        "Sway",
+        "Luck"
     ]
 
     const costs = [
         "Compromise",
+        "Weakened",
         "Hidden",
         "Inflexible",
         "Crowd",
+        "Telegraph",
         "Close-Ranged",
         "Availability",
         "Nearby",
         "Recognize",
         "Awareness",
         "Narrow",
+        "Exposure",
         "Short-Ranged",
         "Recognition",
         "Key",
@@ -411,6 +428,8 @@
         "Time",
         "Cover",
         "Execute",
+        "Stubbornness",
+        "Consumed",
         "Exposure",
         "Experience",
         "Concentration",
@@ -426,6 +445,8 @@
         "Movement",
         "Familiar",
         "Materials",
+        "Clues",
+        "Expertise",
         "Desperate"
     ]
 
@@ -768,15 +789,18 @@
 
 <datalist id="skill_list">
     <option value="Adept Negotiator">Adept Negotiator</option>
+    <option value="Alpha Strike">Alpha Strike</option>
     <option value="Ambush Tactics">Ambush Tactics</option>
     <option value="Angelic Grace">Angelic Grace</option>
     <option value="Blend In">Blend In</option>
+    <option value="By The Book">By The Book</option>
     <option value="Close Quarters">Close Quarters</option>
     <option value="Contacts Everywhere">Contacts Everywhere</option>
     <option value="Cover Your Buddy">Cover Your Budd</option>
     <option value="Counter Position">Counter Position</option>
     <option value="Escape Artist">Escape Artist</option>
     <option value="Exology">Exology</option>
+    <option value="Fade To Black">Fade To Black</option>
     <option value="Flash Move">Flash Move</option>
     <option value="Grand Presence">Grand Presence</option>
     <option value="Heavy Encryption">Heavy Encryption</option>
@@ -784,6 +808,8 @@
     <option value="I Can Fix It">I Can Fix It</option>
     <option value="Infiltration Specialist">Infiltration Specialist</option>
     <option value="Ironclad Strategy">Ironclad Strategy</option>
+    <option value="Keep Pushing Forward">Keep Pushing Forward</option>
+    <option value="Last Stand">Last Stand</option>
     <option value="Machinations">Machinations</option>
     <option value="Man-at-Arms">Man-at-Arms</option>
     <option value="Multi-Process">Multi-Process</option>
@@ -799,20 +825,25 @@
     <option value="Strafing Run">Strafing Run</option>
     <option value="Survival Expert">Survival Expert</option>
     <option value="Tradecraft">Tradecraft</option>
+    <option value="Treasure Hunt">Treasure Hunt</option>
+    <option value="Valued Opinion">Valued Opinion</option>
     <option value="Wing & A Prayer">Wing & A Prayer</option>
 </datalist>
 
 <datalist id="benefit_list">
     <option value="Compromise">Compromise</option>
+    <option value="Get Everything">Get Everything</option>
     <option value="Surprise">Surprise</option>
     <option value="Poise">Poise</option>
     <option value="Unsuspecting">Unsuspecting</option>
+    <option value="Coordination">Coordination</option>
     <option value="Personal">Personal</option>
     <option value="Support">Support</option>
     <option value="Aid">Aid</option>
     <option value="Respond">Respond</option>
     <option value="Escape">Escape</option>
     <option value="Familiarity">Familiarity</option>
+    <option value="Stealth">Stealth</option>
     <option value="Unpredictable">Unpredictable</option>
     <option value="Attention">Attention</option>
     <option value="Lock">Lock</option>
@@ -820,6 +851,8 @@
     <option value="Repair">Repair</option>
     <option value="Obscure">Obscure</option>
     <option value="Plan">Plan</option>
+    <option value="Make Progress">Make Progress</option>
+    <option value="Desperation">Desperation</option>
     <option value="Uncover">Uncover</option>
     <option value="Expertise">Expertise</option>
     <option value="Cope">Cope</option>
@@ -835,20 +868,25 @@
     <option value="Skirmish">Skirmish</option>
     <option value="Endure">Endure</option>
     <option value="Tricks">Tricks</option>
-    <option value="Lucks">Lucks</option>
+    <option value="Uncover">Uncover</option>
+    <option value="Sway">Sway</option>
+    <option value="Luck">Luck</option>
 </datalist>
 
 <datalist id="cost_list">
     <option value="Compromise">Compromise</option>
+    <option value="Weakend">Weakend</option>
     <option value="Hidden">Hidden</option>
     <option value="Inflexible">Inflexible</option>
     <option value="Crowd">Crowd</option>
+    <option value="Telegraph">Telegraph</option>
     <option value="Close-Ranged">Close-Ranged</option>
     <option value="Availability">Availability</option>
     <option value="Nearby">Nearby</option>
     <option value="Recognize">Recognize</option>
     <option value="Awareness">Awareness</option>
     <option value="Narrow">Narrow</option>
+    <option value="Exposure">Exposure</option>
     <option value="Short-Ranged">Short-Ranged</option>
     <option value="Recognition">Recognition</option>
     <option value="Key">Key</option>
@@ -856,6 +894,8 @@
     <option value="Time">Time</option>
     <option value="Cover">Cover</option>
     <option value="Execute">Execute</option>
+    <option value="Stubbornness">Stubbornness</option>
+    <option value="Consumed">Consumed</option>
     <option value="Exposure">Exposure</option>
     <option value="Experience">Experience</option>
     <option value="Concentration">Concentration</option>
@@ -871,6 +911,8 @@
     <option value="Movement">Movement</option>
     <option value="Familiar">Familiar</option>
     <option value="Materials">Materials</option>
+    <option value="Clues">Clues</option>
+    <option value="Expertise">Expertise</option>
     <option value="Desperate">Desperate</option>
 </datalist>
 
@@ -891,7 +933,7 @@
 <datalist id="talents">
     <option value="--">--Leadership Talents--</option>
     <option value="Munitions Strike">Munitions Strike</option>
-    <option value="Cofee Break">Cofee Break</option>
+    <option value="Coffee Break">Coffee Break</option>
     <option value="Crack Team">Crack Team</option>
     <option value="Embolden">Embolden</option>
     <option value="Fast Planner">Fast Planner</option>

From 837d1f04d0c28deece324c2c6e6727f999b4f9a5 Mon Sep 17 00:00:00 2001
From: William Diehl <williamdiehl@hotmail.com>
Date: Sat, 2 Oct 2021 09:50:05 -0700
Subject: [PATCH 2/3] Replace individual skill rolls with single roll button

---
 Robotech The Macross Saga (SMG)/robotech.css  |  15 +
 Robotech The Macross Saga (SMG)/robotech.html | 312 +++++++++---------
 2 files changed, 172 insertions(+), 155 deletions(-)

diff --git a/Robotech The Macross Saga (SMG)/robotech.css b/Robotech The Macross Saga (SMG)/robotech.css
index beecb55c4e..589800b639 100644
--- a/Robotech The Macross Saga (SMG)/robotech.css	
+++ b/Robotech The Macross Saga (SMG)/robotech.css	
@@ -108,6 +108,21 @@
     z-index: 5;
 }
 
+.charsheet .rollDice {
+    grid-column: 12/14;
+    grid-row: 10/13;
+    z-index: 5;
+}
+
+.charsheet .rollDice .btn {
+    line-height: normal;
+}
+
+.ui-dialog .charsheet .rollDice button[type="roll"] {
+    font-size: 2.0em;
+    padding: 5px 10px;
+}
+
 .charsheet .level {
     margin-left: 13px;
     margin-top: 8px;
diff --git a/Robotech The Macross Saga (SMG)/robotech.html b/Robotech The Macross Saga (SMG)/robotech.html
index b97dc92c66..5a7b8fe5eb 100644
--- a/Robotech The Macross Saga (SMG)/robotech.html	
+++ b/Robotech The Macross Saga (SMG)/robotech.html	
@@ -69,77 +69,68 @@
         <div class="columnflex nowrap" style="margin-left:29px;margin-top:48px">
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill1" />
-                <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit1"  readonly />
-                <input type="text" list="cost_list" class="skillCost" name="attr_character_cost1"  readonly/>
+                <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit1" readonly />
+                <input type="text" list="cost_list" class="skillCost" name="attr_character_cost1" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value1" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill1}}} {{value=@{character_value1}}} {{chances=@{chancesMode}}} {{result=[[@{character_value1} + @{character_value1}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill1"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill2" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit2" readonly />
-                <input type="text" list="cost_list" class="skillCost" name="attr_character_cost2"  readonly/>
+                <input type="text" list="cost_list" class="skillCost" name="attr_character_cost2" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value2" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill2}}} {{value=@{character_value2}}} {{chances=@{chancesMode}}} {{result=[[@{character_value2} + @{character_value2}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill2"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill3" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit3" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost3" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value3" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill3}}} {{value=@{character_value3}}} {{chances=@{chancesMode}}} {{result=[[@{character_value3} + @{character_value3}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill3"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill4" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit4" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost4" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value4" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill4}}} {{value=@{character_value4}}} {{chances=@{chancesMode}}} {{result=[[@{character_value4} + @{character_value4}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill4"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill5" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit5" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost5" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value5" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill5}}} {{value=@{character_value5}}} {{chances=@{chancesMode}}} {{result=[[@{character_value5} + @{character_value5}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill5"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill6" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit6" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost6" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value6" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill6}}} {{value=@{character_value6}}} {{chances=@{chancesMode}}} {{result=[[@{character_value6} + @{character_value6}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill6"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill7" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit7" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost7" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value7" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill7}}} {{value=@{character_value7}}} {{chances=@{chancesMode}}} {{result=[[@{character_value7} + @{character_value7}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill7"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill8" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit8" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost8" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value8" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill8}}} {{value=@{character_value8}}} {{chances=@{chancesMode}}} {{result=[[@{character_value8} + @{character_value8}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill8"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill9" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit9" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost9" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value9" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill9}}} {{value=@{character_value9}}} {{chances=@{chancesMode}}} {{result=[[@{character_value9} + @{character_value9}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill9"></button>
             </div>
             <div class="rowflex nowrap">
                 <input type="text" list="skill_list" class="skillName" name="attr_character_skill10" />
                 <input type="text" list="benefit_list" class="skillBenefit" name="attr_character_benefit10" readonly />
                 <input type="text" list="cost_list" class="skillCost" name="attr_character_cost10" readonly />
                 <input type="number" class="skillValue" style="width:40px" name="attr_character_value10" />
-                <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{skillname=@{character_skill10}}} {{value=@{character_value10}}} {{chances=@{chancesMode}}} {{result=[[@{character_value10} + @{character_value10}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="roll_skill10"></button>
             </div>
         </div>
     </div>
 
+
     <div class="wounds" style="margin-left: 27px;">
         <input type="hidden" name="attr_character_woundCount" value="0" />
         <div class="rowflex nowrap stdWounds">
@@ -153,9 +144,9 @@
         </div>
         <div class="rowflex nowrap extraWounds">
             <input type="checkbox" name="attr_character_brawlXtraWound1" />
-            <span style="margin-right:13px;font-size:10px;">+1</span>    
+            <span style="margin-right:13px;font-size:10px;">+1</span>
             <input type="checkbox" name="attr_character_brawlXtraWound2" />
-            <span style="margin-right:13px;font-size:10px;">+1</span>    
+            <span style="margin-right:13px;font-size:10px;">+1</span>
             <input type="checkbox" name="attr_character_brawlXtraWound3" />
             <span style="margin-right:131px;font-size:10px;">+1</span>
             <input type="checkbox" style="font-size: 10px;" name="attr_character_critXtraWound1" />
@@ -163,161 +154,175 @@
         </div>
     </div>
 
-    <div class="nature">
-        <div class="columnflex nowrap" style="margin-top:26px;margin-left:9px;">
-            <div class="rowflex nowrap">
-                <input type="hidden" name="attr_character_nature1Used"  />
-                <input class="disposition" type="text" name="attr_character_disposition1" list="nature" />
-                <input class="demeanor" type="text" name="attr_character_demeanor1" list="nature" />
-                <input type="checkbox" name="attr_character_nature1Used" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="hidden" name="attr_character_nature2Used"  />
-                <input class="disposition" type="text" name="attr_character_disposition2" list="nature" />
-                <input class="demeanor" type="text" name="attr_character_demeanor2" list="nature" />
-                <input type="checkbox" name="attr_character_nature2Used"  />
-            </div>
+
+    <div class="rollDice">
+        <div class="rowflex nowrap">
+            <button type="roll" value="&{template:skillroll} {{name=@{character_name}}} {{value=@{numDice}}} {{chances=@{chancesMode}}} {{result=[[@{numDice} + @{numDice}d6>@{dblSuccessNum}f<@{failNum}cs0cf0]]}}" name="rollDice"></button>
+        </div>
+        <div class="rowflex nowrap">
+            <input class="numDice" type="number" name="attr_numDice" value="5" />
+        </div>
+        <div class="rowflex nowrap">
+            Roll Dice
         </div>
     </div>
 
-    <div class="element">
-        <div class="columnflex nowrap" style="margin-top:26px;margin-left:9px;">
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_element1" list="elements" />
-                <input type="text" name="attr_character_element2" list="elements" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_element3" list="elements" />
-                <input type="text" name="attr_character_element4" list="elements" />
+
+        <div class="nature">
+            <div class="columnflex nowrap" style="margin-top:26px;margin-left:9px;">
+                <div class="rowflex nowrap">
+                    <input type="hidden" name="attr_character_nature1Used" />
+                    <input class="disposition" type="text" name="attr_character_disposition1" list="nature" />
+                    <input class="demeanor" type="text" name="attr_character_demeanor1" list="nature" />
+                    <input type="checkbox" name="attr_character_nature1Used" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="hidden" name="attr_character_nature2Used" />
+                    <input class="disposition" type="text" name="attr_character_disposition2" list="nature" />
+                    <input class="demeanor" type="text" name="attr_character_demeanor2" list="nature" />
+                    <input type="checkbox" name="attr_character_nature2Used" />
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="heroicMove">
-        <input type="hidden" name="attr_character_heroicMove1" value="false" />
-        <input type="hidden" name="attr_character_heroicMove2" value="false" />
-        <input type="hidden" name="attr_character_heroicMove3" value="false" />
-        <div class="rowflex nowrap" style="margin-top:15px; margin-left:103px">
-            <input style="margin-right:26px" type="checkbox" name="attr_character_heroicMove1" />
-            <input type="checkbox" name="attr_character_heroicMove2" />
-        </div>
-        <div class="rowflex nowrap" style="margin-top:2px;margin-left:147px">
-            <input type="checkbox" name="attr_character_heroicXtraMove1" />
-            <span style="font-size:10px;">+1</span>
-        </div>
-    </div>
-
-    <div class="talents">
-        <div class="columnflex nowrap" style="margin-top:47px;margin-left:25px;">
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_talent1" list="talents" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses1" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft1" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_talent2" list="talents" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses2" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft2" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_talent3" list="talents" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses3" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft3" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_talent4" list="talents" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses4" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft4" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_talent5" list="talents" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses5" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft5" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_talent6" list="talents" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses6" />
-                <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft6" />
+        <div class="element">
+            <div class="columnflex nowrap" style="margin-top:26px;margin-left:9px;">
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_element1" list="elements" />
+                    <input type="text" name="attr_character_element2" list="elements" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_element3" list="elements" />
+                    <input type="text" name="attr_character_element4" list="elements" />
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="buildPoints">
-        <input type="number" name="attr_character_buildPoints" style="width:50px" />
-    </div>
-
-    <div class="proficiencies">
-        <div class="columnflex nowrap" style="margin-top:25px;margin-left:10px;">
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_proficiency1" />
-                <input type="text" name="attr_character_proficiency2" />
+        <div class="heroicMove">
+            <input type="hidden" name="attr_character_heroicMove1" value="false" />
+            <input type="hidden" name="attr_character_heroicMove2" value="false" />
+            <input type="hidden" name="attr_character_heroicMove3" value="false" />
+            <div class="rowflex nowrap" style="margin-top:15px; margin-left:103px">
+                <input style="margin-right:26px" type="checkbox" name="attr_character_heroicMove1" />
+                <input type="checkbox" name="attr_character_heroicMove2" />
             </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_proficiency3" />
-                <input type="text" name="attr_character_proficiency4" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" name="attr_character_proficiency5" />
-                <input type="text" name="attr_character_proficiency6" />
+            <div class="rowflex nowrap" style="margin-top:2px;margin-left:147px">
+                <input type="checkbox" name="attr_character_heroicXtraMove1" />
+                <span style="font-size:10px;">+1</span>
             </div>
         </div>
-    </div>
 
-    <div class="gear">
-        <div class="columnflex nowrap" style="margin-top:23px;margin-left:9px;">
-            <div class="rowflex nowrap">
-                <input type="text" class="gearName" name="attr_character_gear1" />
-                <input type="text" class="gearDesc" name="attr_character_gearDesc1" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" class="gearName" name="attr_character_gear2" />
-                <input type="text" class="gearDesc" name="attr_character_gearDesc2" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" class="gearName" name="attr_character_gear3" />
-                <input type="text" class="gearDesc" name="attr_character_gearDesc3" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" class="gearName" name="attr_character_gear4" />
-                <input type="text" class="gearDesc" name="attr_character_gearDesc4" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" class="gearName" name="attr_character_gear5" />
-                <input type="text" class="gearDesc" name="attr_character_gearDesc5" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="text" class="gearName" name="attr_character_gear6" />
-                <input type="text" class="gearDesc" name="attr_character_gearDesc6" />
+        <div class="talents">
+            <div class="columnflex nowrap" style="margin-top:47px;margin-left:25px;">
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_talent1" list="talents" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses1" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft1" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_talent2" list="talents" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses2" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft2" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_talent3" list="talents" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses3" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft3" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_talent4" list="talents" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses4" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft4" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_talent5" list="talents" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses5" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft5" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_talent6" list="talents" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentUses6" />
+                    <input type="number" class="talentNum" style="width:40px" name="attr_character_talentLeft6" />
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="successes">
-        <div class="columnflex nowrap" style="margin-top:20px;margin-left:45px">
-            <div class="rowflex nowrap">
-                <input type="hidden" name="attr_chancesMode" value="Normal" />
-                <input type="hidden" name="attr_dblSuccessNum" value="6" />
-                <input type="hidden" name="attr_failNum" value="4" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="radio" name="attr_chancesMode" value="Advantage" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="radio" name="attr_chancesMode" value="Edge" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="radio" name="attr_chancesMode" value="Normal" checked="checked" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="radio" name="attr_chancesMode" value="Hindrance" />
-            </div>
-            <div class="rowflex nowrap">
-                <input type="radio" name="attr_chancesMode" value="Disadvantage" />
+        <div class="buildPoints">
+            <input type="number" name="attr_character_buildPoints" style="width:50px" />
+        </div>
+
+        <div class="proficiencies">
+            <div class="columnflex nowrap" style="margin-top:25px;margin-left:10px;">
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_proficiency1" />
+                    <input type="text" name="attr_character_proficiency2" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_proficiency3" />
+                    <input type="text" name="attr_character_proficiency4" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" name="attr_character_proficiency5" />
+                    <input type="text" name="attr_character_proficiency6" />
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="phases"></div>
+        <div class="gear">
+            <div class="columnflex nowrap" style="margin-top:23px;margin-left:9px;">
+                <div class="rowflex nowrap">
+                    <input type="text" class="gearName" name="attr_character_gear1" />
+                    <input type="text" class="gearDesc" name="attr_character_gearDesc1" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" class="gearName" name="attr_character_gear2" />
+                    <input type="text" class="gearDesc" name="attr_character_gearDesc2" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" class="gearName" name="attr_character_gear3" />
+                    <input type="text" class="gearDesc" name="attr_character_gearDesc3" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" class="gearName" name="attr_character_gear4" />
+                    <input type="text" class="gearDesc" name="attr_character_gearDesc4" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" class="gearName" name="attr_character_gear5" />
+                    <input type="text" class="gearDesc" name="attr_character_gearDesc5" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="text" class="gearName" name="attr_character_gear6" />
+                    <input type="text" class="gearDesc" name="attr_character_gearDesc6" />
+                </div>
+            </div>
+        </div>
+
+        <div class="successes">
+            <div class="columnflex nowrap" style="margin-top:20px;margin-left:45px">
+                <div class="rowflex nowrap">
+                    <input type="hidden" name="attr_chancesMode" value="Normal" />
+                    <input type="hidden" name="attr_dblSuccessNum" value="6" />
+                    <input type="hidden" name="attr_failNum" value="4" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="radio" name="attr_chancesMode" value="Advantage" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="radio" name="attr_chancesMode" value="Edge" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="radio" name="attr_chancesMode" value="Normal" checked="checked" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="radio" name="attr_chancesMode" value="Hindrance" />
+                </div>
+                <div class="rowflex nowrap">
+                    <input type="radio" name="attr_chancesMode" value="Disadvantage" />
+                </div>
+            </div>
+        </div>
+
+        <div class="phases"></div>
 </main>
 
 <script type="text/worker">
@@ -1013,11 +1018,8 @@
 
 <rolltemplate class="sheet-rolltemplate-skillroll">
     <div class="sheet-template-container">
-        <div class="sheet-template-header">
-            <span>{{name}} uses {{skillname}}!</span>
-        </div>
         <div class="sheet-template-row">
-            <span>Rolled {{value}} dice ({{chances}})</span>
+            <span>{{name}} rolled {{value}} dice ({{chances}})</span>
         </div>
         <div class="sheet-template-row">
             <span>{{result}} Successes</span>

From 9f26781896970a754e8b93339deb3e8f1057b134 Mon Sep 17 00:00:00 2001
From: William Diehl <williamdiehl@hotmail.com>
Date: Sat, 2 Oct 2021 11:08:40 -0700
Subject: [PATCH 3/3] Update roll template

---
 Robotech The Macross Saga (SMG)/robotech.css  | 52 ++++++++++++++++++-
 Robotech The Macross Saga (SMG)/robotech.html | 20 +++++--
 2 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/Robotech The Macross Saga (SMG)/robotech.css b/Robotech The Macross Saga (SMG)/robotech.css
index 589800b639..bb8c031542 100644
--- a/Robotech The Macross Saga (SMG)/robotech.css	
+++ b/Robotech The Macross Saga (SMG)/robotech.css	
@@ -365,4 +365,54 @@
     content: "l";
     font-size: 1.3em;
     line-height: 25px;
-}
\ No newline at end of file
+}
+
+
+.sheet-rolltemplate-skillroll .sheet-template-container {
+    border: 1px solid;
+    border-color: black;    
+}
+
+.sheet-rolltemplate-skillroll {
+    padding: 15px 15px 5px 15px;
+    margin-left: -37px;
+}
+
+.sheet-rolltemplate-skillroll .sheet-template-header {
+    background-color: deepskyblue;
+    text-align: center;
+    color: white;
+    padding: 15px;
+    border-bottom: 3px solid black;    
+    font-weight: bold;
+    font-size: 2.0em;
+}
+
+.sheet-rolltemplate-skillroll .sheet-template-content {
+    background: #FFF;
+    line-height: 1.4em;
+    padding: 5px;
+    text-align: center;
+}
+
+
+
+.sheet-rolltemplate-skillroll .sheet-player-name {
+    font-size: 1.1em;
+    font-weight: bold;
+}
+
+.sheet-rolltemplate-skillroll .sheet-diceNum {
+    font-size: 1.1em;
+    font-weight: bold;
+}
+
+.sheet-rolltemplate-skillroll .sheet-results {
+    font-size: 2.5em;
+    padding: 10px;
+}
+
+.textchatcontainer .inlinerollresult {
+    border-color: black;
+    color: deepskyblue;
+}
diff --git a/Robotech The Macross Saga (SMG)/robotech.html b/Robotech The Macross Saga (SMG)/robotech.html
index 5a7b8fe5eb..1283a1beba 100644
--- a/Robotech The Macross Saga (SMG)/robotech.html	
+++ b/Robotech The Macross Saga (SMG)/robotech.html	
@@ -1018,11 +1018,23 @@
 
 <rolltemplate class="sheet-rolltemplate-skillroll">
     <div class="sheet-template-container">
-        <div class="sheet-template-row">
-            <span>{{name}} rolled {{value}} dice ({{chances}})</span>
+        <div class="sheet-template-header">
+            {{name}}
         </div>
-        <div class="sheet-template-row">
-            <span>{{result}} Successes</span>
+        <div class="sheet-template-content">
+            <div class="sheet-template-row">
+                <span class="sheet-player-name">{{name}}</span> rolled <span class="sheet-diceNum">{{value}}</span> dice
+            </div>
+            <div class="sheet-template-row">
+                <span class="sheet-chance">(Rolled as {{chances}})</span>
+            </div>
+            <div class="sheet-template-row sheet-results">
+                <span>{{result}}</span>
+            </div>
+            <div class="sheet-template-row">
+                <span style="font-size: 1.5em">Successes</span>  
+            </div>
+            
         </div>
     </div>
 </rolltemplate>