Merge pull request #13330 from clevett/pendragon-v3.2

Pendragon 6th Edition v3.2
Roll20 · Sep 19, 2024 · b300ab4 · b300ab4
2 parents 27e6d05 + 3ee4f96
commit b300ab4
Show file tree

Hide file tree

Showing 45 changed files with 1,039 additions and 684 deletions.
diff --git a/Pendragon6thEdition/package.json b/Pendragon6thEdition/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pendragon6thedition",
-  "version": "2.4.2",
+  "version": "3.2.0",
   "description": "You need to run npm start to get the compilers going.",
   "dependencies": {
     "20": "^3.1.9",

diff --git a/Pendragon6thEdition/pendragon.css b/Pendragon6thEdition/pendragon.css
@@ -121,7 +121,7 @@ div.sheet-holdings div.sheet-col {
 
 /* GENERIC CLASSES
     ============================= */
-div.sheet-character div.sheet-passions div.sheet-repeating-container div.sheet-row, div.sheet-character div.sheet-personality-traits div.sheet-repeating-container div.sheet-row, div.sheet-character div.sheet-skills div.sheet-repeating-container div.sheet-row, div.sheet-character div.sheet-squire div.sheet-repeating-container div.sheet-row {
+div.sheet-personality-traits div.sheet-repeating-container div.sheet-row, div.sheet-character div.sheet-passions div.sheet-repeating-container div.sheet-row, div.sheet-character div.sheet-skills div.sheet-repeating-container div.sheet-row, div.sheet-character div.sheet-squire div.sheet-repeating-container div.sheet-row {
   grid-template-columns: 15px 1fr 3.5em 2.5em; }
 
 div.sheet-grid {
@@ -234,14 +234,17 @@ div.sheet-gold-bottom-border {
   padding-bottom: 2%; }
 
 div.sheet-header {
-  display: flex;
-  padding: 4px;
-  justify-content: center;
-  border-top: 2px solid #ab0f14;
-  border-bottom: 2px solid #ab0f14;
-  text-align: center;
   background-color: #fffde7;
-  background-image: url("https://www.transparenttextures.com/patterns/arches.png"); }
+  background-image: url("https://www.transparenttextures.com/patterns/arches.png");
+  border-bottom: 2px solid #ab0f14;
+  border-top: 2px solid #ab0f14;
+  display: grid;
+  justify-content: center;
+  padding: 4px;
+  text-align: center; }
+
+div.sheet-collapsible {
+  grid-template-columns: 1fr 30px; }
 
 .sheet-mt {
   margin-top: 2%; }
@@ -258,33 +261,6 @@ div.sheet-header {
 .sheet-auto-flow-col {
   grid-auto-flow: column; }
 
-/* STYLED CHECKBOXES
-    ============================= */
-label.sheet-styled-checkbox {
-  display: grid;
-  align-self: center;
-  justify-content: center;
-  grid-template-columns: 1fr; }
-  label.sheet-styled-checkbox input,
-  label.sheet-styled-checkbox span {
-    grid-area: 1 / 1 / 1 / 1;
-    height: 15px;
-    width: 15px;
-    position: relative; }
-  label.sheet-styled-checkbox span {
-    align-content: center;
-    border: 2px solid #ab0f14;
-    color: transparent;
-    display: grid;
-    font-size: 0.6em;
-    text-align: center; }
-  label.sheet-styled-checkbox input {
-    opacity: 0;
-    z-index: 2; }
-    label.sheet-styled-checkbox input[type="checkbox"]:checked + span {
-      background-color: #ab0f14;
-      color: whitesmoke; }
-
 /* TABS
     ============================= */
 div.sheet-tabs {
@@ -333,7 +309,7 @@ input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-tabs div.sheet-
     cursor: not-allowed;
     opacity: 0.4; }
 
-/* NPC
+/* `PAGES
     ============================= */
 input[name="attr_sheet_type"][value="npc"] ~ div.sheet-tabs {
   margin-bottom: -3%;
@@ -382,13 +358,15 @@ div.sheet-npc {
     div.sheet-npc div.sheet-description textarea[name="attr_description"],
     div.sheet-npc div.sheet-description span[name="attr_description"] {
       grid-area: 1/1/2/2; }
-  div.sheet-npc .repcontainer[data-groupname="repeating_skills"] {
+  div.sheet-npc .repcontainer[data-groupname="repeating_skills"],
+  div.sheet-npc .repcontainer[data-groupname="repeating_passions"],
+  div.sheet-npc .repcontainer[data-groupname="repeating_traits"] {
     display: grid;
     grid-template-columns: repeat(auto-fill, 193px);
     gap: 1rem; }
+  div.sheet-npc div.sheet-personality-traits .sheet-styled-checkbox {
+    visibility: hidden; }
 
-/* PC
-    ============================= */
 div.sheet-attacks input[name="attr_damage"],
 div.sheet-attacks span[name*="damage"] {
   text-align: center; }
@@ -401,10 +379,10 @@ div.sheet-attacks div.sheet-repeating-container div.sheet-row,
 div.sheet-attacks div.sheet-repeating-container div.sheet-header {
   grid-template-columns: 2fr 1fr 5em 2.5em; }
 
-div.sheet-attacks label[data-i18n-title="other skill"] {
+div.sheet-attacks label[data-i18n-title="target value"] {
   visibility: hidden; }
 
-div.sheet-attacks input[name="attr_skill"][value*="other"] + label {
+div.sheet-attacks input[name="attr_skill"][value*="target"] + label {
   visibility: visible; }
 
 div.sheet-attacks select[name="attr_skill"] {
@@ -415,6 +393,44 @@ div.sheet-attacks span[data-i18n*="brawling"],
 div.sheet-attacks span[name*="damage"] {
   color: #000; }
 
+div.sheet-personality-traits div.sheet-traits {
+  grid-template-columns: 15px 1fr 3.5em 5px 3.5em 1fr 15px; }
+  div.sheet-personality-traits div.sheet-traits div.sheet-bold {
+    padding: 100% 2%; }
+
+div.sheet-equipment span[name="attr_value"],
+div.sheet-equipment input[name="attr_value"] {
+  text-align: center; }
+
+div.sheet-equipment div.sheet-col {
+  grid-template-rows: min-content 1fr; }
+
+div.sheet-equipment div.sheet-2autocolumn {
+  align-content: end; }
+
+div.sheet-equipment span[name="attr_equipment"],
+div.sheet-equipment span[name="attr_category"] {
+  min-height: 20px; }
+
+div.sheet-equipment div.sheet-category {
+  grid-template-columns: 3fr 1fr; }
+
+div.sheet-equipment div.sheet-repeating-container div.sheet-flags {
+  grid-template-columns: 1fr 25px; }
+
+div.sheet-equipment div.sheet-repeating-container div.sheet-notes {
+  grid-area: 3 / 1 / 4 / -1; }
+
+div.sheet-equipment div.sheet-repeating-container input.sheet-flag + span.sheet-pictos,
+div.sheet-equipment div.sheet-repeating-container input.sheet-flag {
+  grid-area: 1 / 2 / 2/ 3; }
+
+div.sheet-equipment div.sheet-repeating-container .repitem {
+  background-color: #e5dbd4;
+  padding: 2% 1%; }
+  div.sheet-equipment div.sheet-repeating-container .repitem:nth-of-type(even) {
+    background-color: #baa595; }
+
 div.sheet-character div.sheet-horse input[type="text"],
 div.sheet-character div.sheet-horse input[type="number"] {
   text-align: center;
@@ -445,17 +461,11 @@ div.sheet-character div.sheet-horse div.sheet-notes {
 div.sheet-character div.sheet-passions div.sheet-row {
   grid-template-columns: 1fr 45% 5%; }
 
-div.sheet-character div.sheet-personality-traits div.sheet-traits {
-  grid-template-columns: 15px 1fr 3.5em 5px 3.5em 1fr 15px; }
-  div.sheet-character div.sheet-personality-traits div.sheet-traits div.sheet-bold {
-    padding: 100% 2%; }
-
 div.sheet-character div.sheet-skills {
   grid-row-gap: 5px; }
   div.sheet-character div.sheet-skills div.sheet-body {
     grid-row-gap: 5px;
-    grid-auto-flow: column;
-    display: grid; }
+    grid-auto-flow: column; }
     div.sheet-character div.sheet-skills div.sheet-body div.sheet-subheader {
       grid-column: 1/-1; }
   div.sheet-character div.sheet-skills div.sheet-core-skills {
@@ -483,44 +493,11 @@ div.sheet-character div.sheet-squire div.sheet-notes {
   div.sheet-character div.sheet-squire div.sheet-notes span.sheet-display {
     grid-area: 1/1/2/2; }
 
-div.sheet-character div.sheet-equipment span[name="attr_value"],
-div.sheet-character div.sheet-equipment input[name="attr_value"] {
-  text-align: center; }
-
-div.sheet-character div.sheet-equipment div.sheet-col {
-  grid-template-rows: min-content 1fr; }
-
-div.sheet-character div.sheet-equipment div.sheet-2autocolumn {
-  align-content: end; }
-
-div.sheet-character div.sheet-equipment span[name="attr_equipment"],
-div.sheet-character div.sheet-equipment span[name="attr_category"] {
-  min-height: 20px; }
-
-div.sheet-character div.sheet-equipment div.sheet-category {
-  grid-template-columns: 3fr 1fr; }
-
-div.sheet-character div.sheet-equipment div.sheet-repeating-container div.sheet-flags {
-  grid-template-columns: 1fr 25px; }
-
-div.sheet-character div.sheet-equipment div.sheet-repeating-container div.sheet-notes {
-  grid-area: 3 / 1 / 4 / -1; }
-
-div.sheet-character div.sheet-equipment div.sheet-repeating-container input.sheet-flag + span.sheet-pictos,
-div.sheet-character div.sheet-equipment div.sheet-repeating-container input.sheet-flag {
-  grid-area: 1 / 2 / 2/ 3; }
-
-div.sheet-character div.sheet-equipment div.sheet-repeating-container .repitem {
-  background-color: #e5dbd4;
-  padding: 2% 1%; }
-  div.sheet-character div.sheet-equipment div.sheet-repeating-container .repitem:nth-of-type(even) {
-    background-color: #baa595; }
-
 div.sheet-character div.sheet-characteristics div.sheet-core {
   grid-auto-flow: column;
   grid-column-gap: 2%; }
 
-div.sheet-character div.sheet-characteristics span {
+div.sheet-character div.sheet-characteristics div.sheet-statistic span {
   color: #000; }
 
 div.sheet-character h2 {
@@ -563,8 +540,6 @@ div.sheet-character div.sheet-current-hit-points {
   div.sheet-character div.sheet-current-hit-points div.sheet-wounds div.sheet-repeating-container div.sheet-row {
     grid-template-columns: 1fr 3.5em 3fr; }
 
-/*  HOLDINGS
-    ============================= */
 div.sheet-holdings {
   grid-template-columns: 1fr 2.5fr; }
   div.sheet-holdings div.sheet-family-history div.sheet-row {
@@ -576,8 +551,6 @@ div.sheet-holdings {
   div.sheet-holdings div.sheet-character-history input[name*="glory"] {
     text-align: center; }
 
-/*  SETTINGS
-    ============================= */
 div.sheet-settings h1 {
   padding: 0px; }
 
@@ -702,11 +675,51 @@ input.sheet-flag:checked ~ div.sheet-row input,
 input.sheet-flag:checked ~ div.sheet-notes textarea {
   display: inherit; }
 
-input[name*="attr_hide_"][value*="hide"] + div {
+input[name*="attr_hide_"][value*="hide"] + div,
+input[name*="attr_hide_"][value*="on"] ~ div.sheet-hide {
   display: none; }
 
-/*  SWITCH
+/*  COMPONENTS
     ============================= */
+div.sheet-shield {
+  border-radius: 50% 50% 50% 50% / 12% 12% 88% 88%;
+  border: 5px solid #240202;
+  height: 50px;
+  width: 50px; }
+  div.sheet-shield input[type="number"] {
+    font-weight: bolder;
+    width: 3em; }
+    div.sheet-shield input[type="number"]:placeholder-shown, div.sheet-shield input[type="number"]:hover {
+      background-color: #fffde7; }
+    div.sheet-shield input[type="number"]::-webkit-outer-spin-button, div.sheet-shield input[type="number"]::-webkit-inner-spin-button {
+      -webkit-appearance: none;
+      margin: 0; }
+
+label.sheet-styled-checkbox {
+  display: grid;
+  align-self: center;
+  justify-content: center;
+  grid-template-columns: 1fr; }
+  label.sheet-styled-checkbox input,
+  label.sheet-styled-checkbox span {
+    grid-area: 1 / 1 / 1 / 1;
+    height: 15px;
+    width: 15px;
+    position: relative; }
+  label.sheet-styled-checkbox span {
+    align-content: center;
+    border: 2px solid #ab0f14;
+    color: transparent;
+    display: grid;
+    font-size: 0.6em;
+    text-align: center; }
+  label.sheet-styled-checkbox input {
+    opacity: 0;
+    z-index: 2; }
+    label.sheet-styled-checkbox input[type="checkbox"]:checked + span {
+      background-color: #ab0f14;
+      color: whitesmoke; }
+
 .sheet-switch {
   position: relative;
   display: inline-block;
@@ -755,8 +768,6 @@ input:checked + .sheet-slider:before {
   -ms-transform: translateX(26px);
   transform: translateX(26px); }
 
-/* TABLE
-    ============================= */
 div.sheet-table {
   display: grid; }
   div.sheet-table input[type="text"],
@@ -804,21 +815,31 @@ div.sheet-table {
     div.sheet-table .repitem input[type="text"] {
       border: none; }
 
-/* TABLE
-    ============================= */
-div.sheet-shield {
-  border-radius: 50% 50% 50% 50% / 12% 12% 88% 88%;
-  border: 5px solid #240202;
-  height: 50px;
-  width: 50px; }
-  div.sheet-shield input[type="number"] {
-    font-weight: bolder;
-    width: 3em; }
-    div.sheet-shield input[type="number"]:placeholder-shown, div.sheet-shield input[type="number"]:hover {
-      background-color: #fffde7; }
-    div.sheet-shield input[type="number"]::-webkit-outer-spin-button, div.sheet-shield input[type="number"]::-webkit-inner-spin-button {
-      -webkit-appearance: none;
-      margin: 0; }
+.sheet-chevron {
+  display: grid;
+  grid-auto-flow: column;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  width: 100%; }
+  .sheet-chevron input[type="checkbox"],
+  .sheet-chevron span {
+    grid-column: 1;
+    height: 30px;
+    position: absolute;
+    width: 30px; }
+  .sheet-chevron input[type="checkbox"] {
+    opacity: 0;
+    z-index: 10; }
+  .sheet-chevron span {
+    color: #832219;
+    font-size: 2.5em;
+    transform: rotate(180deg);
+    transition: transform 0.3s;
+    z-index: 1; }
+  .sheet-chevron input[type="checkbox"]:checked ~ span {
+    grid-column: 1;
+    transform: rotate(0deg); }
 
 /* ROLL TEMPLATE STYLE
 ----------------------------- */

diff --git a/Pendragon6thEdition/pendragon.html b/Pendragon6thEdition/pendragon.html
diff --git a/Pendragon6thEdition/src/js/drag_and_drop/get_row.js b/Pendragon6thEdition/src/js/drag_and_drop/get_row.js
@@ -0,0 +1 @@
+const getRow = (section) => `repeating_${section}_${generateRowID()}`;
diff --git a/Pendragon6thEdition/src/js/drag_and_drop/get_static_update.js b/Pendragon6thEdition/src/js/drag_and_drop/get_static_update.js
@@ -0,0 +1,11 @@
+const getStaticUpdate = (attrs, page) => {
+  let update = {};
+
+  attrs.forEach((attr) => {
+    if (page?.[attr] ?? page?.data?.[attr]) {
+      update[attr] = page[attr] ?? roll20Attribute(attr, page.data[attr]);
+    }
+  });
+
+  return update;
+};
diff --git a/Pendragon6thEdition/src/js/drag_and_drop/helpers.js b/Pendragon6thEdition/src/js/drag_and_drop/helpers.js