From 0a0cc576dbca1d3d666843cbbabc6dcb7ac76c4e Mon Sep 17 00:00:00 2001
From: James A Culp III <james@d3corp.com>
Date: Tue, 1 Jun 2021 16:00:55 -0400
Subject: [PATCH 1/4] Initiating v.35

---
 Shadowrun Sixth World/CHANGELOG.md             | 4 ++++
 Shadowrun Sixth World/Shadowrun6thEdition.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Shadowrun Sixth World/CHANGELOG.md b/Shadowrun Sixth World/CHANGELOG.md
index 6e5244a2a5..198b556208 100644
--- a/Shadowrun Sixth World/CHANGELOG.md	
+++ b/Shadowrun Sixth World/CHANGELOG.md	
@@ -1,5 +1,9 @@
 Change Log
 ==============================================
+**2021-06-07 ** v.35 Chuz (James Culp)
+	Added Matrix AR and Matrix DR to Host sheet
+**2021-05-25 ** v.34 Chuz (James Culp)
+	Bugfix - Changed HTML top display the nuyen symbol instead of translations as the character was breaking the translation stuff
 **2021-05-17 ** v.33 Chuz (James Culp)
 	Bugfix - PC->Grenades launched grenades didn't work properly
 	Bugfix - Nuyen symbol keeps disappearing, another attempt to lock it in
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 570e6363ad..4e4bb922fd 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -5195,7 +5195,7 @@
 <input type="hidden" name="attr_throwingweapons" value="0" />
 <input type="hidden" name="attr_tracking" value="0" />
 <input type="hidden" name="attr_unarmedcombat" value="0" />
-<input type="hidden" name="attr_sheet_version" value="0.34">
+<input type="hidden" name="attr_sheet_version" value="0.35">
 
 <script type="text/worker">
 //Sheet workers

From a53fbf003479fc3add81568e082025aeebe4467e Mon Sep 17 00:00:00 2001
From: James A Culp III <james@d3corp.com>
Date: Tue, 1 Jun 2021 16:01:18 -0400
Subject: [PATCH 2/4] Add Matrix AR and Matrix DR to Host sheet

---
 Shadowrun Sixth World/Shadowrun6thEdition.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 4e4bb922fd..000f1e4a72 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -3602,11 +3602,12 @@
 
     <div class="column">
 
-      <div class="rows sprite host">
-        <button data-i18n="attackrating" name="roll_ar" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{attackrating} = ^{attack} + ^{sleaze}}}{{rating=[[@{attack}+@{sleaze}]]}}">attackrating</button>
+
+		<div class="rows sprite host">
+        <button data-i18n="attackrating" name="roll_ar" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{attackrating} = ^{attack} + ^{sleaze}}}{{rating=[[@{attack}+@{sleaze}]]}}">attackrating</button> <span name="attr_matrix_attack_rating"></span>
       </div>
       <div class="rows sprite host">
-        <button data-i18n="defenserating" name="roll_dr" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{defenserating} = ^{data_processing} + ^{firewall}}}{{rating=[[@{data_processing}+@{firewall}]]}}{{wilddie=[[@{wild_die}d6]]}}">defenserating</button>
+        <button data-i18n="defenserating" name="roll_dr" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{defenserating} = ^{data_processing} + ^{firewall}}}{{rating=[[@{data_processing}+@{firewall}]]}}{{wilddie=[[@{wild_die}d6]]}}">defenserating</button> <span name="attr_matrix_defense_rating"></span>
       </div>
       <div class="rows grunt spirit">
         <button data-i18n="defenserating" name="roll_dr" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{defenserating}}}{{rating=@{defense_rating}}}">defenserating</button>
@@ -5604,7 +5605,7 @@ on("sheet:opened change:attack change:sleaze", (eventInfo) => {
 		const attack = v['attack'] || 0;
 		const sleaze = v['sleaze'] || 0;
 		setAttrs({
-			matrix_attack_rating: parseInt(attack + sleaze)
+			matrix_attack_rating: parseInt(attack) + parseInt(sleaze)
 		});
 	});
 });
@@ -5615,7 +5616,7 @@ on("sheet:opened change:data_processing change:firewall", (eventInfo) => {
 		const data_processing = v['data_processing'] || 0;
 		const firewall = v['firewall'] || 0;
 		setAttrs({
-			matrix_defense_rating: parseInt(data_processing + firewall)
+			matrix_defense_rating: parseInt(data_processing) + parseInt(firewall)
 		});
 	});
 });

From 74d9b30475e1786812e8fe6d9c9778a75ab58b71 Mon Sep 17 00:00:00 2001
From: James A Culp III <james@d3corp.com>
Date: Thu, 3 Jun 2021 09:40:19 -0400
Subject: [PATCH 3/4] PC->Magic->Meta tab Added alternate attributes to
 Traditions to allow for Arcane Resilience Traiing changes

