From ff9b65ab7e34ed24f68478f9f02110869451bd7a Mon Sep 17 00:00:00 2001
From: Michael Smith <skaterx901@hotmail.com>
Date: Tue, 1 Oct 2019 04:53:52 +1000
Subject: [PATCH] Battletech: A Time of War - character sheet skills upgrade
 (#5491)

* BTATOW Fix sheet version attribute name in initial value set, add semicolons into JavaScript to conform to expected style, and move version-specific JavScript code into its own function.

* BTATOW Fix formatting of HTML for basic attributes.

* BTATOW Fix sheet version attribute name in initial value set, add semicolons into JavaScript to conform to expected style, and move version-specific JavScript code into its own function.

* BTATOW Fix formatting of HTML for basic attributes.

* BTATOW Major rework of skills to automate as much as possible.

* BTATOW Add display names for skills.

* BTATOW Initial implementation of skill roll values being set dynamically.

* BTATOW Include user-defined subskills and specialties when rolling skills.

* BTATOW Update skills when sheet is opened.

* BTATOW Start to implement data migration for skills.

* BTATOW Start to use custom font for character sheet.

* BTATOW Add warning about upcoming skills change.

* BTATOW Add custom font files and start to add in styling to look like official character sheet.

* BTATOW More tweaking and fiddling with CSS and styling.

* BTATOW More playing around with CSS and styling.

* BTATOW Add attribute names as title property to skill fields.

* BTATOW More CSS tweaking.

* BTATOW Fixed CSS and HTML to get all the skills displaying properly.

* BTATOW Remove custom fonts and font files.

* BTATOW Display linked attribute values on skills, set skills to update when attributes are updated, and hide arrows on skill XP number picker in Firefox.

* BTATOW Add first part of skills data migration.

* BTATOW Skills data migration code implemented.

* BTATOW Only update skills on sheet open when sheet version is 3 or higher, and added in code to set new skill values once migration is done. Code to update sheet version once migration is complete not working currently.

* BTATOW Add more debug statements to try and work out why migration isn't working, and fix typo in skill object.

* BTATOW Add attribute check roll buttons, and titles for attribute names.

* BTATOW Check that old skill values have a value before trying to use them to fix TypeError: t is undefined error when running skill migration script.

* BTATOW Add rollable button to skills.

* BTATOW Update skills warning to include a date for when the skills changes will be going live.

* BTATOW Add in breaks to warning message for skills update.
---
 .../BattleTech-A-Time-of-War.css              |  267 +++-
 .../BattleTech-A-Time-of-War.html             | 1253 ++++++++++++++---
 BattleTech-A-Time-of-War/sheet.json           |    1 -
 3 files changed, 1214 insertions(+), 307 deletions(-)

diff --git a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css
index 4748513e6a..6d1cebe4fd 100644
--- a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css
+++ b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css
@@ -1,15 +1,136 @@
-div.sheet-tab-content { display: none; }
+div.sheet-tab-content {
+    display: none;
+}
+
+* {
+    box-sizing: border-box;
+}
 
 input.sheet-tab1:checked ~ div.sheet-tab1,
 input.sheet-tab2:checked ~ div.sheet-tab2,
 input.sheet-tab3:checked ~ div.sheet-tab3,
-input.sheet-tab4:checked ~ div.sheet-tab4
-{
+input.sheet-tab4:checked ~ div.sheet-tab4 {
     display: block;
 }
 
-input.sheet-tab
-{
+.sheet-main {
+    color: black;
+    font-family: "Contrail One";
+    font-size: 10pt;
+    min-width: 800px;
+}
+
+.sheet-skills-headings {
+    font-weight: bold;
+    text-align: center;
+}
+
+.sheet-skills-headings.sheet-left {
+    text-align: left;
+}
+
+.sheet-skills-container {
+    align-items: flex-end;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    height: 20px;
+    max-height: 20px;
+}
+
+.sheet-skills {
+    margin: 1px 2px;
+    padding: 0;
+}
+
+button[type=roll].sheet-skill-roll {
+    background: none;
+    border: none;
+    border-image: none;
+    border-radius: 0;
+    box-shadow: none;
+    color: black;
+    display: flex;
+    font-size: 10pt;
+    margin: 0;
+    padding: 0;
+}
+
+button[type=roll].sheet-skill-roll::before {
+    content: none;
+}
+
+button[type=roll].sheet-d6 {
+    font-family: dicefontd6;
+    font-size: large;
+}
+
+.sheet-skills.sheet-content {
+    border-color: #000000;
+    border-radius: 0;
+    border-style: none none solid;
+    border-width: thin;
+    color: black;
+}
+
+.sheet-skill {
+    flex-grow: 1;
+}
+
+.sheet-skills-skill-level {
+    width: 20px;
+}
+
+.sheet-skills-linked-attributes {
+    width: 100px;
+}
+
+.sheet-skills-modifier {
+    width: 22px;
+}
+
+.sheet-skills-tnc {
+    width: 32px;
+}
+
+.sheet-skills-xp, input[type=number].sheet-skills-xp {
+    width: 26px;
+}
+
+.sheet-skill-roll {
+    width: 20px;
+}
+
+select.sheet-skills::-ms-expand {
+    display: none;
+}
+
+select.sheet-skills {
+    height: auto;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+}
+
+input[type=number].sheet-skills::-webkit-inner-spin-button,
+input[type=number].sheet-skills::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+
+input[type=number].sheet-skills {
+    -moz-appearance: textfield;
+}
+
+span.sheet-skills, input.sheet-skills, select.sheet-skills {
+    line-height: 1;
+}
+
+.sheet-skills-labels {
+    bottom: 0;
+    text-align: center;
+}
+
+input.sheet-tab {
     width: 150px;
     height: 20px;
     position: relative;
@@ -20,30 +141,24 @@ input.sheet-tab
     z-index: 1;
 }
 
-input.sheet-tab::before
-{
+input.sheet-tab::before {
     content: attr(title);
-
-
     border: solid 1px #a8a8a8;
     border-bottom-color: black;
     text-align: center;
     display: inline-block;
-    
     background: #fff;
     background: -moz-linear-gradient(to top, #c8c8c8, #fff, #c8c8c8);
     background: -webkit-linear-gradient(to top, #c8c8c8, #fff, #c8c8c8);
     background: -ms-linear-gradient(to top, #c8c8c8, #fff, #c8c8c8);
     background: -o-linear-gradient(to top, #c8c8c8, #fff, #c8c8c8);
     background: linear-gradient(to top, #c8c8c8, #fff, #c8c8c8);
-    
     width: 150px;
     height: 20px;
     font-size: 18px;
 }
 
-input.sheet-tab:checked::before
-{
+input.sheet-tab:checked::before {
     background: #dcdcdc;
     background: -moz-linear-gradient(to top, #fcfcfc, #dcdcdc, #fcfcfc);
     background: -webkit-linear-gradient(to top, #fcfcfc, #dcdcdc, #fcfcfc);
@@ -53,14 +168,11 @@ input.sheet-tab:checked::before
     border-bottom-color: #fff;
 }
 
-input.sheet-tab:not(:first-child)::before
-{
+input.sheet-tab:not(:first-child)::before {
     border-left: none;
 }
 
-
-div.sheet-tab-content
-{
+div.sheet-tab-content {
     border: 1px solid #a8a8a8;
     border-top-color: #000;
     margin: 2px 0 0 5px;
@@ -97,64 +209,64 @@ button[type=roll].sheet-blank-roll-button {
     font-size: medium;
 }
 
-.sheet-wrapper{
+.sheet-wrapper {
     overflow: auto;
     border-style: solid;
-	background-color: White;
-	border-color: lightGray;
-	margin: 5px auto;
-	border-width: thin;
-	padding: 10px;
-    width:800px;
-	max-width: 90%;
+    background-color: White;
+    border-color: lightGray;
+    margin: 5px auto;
+    border-width: thin;
+    padding: 10px;
+    width: 800px;
+    max-width: 90%;
 }
 
-.sheet-section{
+.sheet-section {
     overflow: auto;
     border-bottom: solid 1px #1E9EE3;
 }
 
-.sheet-col{
-    display:block;
-    float:left;
-    width:342px;
-    margin-right:5px;
-    margin-left:5px;
+.sheet-col {
+    display: block;
+    float: left;
+    width: 342px;
+    margin-right: 5px;
+    margin-left: 5px;
 }
 
-.sheet-input-field{
+.sheet-input-field {
     background-color: #1E9EE3;
-    display:block;
+    display: block;
     border-radius: 5px;
     color: white;
-    padding:5px;
-    margin:5px;
+    padding: 5px;
+    margin: 5px;
     float: left;
 }
 
-.sheet-input-field2{
+.sheet-input-field2 {
     background-color: #565F67;
-    display:block;
+    display: block;
     border-radius: 5px;
     color: white;
-    padding:5px;
-    margin:5px;
+    padding: 5px;
+    margin: 5px;
     float: left;
 }
 
-.sheet-input-field input{
+.sheet-input-field input {
     font-family: Narkisim;
     font-size: medium;
-    margin-left:5px;
+    margin-left: 5px;
 }
 
-.sheet-input-field2 input{
+.sheet-input-field2 input {
     font-family: Narkisim;
     font-size: medium;
-    margin-left:5px;
+    margin-left: 5px;
 }
 
-.sheet-abilities-table{
+.sheet-abilities-table {
     margin-left: auto;
     margin-right: auto;
     margin-top: 5px;
@@ -163,29 +275,29 @@ button[type=roll].sheet-blank-roll-button {
     border-collapse: separate;
 }
 
-.sheet-abilities-table th{
+.sheet-abilities-table th {
     background-color: #1E9EE3;
-    color:white;
+    color: white;
     font-weight: normal;
     border-radius: 5px;
-    padding:5px;
+    padding: 5px;
 }
 
-.sheet-abilities-table td{
-    padding:5px;
+.sheet-abilities-table td {
+    padding: 5px;
     background-color: #9DD6F5;
     border-radius: 5px;
     text-align: center;
 }
 
-.sheet-specialties{
+.sheet-specialties {
     width: 170px;
     height: 38px;
     margin-bottom: 0;
-    resize:none;
+    resize: none;
 }
 
-.sheet-section-table{
+.sheet-section-table {
     margin-left: auto;
     margin-right: auto;
     margin-top: 5px;
@@ -194,26 +306,26 @@ button[type=roll].sheet-blank-roll-button {
     border-collapse: separate;
 }
 
-.sheet-section-table th{
-    width:150px;
+.sheet-section-table th {
+    width: 150px;
     background-color: #303030;
-    color:white;
+    color: white;
     font-weight: normal;
     border-radius: 5px;
-    padding:5px;
+    padding: 5px;
 }
 
-.sheet-section-table td{
+.sheet-section-table td {
     text-align: center;
-    width:150px;
+    width: 150px;
     background-color: white;
-    color:#303030;
+    color: #303030;
     font-weight: normal;
     border-radius: 5px;
-    padding:5px;
+    padding: 5px;
 }
 
-.sheet-section-table2{
+.sheet-section-table2 {
     margin-left: auto;
     margin-right: auto;
     margin-top: 5px;
@@ -222,39 +334,38 @@ button[type=roll].sheet-blank-roll-button {
     border-collapse: separate;
 }
 
-.sheet-section-table2 th{
+.sheet-section-table2 th {
     background-color: #303030;
-    color:white;
+    color: white;
     font-weight: normal;
     border-radius: 5px;
-    padding:5px;
+    padding: 5px;
 }
 
-.sheet-section-table2 td{
+.sheet-section-table2 td {
     text-align: center;
     background-color: white;
-    color:#303030;
+    color: #303030;
     font-weight: normal;
     border-radius: 5px;
-    padding:5px;
+    padding: 5px;
 }
 
-.sheet-info{
+.sheet-info {
     text-align: center;
-    width:150px;
-    color:#303030;
+    width: 150px;
+    color: #303030;
     font-weight: normal;
     font-size: 70%;
     border-radius: 5px;
-    padding:2px;
+    padding: 2px;
 }
 
-.sheet-info2{
+.sheet-info2 {
     text-align: center;
-    color:#303030;
+    color: #303030;
     font-weight: normal;
     font-size: 70%;
     border-radius: 5px;
-    padding:2px;
-}
-
+    padding: 2px;
+}
\ No newline at end of file
diff --git a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html
index b068f1c866..008ca3305c 100644
--- a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html
+++ b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html
@@ -1,15 +1,15 @@
-<input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Personal Data" checked="checked"/>
-<input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2" title="Combat Data"/>
-<input type="radio" name="attr_tab" class="sheet-tab sheet-tab3" value="3" title="Skills"/>
-<input type="radio" name="attr_tab" class="sheet-tab sheet-tab4" value="4" title="Inventory"/>
+<input type="radio" name="attr_tab" class="tab tab1" value="1" title="Personal Data" checked="checked"/>
+<input type="radio" name="attr_tab" class="tab tab2" value="2" title="Combat Data"/>
+<input type="radio" name="attr_tab" class="tab tab3" value="3" title="Skills"/>
+<input type="radio" name="attr_tab" class="tab tab4" value="4" title="Inventory"/>
 
 <input type="hidden" name="attr_btatow_sheet_version" value="1"/>
 
-<div class="sheet-tab-content sheet-tab1"><!-- Personal Data -->
+<div class="tab-content tab1"><!-- Personal Data -->
     <h1>Personal Data</h1>
-    <div class="sheet-wrapper">
-        <div class="sheet-section">
-            <div class="sheet-input-field2">
+    <div class="wrapper">
+        <div class="section">
+            <div class="input-field2">
                 Name <br><input type="text" name="attr_name" style="width:450px;">
             </div>
             <div class="sheet-input-field2">
@@ -95,14 +95,14 @@
     </div>
 </div>
 
-<div class="sheet-tab-content sheet-tab2"><!-- Combat Data -->
+<div class="tab-content tab2"><!-- Combat Data -->
     <h1>Combat Data</h1>
-    <div class="sheet-wrapper">
-        <div class="sheet-section">
-            <div class="sheet-col">
-                <div class="sheet-input-field" style="width:328px;margin-top:8px;padding-top:10px;">
+    <div class="wrapper">
+        <div class="section">
+            <div class="col">
+                <div class="input-field" style="width:328px;margin-top:8px;padding-top:10px;">
                     <span style="font-size:large">Attributes</span><br>
-                    <table class="sheet-section-table">
+                    <table class="section-table">
                         <tr>
                             <th>Attribute</th>
                             <th>Score</th>
@@ -312,10 +312,10 @@
                     </table>
                 </div>
             </div>
-            <div class="sheet-col">
-                <div class="sheet-input-field" style="width:328px;margin-top:8px;padding-top:10px;">
+            <div class="col">
+                <div class="input-field" style="width:328px;margin-top:8px;padding-top:10px;">
                     <span style="font-size:large">Condition Monitor</span><br>
-                    <table class="sheet-section-table">
+                    <table class="section-table">
                         <tr>
                             <th>Standard Damage</th>
                             <th>Fatigue Damage</th>
@@ -333,18 +333,18 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Max Standard Damage = BOD x 2
                             </td>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Max Fatigue Damage = WIL x 2
                             </td>
                         </tr>
                     </table>
                 </div>
-                <div class="sheet-input-field" style="width:328px;margin-top:8px;padding-top:10px;">
+                <div class="input-field" style="width:328px;margin-top:8px;padding-top:10px;">
                     <span style="font-size:large">Movement MP (Meters per Turn)</span><br>
-                    <table class="sheet-section-table">
+                    <table class="section-table">
                         <tr>
                             <th>Walk (MP)</th>
                             <th>Run/Evade</th>
@@ -364,13 +364,13 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Walk = STR + RFL
                             </td>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Run = 10 + STR + RFL + Running Skill Level
                             </td>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Sprint = Run MP x 2
                             </td>
                         </tr>
@@ -392,13 +392,13 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Climb = MP / 2 + Climbing Skill Level
                             </td>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Crawl = MP / 4
                             </td>
-                            <td class="sheet-info" style="background-color: #DBDBDB;">
+                            <td class="info" style="background-color: #DBDBDB;">
                                 Swim = MP + Swimming Skill Level
                             </td>
                         </tr>
@@ -406,11 +406,11 @@
                 </div>
             </div>
             <div>
-                <div class="sheet-input-field"
+                <div class="input-field"
                      style="width:695px;margin-top:8px;padding-top:10px;background-color:#855C33">
                     <span style="font-size:large">Armor</span><br>
                     <fieldset class="repeating_armor">
-                        <table class="sheet-section-table2">
+                        <table class="section-table2">
                             <tr>
                                 <th>Personal Armor</th>
                                 <th>Location</th>
@@ -435,27 +435,27 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="sheet-info2" style="background-color: #DBDBDB;">
+                                <td class="info2" style="background-color: #DBDBDB;">
                                     Example: Jacket
                                 </td>
-                                <td class="sheet-info2" style="background-color: #DBDBDB;">
+                                <td class="info2" style="background-color: #DBDBDB;">
                                     Example: Torso, Arms
                                 </td>
-                                <td class="sheet-info2" style="background-color: #DBDBDB;">
+                                <td class="info2" style="background-color: #DBDBDB;">
                                     Example: Flak
                                 </td>
-                                <td class="sheet-info2" style="background-color: #DBDBDB;">
+                                <td class="info2" style="background-color: #DBDBDB;">
                                     Example: 1/5/1/3
                                 </td>
                             </tr>
                         </table>
                     </fieldset>
                 </div>
-                <div class="sheet-input-field"
+                <div class="input-field"
                      style="width:695px;margin-top:8px;padding-top:10px;background-color:#CF2929">
                     <span style="font-size:large">Weapon</span><br>
                     <fieldset class="repeating_weapon">
-                        <table class="sheet-section-table2">
+                        <table class="section-table2">
                             <tr>
                                 <th>Weapon</th>
                                 <th>Ammo</th>
@@ -481,7 +481,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="sheet-section-table2">
+                        <table class="section-table2">
                             <tr>
                                 <th>Skill</th>
                                 <th>TN</th>
@@ -514,150 +514,136 @@
     </div>
 </div>
 
-<div class="sheet-tab-content sheet-tab3">
-    <h1>Skills</h1>
-    <h3>UPDATE: The skills update will be going live on the 1st of October.<br>
-        <br>
-        IMPORTANT: A major update for the skills will be coming in the next month or so. This is a massive overhaul,
-        and will require your existing skill data to be migrated to work with the new skills. However, the migration is
-        complicated, and cannot be guaranteed to be successful. Therefore, please make a back up of all your skills,
-        including the skill, the notes, and the amount of XP.</h3>
-    <div class="sheet-wrapper">
-        <div class="sheet-section">
-            <div>
-                <div class="sheet-input-field"
-                     style="width:695px;margin-top:8px;padding-top:10px;background-color:#66ff66">
-                    <span style="font-size:large">Skills</span><br>
-                    <fieldset class="repeating_skills">
-                        <table class="sheet-section-table2">
-                            <tr>
-                                <th>Skill</th>
-                                <th>Link</th>
-                                <th>TN/C</th>
-                            </tr>
-                            <tr>
-                                <td style="text-align:left">
-                                    <select name="attr_skill" class="skill">
-                                        <option value="Acrobatics">Acrobatics</option>
-                                        <option value="Acting">Acting</option>
-                                        <option value="Administration">Administration</option>
-                                        <option value="Animal Handling">Animal Handling</option>
-                                        <option value="Appraisal">Appraisal</option>
-                                        <option value="Archery">Archery</option>
-                                        <option value="ArtB">Art [Basic Tier]</option>
-                                        <option value="ArtA">Art [Advanced Tier]</option>
-                                        <option value="Artillery">Artillery</option>
-                                        <option value="Career">Career</option>
-                                        <option value="Climbing">Climbing</option>
-                                        <option value="Communications">Communications</option>
-                                        <option value="ComputersB">Computers [Basic Tier]</option>
-                                        <option value="ComputersA">Computers [Advanced Tier]</option>
-                                        <option value="Cryptography">Cryptography</option>
-                                        <option value="Demolitions">Demolitions</option>
-                                        <option value="Disguise">Disguise</option>
-                                        <option value="Driving">Driving</option>
-                                        <option value="Escape Artist">Escape Artist</option>
-                                        <option value="Forgery">Forgery</option>
-                                        <option value="Gunnery">Gunnery</option>
-                                        <option value="InterestB">Interest [Basic Tier]</option>
-                                        <option value="InterestA">Interest [Advanced Tier]</option>
-                                        <option value="Interrogation">Interrogation</option>
-                                        <option value="Investigation">Investigation</option>
-                                        <option value="Language">Language</option>
-                                        <option value="Leadership">Leadership</option>
-                                        <option value="Martial ArtsB">Martial Arts [Basic Tier]</option>
-                                        <option value="Martial ArtsA">Martial Arts [Advanced Tier]</option>
-                                        <option value="MedTech">MedTech</option>
-                                        <option value="Melee WeaponsB">Melee Weapons [Basic Tier]</option>
-                                        <option value="Melee WeaponsA">Melee Weapons [Advanced Tier]</option>
-                                        <option value="Navigation">Navigation</option>
-                                        <option value="Negotiation">Negotiation</option>
-                                        <option value="Perception">Perception</option>
-                                        <option value="Piloting">Piloting</option>
-                                        <option value="PrestidigitationB">Prestidigitation [Basic Tier]</option>
-                                        <option value="PrestidigitationA">Prestidigitation [Advanced Tier]</option>
-                                        <option value="Protocol">Protocol</option>
-                                        <option value="Running">Running</option>
-                                        <option value="Science">Science</option>
-                                        <option value="Security Systems">Security Systems</option>
-                                        <option value="Sensor Operations">Sensor Operations</option>
-                                        <option value="Small Arms">Small Arms</option>
-                                        <option value="Stealth">Stealth</option>
-                                        <option value="Strategy">Strategy</option>
-                                        <option value="Streetwise">Streetwise</option>
-                                        <option value="Support Weapons">Support Weapons</option>
-                                        <option value="Surgery">Surgery</option>
-                                        <option value="Survival">Survival</option>
-                                        <option value="Swimming">Swimming</option>
-                                        <option value="Tactics">Tactics</option>
-                                        <option value="Technician">Technician</option>
-                                        <option value="Thrown Weapons">Thrown Weapons</option>
-                                        <option value="Tracking">Tracking</option>
-                                        <option value="Training">Training</option>
-                                        <option value="Zero-G Operations">Zero-G Operations</option>
-                                    </select>
-                                </td>
-                                <td>
-                                    <select name="attr_Links" class="links">
-                                        <option value="RFL">RFL</option>
-                                        <option value="CHA">CHA</option>
-                                        <option value="WIL">WIL</option>
-                                        <option value="INT">INT</option>
-                                        <option value="DEX">DEX</option>
-                                        <option value="STR">STR</option>
-                                        <option value="INTWIL">INT + WIL</option>
-                                        <option value="DEXINT">DEX + INT</option>
-                                        <option value="RFLDEX">RFL + DEX</option>
-                                        <option value="STRDEX">STR + DEX</option>
-                                        <option value="WILCHA">WIL + CHA</option>
-                                        <option value="INTCHA">INT + CHA</option>
-                                        <option value="REFINT">REF + INT</option>
-                                        <option value="BODINT">BOD + INT</option>
-                                    </select>
-                                </td>
-                                <td>
-                                    <select name="attr_TNC" class="TNC">
-                                        <option value="7">7 / SB</option>
-                                        <option value="8">8 / SA</option>
-                                        <option value="8">8 / CB</option>
-                                        <option value="9">9 / CA</option>
-                                    </select>
-                                </td>
-                            </tr>
-                        </table>
-                        <table class="sheet-section-table2">
-                            <tr>
-                                <th>Notes</th>
-                                <th>Mod</th>
-                                <th>Skill Level</th>
-                                <th>XP</th>
-                                <th>Check</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_skillNotes" style="width:405px;"/>
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_skillMod"/>
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_skilllvl">
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_skillXP"/>
-                                </td>
-                                <td>
-                                    <button type='roll' name="roll_Skillcheck" value='@{skill} Skill Check
-                                    Margin of Success: [[2d6 + @{skillMod} - @{TNC}]] '/>
-                                </td>
-                            </tr>
-                        </table>
-                        <br>
-                    </fieldset>
-                </div>
-            </div>
-        </div>
+<!-- SKILLS -->
+<div class="tab-content tab3 main">
+    <h3>Skills</h3>
+    <div class="skills-headings skills-container">
+        <span class="skills skill skills-headings left">Skill</span>
+        <span class="skills skills-skill-level">Lvl</span>
+        <span class="skills skills-linked-attributes">Links</span>
+        <span class="skills skills-modifier">Mod</span>
+        <span class="skills skills-tnc">TN/C</span>
+        <span class="skills skills-xp">XP</span>
+        <span class="skills skill-roll"></span>
     </div>
+    <fieldset class="repeating_skills">
+        <div class="skills-container">
+            <select name="attr_skill" class="skills skill content" title="@{repeating_skills_$id_skill}">
+                <option value="acrobatics_free_fall">Acrobatics/Free-Fall</option>
+                <option value="acrobatics_gymnastics">Acrobatics/Gymnastics</option>
+                <option value="acting">Acting</option>
+                <option value="administration">Administration</option>
+                <option value="animal_handling_herding">Animal Handling/Herding</option>
+                <option value="animal_handling_riding">Animal Handling/Riding</option>
+                <option value="animal_handling_training">Animal Handling/Training</option>
+                <option value="appraisal">Appraisal</option>
+                <option value="archery">Archery</option>
+                <option value="art">Art</option>
+                <option value="artillery">Artillery</option>
+                <option value="career">Career</option>
+                <option value="climbing">Climbing</option>
+                <option value="communications_black_box">Communications/Black Box</option>
+                <option value="communications_conventional">Communications/Conventional (EM)</option>
+                <option value="communications_hyperpulse_generator">Communications/Hyperpulse Generator</option>
+                <option value="computers">Computers</option>
+                <option value="cryptography">Cryptography</option>
+                <option value="demolitions">Demolitions</option>
+                <option value="disguise">Disguise</option>
+                <option value="driving_ground_vehicles">Driving/Ground Vehicles</option>
+                <option value="driving_rail_vehicles">Driving/Rail Vehicles</option>
+                <option value="driving_sea_vehicles">Driving/Sea Vehicles</option>
+                <option value="escape_artist">Escape Artist</option>
+                <option value="forgery">Forgery</option>
+                <option value="gunnery_aerospace">Gunnery/Aerospace</option>
+                <option value="gunnery_air_vehicle">Gunnery/Air Vehicle</option>
+                <option value="gunnery_battlesuit">Gunnery/Battlesuit</option>
+                <option value="gunnery_ground_vehicle">Gunnery/Ground Vehicle</option>
+                <option value="gunnery_mech">Gunnery/'Mech</option>
+                <option value="gunnery_protomech">Gunnery/ProtoMech</option>
+                <option value="gunnery_sea_vehicle">Gunnery/Sea Vehicle</option>
+                <option value="gunnery_spacecraft">Gunnery/Spacecraft</option>
+                <option value="gunnery_turret">Gunnery/Turret</option>
+                <option value="interest">Interest</option>
+                <option value="interrogation">Interrogation</option>
+                <option value="investigation">Investigation</option>
+                <option value="language">Language</option>
+                <option value="leadership">Leadership</option>
+                <option value="martial_arts">Martial Arts</option>
+                <option value="medtech_general">MedTech/General</option>
+                <option value="medtech_veterinary">MedTech/Veterinary</option>
+                <option value="melee_weapons">Melee Weapons</option>
+                <option value="navigation_air">Navigation/Air</option>
+                <option value="navigation_ground">Navigation/Ground</option>
+                <option value="navigation_kf_jump">Navigation/K-F Jump</option>
+                <option value="navigation_sea">Navigation/Sea</option>
+                <option value="navigation_space">Navigation/Space</option>
+                <option value="negotiation">Negotiation</option>
+                <option value="perception">Perception</option>
+                <option value="piloting_aerospace">Piloting/Aerospace</option>
+                <option value="piloting_air_vehicle">Piloting/Air Vehicle</option>
+                <option value="piloting_battlesuit">Piloting/Battlesuit</option>
+                <option value="piloting_ground_vehicle">Piloting/Ground Vehicle</option>
+                <option value="piloting_mech">Piloting/'Mech</option>
+                <option value="piloting_protomech">Piloting/ProtoMech</option>
+                <option value="piloting_rail_vehicle">Piloting/Rail Vehicle</option>
+                <option value="piloting_sea_vehicle">Piloting/Sea Vehicle</option>
+                <option value="piloting_spacecraft">Piloting/Spacecraft</option>
+                <option value="prestidigitation_pick_pocket">Prestidigitation/Pick Pocket</option>
+                <option value="prestidigitation_quickdraw">Prestidigitation/Quickdraw</option>
+                <option value="prestidigitation_sleight_of_hand">Prestidigitation/Sleight of Hand</option>
+                <option value="protocol">Protocol</option>
+                <option value="running">Running</option>
+                <option value="science">Science</option>
+                <option value="security_systems_electronic">Security Systems/Electronic</option>
+                <option value="security_systems_mechanical">Security Systems/Mechanical</option>
+                <option value="sensor_operations">Sensor Operations</option>
+                <option value="small_arms">Small Arms</option>
+                <option value="stealth">Stealth</option>
+                <option value="strategy">Strategy</option>
+                <option value="streetwise">Streetwise</option>
+                <option value="support_weapons">Support Weapons</option>
+                <option value="surgery_general">Surgery/General</option>
+                <option value="surgery_veterinary">Surgery/Veterinary</option>
+                <option value="survival">Survival</option>
+                <option value="swimming">Swimming</option>
+                <option value="tactics_air">Tactics/Air</option>
+                <option value="tactics_infantry">Tactics/Infantry</option>
+                <option value="tactics_land">Tactics/Land</option>
+                <option value="tactics_sea">Tactics/Sea</option>
+                <option value="tactics_space">Tactics/Space</option>
+                <option value="technician_aeronautics">Technician/Aeronautics</option>
+                <option value="technician_cybernetics">Technician/Cybernetics</option>
+                <option value="technician_electronics">Technician/Electronics</option>
+                <option value="technician_jets">Technician/Jets</option>
+                <option value="technician_mechanical">Technician/Mechanical</option>
+                <option value="technician_myomer">Technician/Myomer</option>
+                <option value="technician_nuclear">Technician/Nuclear</option>
+                <option value="technician_weapons">Technician/Weapons</option>
+                <option value="thrown_weapons_blades">Thrown Weapons/Blades</option>
+                <option value="thrown_weapons_blunt_weapons">Thrown Weapons/Blunt Weapons</option>
+                <option value="tracking_urban">Tracking/Urban</option>
+                <option value="tracking_wilds">Tracking/Wilds</option>
+                <option value="training">Training</option>
+                <option value="zero_g_operations">Zero-G Operations</option>
+            </select>
+            <input type="text" name="attr_sub_skill" class="skills skill content" title="@{repeating_skills_$id_sub_skill}">
+                <span name="attr_skill_level" class="skills content skills-labels skills-skill-level" title="@{repeating_skills_$id_skill_level}"></span>
+                <input type="hidden" name="attr_skill_level">
+                <span name="attr_skill_linked_attributes" class="skills content skills-labels skills-linked-attributes" title="@{repeating_skills_$id_skill_linked_attributes}"></span>
+                <input type="hidden" name="attr_skill_linked_attributes">
+                <span name="attr_skill_modifier" class="skills content skills-labels skills-modifier" title="@{repeating_skills_$id_skill_modifier}"></span>
+                <input type="hidden" name="attr_skill_modifier">
+                <span name="attr_skill_tnc" class="skills content skills-labels skills-tnc" title="@{repeating_skills_$id_skill_tnc}"></span>
+                <input type="hidden" name="attr_skill_tnc">
+                <input type="hidden" name="attr_target_number">
+            <input type="number" name="attr_skill_xp" class="skills content skills-labels skills-xp" title="@{repeating_skills_$id_skill_xp}">
+            <input type="hidden" name="attr_skill_roll_value" value="Acrobatics/Free-Fall Skill Check
+                                        Margin of Success: [[2d6 + @{skill_modifier}[MOD] - @{target_number}[TN]]]">
+            <span class="skills skills-labels">
+                <button type="roll" name="roll_skill_check" value="@{skill_roll_value}" class="skill-roll skills-labels d6" title="@{repeating_skills_$id_skill_check}">l</button>
+            </span>
+        </div>
+    </fieldset>
 </div>
 
 <div class="sheet-tab-content sheet-tab4">
@@ -774,7 +760,26 @@
 
 <script type="text/worker">
 // run any data migrations
-on("sheet:opened", sheetMigration);
+on("sheet:opened", () => {
+    sheetMigration();
+
+    getAttrs(["btatow_sheet_version"], values => {
+        if (values["btatow_sheet_version"] >= 3) {
+            recalculateSkills();
+        }
+    });
+});
+
+const recalculateSkills = () => {
+    getSectionIDs("skills", ids => {
+        ids.forEach(id => getAttrs(["repeating_skills_" + id + "_skill_xp"], values => {
+            skillXPChanged({
+                newValue: values["repeating_skills_" + id + "_skill_xp"],
+                id: id
+            })
+        }));
+    });
+}
 
 const STRENGTH_XP = "strength_xp";
 const BODY_XP = "body_xp";
@@ -785,58 +790,70 @@ const WILL_XP = "will_xp";
 const CHARISMA_XP = "charisma_xp";
 const EDGE_XP = "edge_xp";
 
-// calculate stat values when XP amount changes
-on("change:strength_xp change:body_xp change:reflex_xp change:dexterity_xp change:intelligence_xp change:will_xp change:charisma_xp change:edge_xp", (eventInfo) => {
-    attributeName = eventInfo.sourceAttribute;
+const STRENGTH_LINK = "strength_link";
+const BODY_LINK = "body_link";
+const REFLEX_LINK = "reflex_link";
+const DEXTERITY_LINK = "dexterity_link";
+const INTELLIGENCE_LINK = "intelligence_link";
+const WILL_LINK = "will_link";
+const CHARISMA_LINK = "charisma_link";
+const EDGE_LINK = "edge_link";
 
-    console.debug("attribute name = " + attributeName);
+// calculate stat values when XP amount changes
+on("change:strength_xp change:body_xp change:reflex_xp change:dexterity_xp change:intelligence_xp change:will_xp change:charisma_xp change:edge_xp", eventInfo => {
+    attributeName = eventInfo.sourceAttribute;
 
     attributeValue = Math.floor(eventInfo.newValue/100);
     attributeLinkedValue = calculateLinkedAttributeValue(attributeValue);
 
+    let attributesToSet = {};
+
     switch (attributeName) {
-        case STRENGTH_XP: setAttrs({
+        case STRENGTH_XP: attributesToSet = {
                             strength: attributeValue,
                             strength_link: attributeLinkedValue
-                        });
+                        };
                         break;
-        case BODY_XP: setAttrs({
+        case BODY_XP: attributesToSet = {
                             body: attributeValue,
                             body_link: attributeLinkedValue
-                        });
+                        };
                         break;
-        case REFLEX_XP: setAttrs({
+        case REFLEX_XP: attributesToSet = {
                             reflex: attributeValue,
                             reflex_link: attributeLinkedValue
-                        });
+                        };
                         break;
-        case DEXTERITY_XP: setAttrs({
+        case DEXTERITY_XP: attributesToSet = {
                             dexterity: attributeValue,
                             dexterity_link: attributeLinkedValue
-                        });
+                        };
                         break;
-        case INTELLIGENCE_XP: setAttrs({
+        case INTELLIGENCE_XP: attributesToSet = {
                             intelligence: attributeValue,
                             intelligence_link: attributeLinkedValue
-                        });
+                        };
                         break;
-        case WILL_XP: setAttrs({
+        case WILL_XP: attributesToSet = {
                             will: attributeValue,
                             will_link: attributeLinkedValue
-                        });
+                        };
                         break;
-        case CHARISMA_XP: setAttrs({
+        case CHARISMA_XP: attributesToSet = {
                             charisma: attributeValue,
                             charisma_link: attributeLinkedValue
-                        });
+                        };
                         break;
-        case EDGE_XP: setAttrs({
+        case EDGE_XP: attributesToSet = {
                             edge: attributeValue,
                             edge_link: attributeLinkedValue
-                        });
+                        };
                         break;
         default: console.error("unknown attribute type passed in to basic attribute on change function");
+                        return;
     }
+
+    setAttrs(attributesToSet, {}, recalculateSkills)
 });
 
 function calculateLinkedAttributeValue(attribute) {
@@ -858,39 +875,714 @@ function calculateLinkedAttributeValue(attribute) {
     }
 }
 
-function getAttributeType(attribute) {
-    if (attribute.toLowerCase() === STRENGTH)
-        return STRENGTH;
-    if (attribute.toLowerCase() === BODY)
-        return BODY;
-    if (attribute.toLowerCase() === REFLEX)
-        return REFLEX;
-    if (attribute.toLowerCase() === DEXTERITY)
-        return DEXTERITY;
-    if (attribute.toLowerCase() === INTELLIGENCE)
-        return INTELLIGENCE;
-    if (attribute.toLowerCase() === WILL)
-        return WILL;
-    if (attribute.toLowerCase() === CHARISMA)
-        return CHARISMA;
-    if (attribute.toLowerCase() === EDGE)
-        return EDGE;
-    alert("Unknown attribute type passed to function getAttributeType()")
-    return null;
+on("change:repeating_skills:skill change:repeating_skills:sub_skill", eventInfo => {
+    getAttrs(["repeating_skills_skill_xp"], values => {
+        skillXPChanged({newValue: values["repeating_skills_skill_xp"]});
+    });
+});
+
+// calculate skill modifiers when skill xp changes
+on("change:repeating_skills:skill_xp", skillXPChanged);
+
+function skillXPChanged(eventInfo) {
+    const tieredSkills = [
+        "art",
+        "computers",
+        "interest",
+        "martial",
+        "melee",
+        "prestidigitation"
+    ];
+
+    // When the sheet is opened, or data migrations are run, the skills are retrieved via ID, and thus must have their
+    // ID included in the attribute name when setting attributes.
+    const id = eventInfo.id !== undefined ? eventInfo.id + "_" : ""
+
+    const skill = "repeating_skills_" + id + "skill";
+    const skillLevel = "repeating_skills_" + id + "skill_level";
+    const subSkillAttrName = "repeating_skills_" + id + "sub_skill";
+
+    getAttrs([skill, subSkillAttrName], values => {
+        const skillName = values[skill]
+        const skillNameLookupKey = skillName.split("_")[0]
+        const subSkill = values[subSkillAttrName]
+
+        let skillAttributesToSet = {};
+
+        skillAttributesToSet[skillLevel] = calculateSkillLevel(Number(eventInfo.newValue), 0);
+
+        const skillData = getSkill(
+            skillNameLookupKey,
+            skillAttributesToSet[skillLevel],
+            tieredSkills.includes(skillNameLookupKey)
+        );
+
+        skillAttributesToSet["repeating_skills_" + id + "skill_tnc"] = skillData.targetNumber + "/" + skillData.complexity;
+        skillAttributesToSet["repeating_skills_" + id + "target_number"] = skillData.targetNumber;
+
+        getAttrs(skillData.linkedAttributes, values => {
+            skillAttributesToSet["repeating_skills_" + id + "skill_modifier"] = Object.values(values)
+                .reduce((total, num) => Number(total) + Number(num)) + Number(skillAttributesToSet[skillLevel]);
+
+            skillAttributesToSet["repeating_skills_" + id + "skill_linked_attributes"] = skillData.linkedAttributes
+                .map(linkAtr => getLinkedAttributeDisplayName(linkAtr) + " (" + values[linkAtr] + ")")
+                .join(" + ");
+
+            skillAttributesToSet["repeating_skills_" + id + "skill_roll_value"] =
+                getSkillDisplayName(skillData, skillName, subSkill) + " Skill Check:\n" +
+                "Margin of Success: [[2d6 + @{skill_modifier}[MOD] - @{target_number}[TN]]]";
+
+            setAttrs(skillAttributesToSet);
+        });
+    });
+}
+
+function calculateSkillLevel(skillXP, learningSpeedModifier) {
+    skillXP = Number(skillXP);
+    learningSpeedModifier = Number(learningSpeedModifier);
+
+    if (skillXP < (30 + (learningSpeedModifier * 3))) {
+        return 0;
+    }
+
+    if (skillXP >= (570 + (learningSpeedModifier * 57))) {
+        return 10;
+    }
+
+    let currentSkillXP = skillXP - (20 + (learningSpeedModifier * 2));
+
+    for (i = 1; i < 11; i++) {
+        if (currentSkillXP < i * (10 + learningSpeedModifier)) {
+            return i - 1;
+        }
+
+        currentSkillXP -= (i * (10 + learningSpeedModifier));
+    }
+
+    console.error("should never hit this line, this means the skill XP is not less than level 1, not greater than level 10, but also not within a level range.");
+    return undefined;
+}
+
+function getSkillDisplayName(skill, skillDisplayNameKey, subSkill) {
+    if (skill.subSkills === true) {
+        return skill.displayName[skillDisplayNameKey] + "/" + subSkill;
+    }
+
+    if (typeof subSkill === "string" && subSkill != "") {
+        return skill.displayName[skillDisplayNameKey] + " (" + subSkill + ")";
+    }
+
+    return skill.displayName[skillDisplayNameKey];
+}
+
+const skillsList = {
+    "acrobatics": {
+        "linkedAttributes": [ REFLEX_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "acrobatics_free_fall": "Acrobatics/Free-Fall",
+            "acrobatics_gymnastics": "Acrobatics/Gymnastics"
+        }
+    },
+    "acting": {
+        "linkedAttributes": [ CHARISMA_LINK ],
+        "targetNumber": 8,
+        "complexity": "CB",
+        "subSkills": false,
+        "displayName": {
+            "acting": "Acting"
+        }
+    },
+    "administration": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "administration": "Administration"
+        }
+    },
+    "animal": {
+        "linkedAttributes": [ WILL_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "animal_handling_herding": "Animal Handling/Herding",
+            "animal_handling_riding": "Animal Handling/Riding",
+            "animal_handling_training": "Animal Handling/Training"
+        }
+    },
+    "appraisal": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 8,
+        "complexity": "CB",
+        "subSkills": false,
+        "displayName": {
+            "appraisal": "Appraisal"
+        }
+    },
+    "archery": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "archery": "Archery"
+        }
+    },
+    "artillery": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "artillery": "Artillery"
+        }
+    },
+    "career": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": true,
+        "displayName": {
+            "career": "Career"
+        }
+    },
+    "climbing": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "climbing": "Climbing"
+        }
+    },
+    "communications": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "communications_black_box": "Communications/Black Box",
+            "communications_conventional_em": "Communications/Conventional (EM)",
+            "communications_hyperpulse_generator": "Communications/Hyperpulse Generator"
+        }
+    },
+    "cryptography": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "cryptography": "Cryptography"
+        }
+    },
+    "demolitions": {
+        "linkedAttributes": [ DEXTERITY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "demolitions": "Demolitions"
+        }
+    },
+    "disguise": {
+        "linkedAttributes": [ CHARISMA_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "disguise": "Disguise"
+        }
+    },
+    "driving": {
+        "linkedAttributes": [ REFLEX_LINK, DEXTERITY_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "driving_ground_vehicles": "Driving/Ground Vehicles",
+            "driving_rail_vehicles": "Driving/Rail Vehicles",
+            "driving_sea_vehicles": "Driving/Sea Vehicles"
+        }
+    },
+    "escape": {
+        "linkedAttributes": [ STRENGTH_LINK, DEXTERITY_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "escape_artist": "Escape Artist"
+        }
+    },
+    "forgery": {
+        "linkedAttributes": [ DEXTERITY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "forgery": "Forgery"
+        }
+    },
+    "gunnery": {
+        "linkedAttributes": [ REFLEX_LINK, DEXTERITY_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "gunnery_aerospace": "Gunnery/Aerospace",
+            "gunnery_air_vehicle": "Gunnery/Air Vehicle",
+            "gunnery_battlesuit": "Gunnery/Battlesuit",
+            "gunnery_ground_vehicle": "Gunnery/Ground Vehicle",
+            "gunnery_mech": "Gunnery/'Mech",
+            "gunnery_protomech": "Gunnery/ProtoMech",
+            "gunnery_sea_vehicle": "Gunnery/Sea Vehicle",
+            "gunnery_spacecraft": "Gunnery/Spacecraft",
+            "gunnery_turret": "Gunnery/Turret"
+        }
+    },
+    "interrogation": {
+        "linkedAttributes": [ WILL_LINK, CHARISMA_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "interrogation": "Interrogation"
+        }
+    },
+    "investigation": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "investigation": "Investigation"
+        }
+    },
+    "language": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, CHARISMA_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": true,
+        "displayName": {
+            "language": "Language"
+        }
+    },
+    "leadership": {
+        "linkedAttributes": [ WILL_LINK, CHARISMA_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "leadership": "Leadership"
+        }
+    },
+    "medtech": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "medtech_general": "MedTech/General",
+            "medtech_veterinary": "MedTech/Veterinary"
+        }
+    },
+    "navigation": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "navigation_air": "Navigation/Air",
+            "navigation_ground": "Navigation/Ground",
+            "navigation_kf_jump": "Navigation/K-F Jump",
+            "navigation_sea": "Navigation/Sea",
+            "navigation_space": "Navigation/Space"
+        }
+    },
+    "negotiation": {
+        "linkedAttributes": [ CHARISMA_LINK ],
+        "targetNumber": 8,
+        "complexity": "CB",
+        "subSkills": false,
+        "displayName": {
+            "negotiation": "Negotiation"
+        }
+    },
+    "perception": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "perception": "Perception"
+        }
+    },
+    "piloting": {
+        "linkedAttributes": [ REFLEX_LINK, DEXTERITY_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "piloting_aerospace": "Piloting/Aerospace",
+            "piloting_air_vehicle": "Piloting/Air Vehicle",
+            "piloting_battlesuit": "Piloting/Battlesuit",
+            "piloting_ground_vehicle": "Piloting/Ground Vehicle",
+            "piloting_mech": "Piloting/'Mech",
+            "piloting_protomech": "Piloting/ProtoMech",
+            "piloting_rail_vehicle": "Piloting/Rail Vehicle",
+            "piloting_sea_vehicle": "Piloting/Sea Vehicle",
+            "piloting_spacecraft": "Piloting/Spacecraft"
+        }
+    },
+    "protocol": {
+        "linkedAttributes": [ WILL_LINK, CHARISMA_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": true,
+        "displayName": {
+            "protocol": "Protocol"
+        }
+    },
+    "running": {
+        "linkedAttributes": [ REFLEX_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "running": "Running"
+        }
+    },
+    "science": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": true,
+        "displayName": {
+            "science": "Science"
+        }
+    },
+    "security": {
+        "linkedAttributes": [ DEXTERITY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "security_systems_electronic": "Security Systems/Electronic",
+            "security_systems_mechanical": "Security Systems/Mechanical"
+        }
+    },
+    "sensor": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "sensor_operations": "Sensor Operations"
+        }
+    },
+    "small": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "small_arms": "Small Arms"
+        }
+    },
+    "stealth": {
+        "linkedAttributes": [ REFLEX_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "stealth": "Stealth"
+        }
+    },
+    "strategy": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "strategy": "Strategy"
+        }
+    },
+    "streetwise": {
+        "linkedAttributes": [ CHARISMA_LINK ],
+        "targetNumber": 8,
+        "complexity": "CB",
+        "subSkills": true,
+        "displayName": {
+            "streetwise": "Streetwise"
+        }
+    },
+    "support": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "support_weapons": "Support Weapons"
+        }
+    },
+    "surgery": {
+        "linkedAttributes": [ DEXTERITY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "surgery_general": "Surgery/General",
+            "surgery_veterinary": "Surgery/Veterinary"
+        }
+    },
+    "survival": {
+        "linkedAttributes": [ BODY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": true,
+        "displayName": {
+            "survival": "Survival"
+        }
+    },
+    "swimming": {
+        "linkedAttributes": [ STRENGTH_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "swimming": "Swimming"
+        }
+    },
+    "tactics": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "tactics_air": "Tactics/Air",
+            "tactics_infantry": "Tactics/Infantry",
+            "tactics_land": "Tactics/Land",
+            "tactics_sea": "Tactics/Sea",
+            "tactics_space": "Tactics/Space"
+        }
+    },
+    "technician": {
+        "linkedAttributes": [ DEXTERITY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "technician_aeronautics": "Technician/Aeronautics",
+            "technician_cybernetics": "Technician/Cybernetics",
+            "technician_electronic": "Technician/Electronic",
+            "technician_jets": "Technician/Jets",
+            "technician_mechanical": "Technician/Mechanical",
+            "technician_myomer": "Technician/Myomer",
+            "technician_nuclear": "Technician/Nuclear",
+            "technician_weapons": "Technician/Weapons"
+        }
+    },
+    "thrown": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "thrown_weapons_blades": "Thrown Weapons/Blades",
+            "thrown_weapons_blunt_weapons": "Thrown Weapons/Blunt Weapons"
+        }
+    },
+    "tracking": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "tracking_urban": "Tracking/Urban",
+            "tracking_wilds": "Tracking/Wilds"
+        }
+    },
+    "training": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, CHARISMA_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "training": "Training"
+        }
+    },
+    "zero": {
+        "linkedAttributes": [ REFLEX_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "zero_g_operations": "Zero-G Operations"
+        }
+    }
+};
+
+const tieredSkillsBasic = {
+    "art": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 8,
+        "complexity": "CB",
+        "subSkills": true,
+        "displayName": {
+            "art": "Art"
+        }
+    },
+    "computers": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 8,
+        "complexity": "CB",
+        "subSkills": false,
+        "displayName": {
+            "computers": "Computers"
+        }
+    },
+    "interest": {
+        "linkedAttributes": [ INTELLIGENCE_LINK ],
+        "targetNumber": 8,
+        "complexity": "CB",
+        "subSkills": true,
+        "displayName": {
+            "interest": "Interest"
+        }
+    },
+    "martial": {
+        "linkedAttributes": [ REFLEX_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "martial_arts": "Martial Arts"
+        }
+    },
+    "melee": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "melee_weapons": "Melee Weapons"
+        }
+    },
+    "prestidigitation": {
+        "linkedAttributes": [ DEXTERITY_LINK ],
+        "targetNumber": 7,
+        "complexity": "SB",
+        "subSkills": false,
+        "displayName": {
+            "prestidigitation_pick_pocket": "Prestidigitation/Pick Pocket",
+            "prestidigitation_quickdraw": "Prestidigitation/Quickdraw",
+            "prestidigitation_sleight_of_hand": "Prestidigitation/Sleight of Hand"
+        }
+    }
+};
+
+const tieredSkillsAdvanced = {
+    "art": {
+        "linkedAttributes": [ DEXTERITY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": true,
+        "displayName": {
+            "art": "Art"
+        }
+    },
+    "computers": {
+        "linkedAttributes": [ DEXTERITY_LINK, INTELLIGENCE_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": false,
+        "displayName": {
+            "computers": "Computers"
+        }
+    },
+    "interest": {
+        "linkedAttributes": [ INTELLIGENCE_LINK, WILL_LINK ],
+        "targetNumber": 9,
+        "complexity": "CA",
+        "subSkills": true,
+        "displayName": {
+            "interest": "Interest"
+        }
+    },
+    "martial": {
+        "linkedAttributes": [ REFLEX_LINK, DEXTERITY_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "martial_arts": "Martial Arts"
+        }
+    },
+    "melee": {
+        "linkedAttributes": [ REFLEX_LINK, DEXTERITY_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "melee_weapons": "Melee Weapons"
+        }
+    },
+    "prestidigitation": {
+        "linkedAttributes": [ REFLEX_LINK, DEXTERITY_LINK ],
+        "targetNumber": 8,
+        "complexity": "SA",
+        "subSkills": false,
+        "displayName": {
+            "prestidigitation_pick_pocket": "Prestidigitation/Pick Pocket",
+            "prestidigitation_quickdraw": "Prestidigitation/Quickdraw",
+            "prestidigitation_sleight_of_hand": "Prestidigitation/Sleight of Hand"
+        }
+    }
+};
+
+function getSkill(skillName, skillLevel, tieredSkill) {
+    skillName = String(skillName);
+    skillLevel = Number(skillLevel);
+
+    if (tieredSkill) {
+        if (skillLevel <= 3) {
+            return tieredSkillsBasic[skillName]
+        } else {
+            return tieredSkillsAdvanced[skillName]
+        }
+    } else {
+        return skillsList[skillName]
+    }
+}
+
+function getLinkedAttributeDisplayName(linkedAttributeName) {
+    const linkedAttributeDisplayNames = {};
+    linkedAttributeDisplayNames[STRENGTH_LINK] = "STR";
+    linkedAttributeDisplayNames[BODY_LINK] = "BOD";
+    linkedAttributeDisplayNames[REFLEX_LINK] = "RFL";
+    linkedAttributeDisplayNames[DEXTERITY_LINK] = "DEX";
+    linkedAttributeDisplayNames[INTELLIGENCE_LINK] = "INT";
+    linkedAttributeDisplayNames[WILL_LINK] = "WIL";
+    linkedAttributeDisplayNames[CHARISMA_LINK] = "CHA";
+    linkedAttributeDisplayNames[EDGE_LINK] = "EDG";
+
+    return linkedAttributeDisplayNames[linkedAttributeName];
 }
 
 function sheetMigration() {
     console.log("Running sheet data migration");
 
     let sheetVersionAttributeName = "btatow_sheet_version";
-    let currentVersion = "2";
+    let currentVersion = 3;
 
     getAttrs([sheetVersionAttributeName], sheetVersionAttribute => {
-        console.debug("Checking sheet version");
-
-        let sheetVersion = sheetVersionAttribute[sheetVersionAttributeName]
+        let sheetVersion = Number(sheetVersionAttribute[sheetVersionAttributeName])
         // Check if we should do the migration
-        if (sheetVersion === undefined) {
+        if (isNaN(sheetVersion)) {
             console.error("No sheet version defined, unable to determine if sheet data needs to be migrated.");
             return;
         }
@@ -901,17 +1593,20 @@ function sheetMigration() {
         }
 
         switch(sheetVersion) {
-            case "1":
+            case 1:
                 migrateFrom1To2();
                 break;
+            case 2:
+                migrateFrom2To3();
+                break;
             default:
                 break;
         }
     });
 }
 
+// Migrate attribute data from version 1 to version 2
 function migrateFrom1To2() {
-    // Migrate attribute data from version 1 to version 2
     const oldAttributeNames = [
         "STRXP",
         "BODXP",
@@ -948,14 +1643,116 @@ function migrateFrom1To2() {
 
         console.debug("New attributes: "+ JSON.stringify(newAttributes));
 
-        setAttrs(newAttributes, undefined, () => {
+        setAttrs(newAttributes, {}, () => {
             setAttrs({
                 btatow_sheet_version: "2"
-            }, undefined, () => {
+            }, {}, () => {
                 console.log("Sheet data migration completed");
             });
         });
      });
 }
 
+// Migrate skills data from version 2 to version 3
+function migrateFrom2To3() {
+    console.log("Starting migration from version 2 to version 3.");
+
+    getSectionIDs("skills", ids => {
+        let skillsUpdated = 0;
+
+        ids.forEach(id => {
+            const oldSkillDataNames = {
+                skill: "repeating_skills_" + id + "_skill",
+                subSkill: "repeating_skills_" + id + "_skillNotes",
+                xp: "repeating_skills_" + id + "_skillXP"
+            };
+            const newSkillDataNames = {
+                skill: "repeating_skills_" + id + "_skill",
+                subSkill: "repeating_skills_" + id + "_sub_skill",
+                xp: "repeating_skills_" + id + "_skill_xp"
+            };
+            getAttrs(Object.values(oldSkillDataNames), oldSkillValues => {
+                const oldSkillName = oldSkillValues[oldSkillDataNames.skill];
+                const oldSkillSubSkillName = oldSkillValues[oldSkillDataNames.subSkill];
+
+                if (oldSkillName === undefined || oldSkillValues[oldSkillDataNames.xp] === undefined) {
+                    console.error("Old skill data is missing values, unable to migrate.\n" + JSON.stringify(oldSkillValues));
+                    skillsUpdate++;
+                    return;
+                }
+
+                let parsedSkillName = oldSkillName.toLowerCase()
+                    .replace(" ", "_")
+                    .replace("-", "_");
+
+                const skillFirstName = parsedSkillName.split("_")[0];
+
+                let skillData = {};
+                const newSkillValues = {};
+
+                if (skillFirstName in skillsList) {
+                    skillData = skillsList[skillFirstName];
+                } else if (skillFirstName in tieredSkillsBasic) {
+                    skillData = tieredSkillsBasic[skillFirstName];
+                } else if (skillFirstName.substring(0, skillFirstName.length - 1) in tieredSkillsBasic) {
+                    skillData = tieredSkillsBasic[skillFirstName.substring(0, skillFirstName.length - 1)];
+                    parsedSkillName = parsedSkillName.substring(0, parsedSkillName.length - 1);
+                } else {
+                    console.error("Unable to migrate skill data. Old values are: " + JSON.stringify(oldSkillValues));
+                    skillsUpdated++;
+                    return;
+                }
+
+                let skillName = "";
+                let displaySubSkill = true;
+
+                if (parsedSkillName in skillData.displayName) {
+                    skillName = parsedSkillName;
+                } else if (parsedSkillName.substring(0, parsedSkillName.length - 1) in skillData.displayName) {
+                    skillName = parsedSkillName.substring(0, parsedSkillName.length - 1);
+                } else if (oldSkillSubSkillName === undefined) {
+                    console.error("Unable to identify skill. Old skill name: " + oldSkillName);
+                    skillsUpdated++;
+                    return;
+                } else {
+                    const parsedSubSkillName = oldSkillSubSkillName.trim()
+                        .replace("\'", "")
+                        .replace("`", "")
+                        .replace("-", "_")
+                        .replace("/", "_")
+                        .toLowerCase();
+
+                    const skillWithSubSkill = parsedSkillName + "_" + parsedSubSkillName;
+
+                    if (skillWithSubSkill in skillData.displayName) {
+                        skillName = skillWithSubSkill;
+                        displaySubSkill = false;
+                    } else {
+                        console.error("Unable to identify skill. Old skill name and notes: " + oldSkillName + " " + oldSkillSubSkillName);
+                        skillsUpdated++;
+                        return;
+                    }
+                }
+
+                newSkillValues[newSkillDataNames.skill] = skillName;
+                if (displaySubSkill && oldSkillSubSkillName !== undefined) {
+                newSkillValues[newSkillDataNames.subSkill] = oldSkillSubSkillName;
+            }
+                newSkillValues[newSkillDataNames.xp] = oldSkillValues[oldSkillDataNames.xp];
+
+                setAttrs(newSkillValues, {}, () => {
+                    skillsUpdated++;
+
+                    if (skillsUpdated === ids.length) {
+                        setAttrs({btatow_sheet_version: 3}, {}, () => {
+                            console.log("Sheet migrated from version 2 to version 3.");
+                            recalculateSkills();
+                        });
+                    }
+                });
+            });
+        });
+    });
+}
+
 </script>
\ No newline at end of file
diff --git a/BattleTech-A-Time-of-War/sheet.json b/BattleTech-A-Time-of-War/sheet.json
index 0d5725e44c..d6d578ce59 100644
--- a/BattleTech-A-Time-of-War/sheet.json
+++ b/BattleTech-A-Time-of-War/sheet.json
@@ -6,4 +6,3 @@
 	"preview": "battletech.png",
 	"instructions": "This sheet is for the legendary universe of Mechwarrior. Core rulebook is BattleTech: A Time of War. If there is any problem or this sheet needs to improve feel free to use this and update."
 }
-