diff --git a/Shadowrun Sixth World/CHANGELOG.md b/Shadowrun Sixth World/CHANGELOG.md
index 0c396a91bc..a9451bd475 100644
--- a/Shadowrun Sixth World/CHANGELOG.md
+++ b/Shadowrun Sixth World/CHANGELOG.md
@@ -1,5 +1,9 @@
Change Log
==============================================
+**2023-05-30 ** v.82 Chuz (James Culp)
+ Update - Added Hack & Slash Matrix Actions to the Rolls Pane -> Matrix Roll Buttons
+ New Feature - Added Matrix Roll Buttons Legality Filter, this allows you to hide illegal actions. For pcs without a matrix persona or that are worried about OS
+ New Feature - Added Matrix Roll Buttons Access Level Filter, this allows you to hide actions that are not usable at a particular Matrix Access Level (outsider/user/admin)
**2023-05-22 ** v.81 Chuz (James Culp)
Bugfix - More weapon dicepool tweaks
New Feature - NPC->Spirits made spirits awakened and now display the spells section for them. Dicepool does not auto-update when spirit force changes, that is an exercise for the user.
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index 5a5c18a030..6a72a3e40b 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css
@@ -475,6 +475,11 @@ input[type='radio'].tab-switch {
.right, sheet-right {
text-align: right !important; }
+.fleft {
+ float: left !important; }
+.fright {
+ float: right !important; }
+
select.attribute-select option:nth-of-type(1n+5) {
color: #460141 !important; }
select.attribute-select option:nth-of-type(1n+9) {
@@ -3639,16 +3644,17 @@ div.notes-changelog div.changelog ul {
.rolls-col {
width: 100%;
display: inline-block; }
-.rolls .pc-box .rolls-col .rolls-matrix {
+.rolls-matrix {
width: 100%;
display: grid;
grid-column-gap: 5px;
grid-row-gap: 2px;
grid-template-columns: 32% 32% 32%; }
-.rolls .pc-box .rolls-col .rolls-matrix h1,
-.rolls .pc-box .rolls-col .rolls-matrix h2 {
+.rolls-matrix h1,
+.rolls-matrix h2,
+.rolls-matrix hr {
grid-column: 1 / 4; }
-.rolls .pc-box .rolls-col h3[data-i18n="rollbuttonsdisclaimer"] {
+.rolls-col h3[data-i18n="rollbuttonsdisclaimer"] {
line-height: 15px;
font-weight: bolder;
color: #555 !important;
@@ -3657,6 +3663,30 @@ div.notes-changelog div.changelog ul {
.rolls-matrix label {
grid-column: 1 / 4; }
+.rolls-matrix span.full-width {
+ grid-column: 1 / 4; }
+.rolls-matrix span.full-width label {
+ grid-column: unset; }
+
+/* Hides illegal matrix actions when the checkbox is unchecked */
+.rolls-matrix input[type="hidden"][name$="display_illegal_matrix_actions"][value="0"] ~ .illegal,
+.rolls-matrix input[type="hidden"][name$="display_illegal_matrix_actions"][value="0"] ~ .illegal > span{
+ display: none !important;
+}
+
+/* hides user and admin matrix actions when "Access Level Filter" is set to "Outsider" */
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .user:not(.outsider),
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .user:not(.outsider) > span,
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .admin:not(.outsider),
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .admin:not(.outsider) > span {
+ display: none !important;
+}
+
+/* hides admin matrix actions when "Access Level Filter" is set to "User" */
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="user"] ~ .admin:not(.user),
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="user"] ~ .admin:not(.user) > span {
+ display: none !important;
+}
.npc-roll-rows .rolls-col .rolls-matrix span.matrix-action,
.rolls .pc-box .rolls-col .rolls-matrix span.matrix-action {
@@ -3680,7 +3710,6 @@ div.notes-changelog div.changelog ul {
text-shadow: 1px 1px 2px red, 0 0 25px #460141, 0 0 5px #460141 !important; }
-
/* Misc Rolls */
.rolls .pc-box .rolls-col .rolls-misc {
width: 100%;
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 3e5c010ece..cbc06fb207 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html
@@ -3474,6 +3474,12 @@
Most Recent Updates
+ **2023-05-30 ** v.82 Chuz (James Culp)
+
+
EUpdate - Added Hack & Slash Matrix Actions to the Rolls Pane -> Matrix Roll Buttons
+
FNew Feature - Added Matrix Roll Buttons Legality Filter, this allows you to hide illegal actions. For pcs without a matrix persona or that are worried about OS
+
FNew Feature - Added Matrix Roll Buttons Access Level Filter, this allows you to hide actions that are not usable at a particular Matrix Access Level (outsider/user/admin)
+
**2023-05-22 ** v.81 Chuz (James Culp)
ABugfix - More weapon dicepool tweaks
@@ -3525,34 +3531,6 @@
ABugfix - PC Initiatives - Fixed a condition where if a dice mod is set and then the initiative base is changed it keeps adding the dice mod repeatedly.
- **2023-02-20 ** v.72 Chuz (James Culp)
-
-
FNew Feature - Added Magic and Resonance to attribute roll buttons as additional options in the drop down
-
EUpdate - Updated NPC Technomancer Complex Forms
-
EUpdate - Updated NPC Drag&Drop for Spells to attempt to auto-populate the dicepool
-
EUpdate - NPC Complex forms display changes
-
EUpdate - NPC Complex forms roll buttons for no dicepool defined (uses attr_skill + resonance), dicepool defined (uses the dicepool) or description only (skill empty)
-
EUpdate - The old NPCspells repeating data should be retained just in case, for now.
-
ABugfix - Updated calls to geneerateRowID to use a work around to prevent them (hopefully) from duplicating an already existing ID which caused drag and drop items to sometimes not apply properly, causing symptoms like drag and drop NPCs without all of their skills, attacks, or some other repeating item. Or even weirder once a Skill that got overwritten so it had a Specialization from another skill that wasn't there.
-
-
If it looks like your specialization or expertise buttons for Skills have disappeared, refresh your browser and they should return.
- **2023-02-13 ** v.71 Chuz (James Culp)
-
-
FNew Feature - Added essence calculations for drag and drop (and others) allowing for Essence Base to be "Rating x #.##", also Grade calculations now.
-
FNew Feature - Added drag and drop for Augmentations
-
FNew Feature - Converted NPC Spell roll buttons to use the newer PC style
-
FNew Feature - Converted NPC Attack (ranged and melee) buttons to use the new roll buttons
-
FNew Feature - Converted NPC Attack (ranged and melee) buttons to use the new roll template weapon info block
-
EUpdate - Updated Matrix Roll buttons to include inline opposed roll buttons. To use these the target's token must be selected.
-
FNew Feature - Converted Grunt skill buttons to new style
-
FNew Feature - Converted Vehicle Autosoft roll buttons to the newer PC style
-
FNew Feature - Converted NPC attribute roll buttons to the newer PC style
-
FNew Feature - Converted NPC Initiative and Defense button blocks to the newer PC style
-
FNew Feature - Began adding weapon information as it's own section in the attack Roll Templates
-
FNew Feature - Added weapon info to Ranged attack Roll Templates
-
FNew Feature - Added weapon info to Ranged (Burst Fire Wide) attack Roll Templates
-
FNew Feature - Added weapon info to Melee attack Roll Templates
-