---
 Shadowrun Sixth World/Shadowrun6thEdition.html | 18 +++++++++++++++++-
 Shadowrun Sixth World/translation.json         |  6 ++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 000f1e4a72..f3c80f5261 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -1980,7 +1980,11 @@
             <label data-i18n-title="tradition" title="tradition">
             	<select name='attr_tradition' title='@{tradition}'>
             		<option data-i18n="hermeticism" value="Hermeticism">Hermeticism</option>
+            		<option data-i18n="hermeticism-intuition" value="Hermeticism (Intuition)">Hermeticism (Intuition)</option>
+            		<option data-i18n="hermeticism-charisma" value="Hermeticism (Charisma)">Hermeticism (Charisma)</option>
             		<option data-i18n="shamanism" value="Shamanism">Shamanism</option>
+            		<option data-i18n="shamanism-logic" value="Shamanism (Logic)">Shamanism (Logic)</option>
+            		<option data-i18n="shamanism-intuition" value="Shamanism (Intuition)">Shamanism (Intuition)</option>
             	</select>
             </label>
             <h2 data-i18n="magicar">Magic AR</h2>
@@ -5461,16 +5465,28 @@ on("change:essence_mod remove:repeating_augmentations change:repeating_augmentat
 
 // Catch changes to magic, tradition, logic or charisma to update magic AR
 on("change:magic change:tradition change:logic change: charisma", (eventinfo) => {
-	getAttrs(["magic", "tradition", "logic", "charisma"], (v) => {
+	getAttrs(["magic", "tradition", "logic", "intuition", "charisma"], (v) => {
 		var magic_ar = v.magic;
 
 		switch(v.tradition) {
 			case "Hermeticism":
 				magic_ar += v.logic;
 				break;
+			case "Hermeticism (Intuition)":
+				magic_ar += v.intuition;
+				break;
+			case "Hermeticism (Charisma)":
+				magic_ar += v.charisma;
+				break;
 			case "Shamanism":
 				magic_ar += v.charisma;
 				break;
+			case "Shamanism (Logic)":
+				magic_ar += v.logic;
+				break;
+			case "Shamanism (Intuition)":
+				magic_ar += v.intuition;
+				break;
 			default:
 				magic_ar = 0;
 				break;
diff --git a/Shadowrun Sixth World/translation.json b/Shadowrun Sixth World/translation.json
index 9101c5e7c5..a03d2ec4a5 100644
--- a/Shadowrun Sixth World/translation.json	
+++ b/Shadowrun Sixth World/translation.json	
@@ -220,6 +220,9 @@
 	"heat": "Heat",
 	"height-u": "Height",
 	"hermeticism": "Hermeticism",
+	"hermeticism-charisma": "Hermeticism (Charisma)",
+	"hermeticism-intuition": "Hermeticism (Intuition)",
+	"hermeticism-logic": "Hermeticism (Logic)",
 	"hide": "Hide",
 	"highpaintolerance": "High Pain Tolerance",
 	"host": "Host",
@@ -428,6 +431,9 @@
 	"sex": "Sex",
 	"shadowamps": "Shadow Amps",
 	"shamanism": "Shamanism",
+	"shamanism-charisma": "Shamanism (Charisma)",
+	"shamanism-intuition": "Shamanism (Intuition)",
+	"shamanism-logic": "Shamanism (Logic)",
 	"sheetdescription": "Set the default sheet type.",
 	"sheetselect": "Sheet Select",
 	"sheettype": "Sheet Type",

From 036034dd0bd718d4c83a6caa4c77dc7b848ca31c Mon Sep 17 00:00:00 2001
From: James A Culp III <james@d3corp.com>
Date: Thu, 3 Jun 2021 09:44:20 -0400
Subject: [PATCH 4/4] Update Shadowrun6thEdition.html

---
 Shadowrun Sixth World/Shadowrun6thEdition.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index f3c80f5261..9a0746bd6c 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -5469,6 +5469,7 @@ on("change:magic change:tradition change:logic change: charisma", (eventinfo) =>
 		var magic_ar = v.magic;
 
 		switch(v.tradition) {
+			case "Hermeticism (Logic)":
 			case "Hermeticism":
 				magic_ar += v.logic;
 				break;
@@ -5478,6 +5479,7 @@ on("change:magic change:tradition change:logic change: charisma", (eventinfo) =>
 			case "Hermeticism (Charisma)":
 				magic_ar += v.charisma;
 				break;
+			case "Shamanism (Charisma)":
 			case "Shamanism":
 				magic_ar += v.charisma;
 				break;