Merge branch '3.0.x' into publish-wiki

foundryvtt · Feb 13, 2024 · 03be6c8 · 03be6c8
2 parents aa98d69 + 1586662
commit 03be6c8
Show file tree

Hide file tree

Showing 462 changed files with 3,061 additions and 1,852 deletions.
diff --git a/dnd5e.mjs b/dnd5e.mjs
@@ -426,9 +426,11 @@ Hooks.on("renderPause", (app, [html]) => {
   img.className = "";
 });
 
-Hooks.on("renderSettings", () => {
-  const details = document.getElementById("game-details");
+Hooks.on("renderSettings", (app, [html]) => {
+  const details = html.querySelector("#game-details");
+  const pip = details.querySelector(".system-info .update");
   details.querySelector(".system").remove();
+
   const heading = document.createElement("div");
   heading.classList.add("dnd5e2", "sidebar-heading");
   heading.innerHTML = `
@@ -453,12 +455,14 @@ Hooks.on("renderSettings", () => {
     </ul>
   `;
   details.insertAdjacentElement("afterend", heading);
+
   const badge = document.createElement("div");
   badge.classList.add("dnd5e2", "system-badge");
   badge.innerHTML = `
     <img src="systems/dnd5e/ui/official/dnd-badge-32.webp" data-tooltip="${dnd5e.title}" alt="${dnd5e.title}">
     <span class="system-info">${dnd5e.version}</span>
   `;
+  if ( pip ) badge.querySelector(".system-info").insertAdjacentElement("beforeend", pip);
   heading.insertAdjacentElement("afterend", badge);
 });
 

diff --git a/icons/LICENSE b/icons/LICENSE
@@ -51,6 +51,7 @@ The dnd5e system for Foundry Virtual Tabletop includes icon artwork licensed fro
 /svg/items/subclass.svg - "Elf helmet" by Kier Heyl under CC BY 3.0
 /svg/items/tool.svg - "Stone crafting" by Lorc under CC BY 3.0
 /svg/items/weapon.svg - "Crossed sabers" by Lorc under CC BY 3.0
+/svg/properties/magical.svg - "Sparkling sabre icon" by Lorc under CC BY 3.0
 
 ==============================================
 SVG Icons from mikiko.art

diff --git a/icons/svg/properties/magical.svg b/icons/svg/properties/magical.svg
diff --git a/lang/en.json b/lang/en.json
@@ -569,6 +569,7 @@
 "DND5E.DamagePhysicalBypass": "Physical Bypasses",
 "DND5E.DamagePhysicalBypassHint": "These weapon properties will bypass damage resistance for physical damage.",
 "DND5E.DamagePhysicalBypasses": "{damageTypes} from attacks that are not {bypassTypes}",
+"DND5E.DamagePhysicalBypassesShort": "Bypassed by {type} Sources",
 "DND5E.DamagePoison": "Poison",
 "DND5E.DamagePsychic": "Psychic",
 "DND5E.DamageRadiant": "Radiant",
@@ -656,6 +657,7 @@
 "DND5E.ExperiencePointsMin": "Minimum XP for This Level",
 "DND5E.ExperiencePointsValue": "XP Value",
 "DND5E.Expertise": "Expertise",
+"DND5E.Favorite": "Favorite",
 "DND5E.FavoriteDrop": "Drop Favorite",
 "DND5E.FavoriteRemove": "Remove Favorite",
 "DND5E.Favorites": "Favorites",
@@ -824,6 +826,7 @@
 "DND5E.HitPointsOverride": "Maximum Hit Points Override",
 "DND5E.HitPointsTemp": "Temporary Hit Points",
 "DND5E.HitPointsTempMax": "Temporary Maximum Hit Points",
+"DND5E.HitPointsTempMaxShort": "Temp Max HP",
 "DND5E.HP": "HP",
 "DND5E.HealthConditions": "Health Conditions",
 "DND5E.HPFormula": "Health Formula",
@@ -1250,6 +1253,7 @@
 "DND5E.SkillGlobalBonusCheckHint": "This bonus applies to all skill checks made by this actor.",
 "DND5E.SkillModifierHint": "{skill} Modifier",
 "DND5E.SkillPassiveHint": "Passive {skill}",
+"DND5E.SkillPassiveSpecificHint": "Passive {ability} ({skill})",
 "DND5E.SkillPassiveScore": "Passive {skill} Score",
 "DND5E.SkillPassives": "Skill Passives",
 "DND5E.Skin": "Skin",
@@ -1560,9 +1564,11 @@
 "EFFECT.DND5E": {
   "StatusBurrowing": "Burrowing",
   "StatusConcentrating": "Concentrating",
+  "StatusCursed": "Cursed",
   "StatusDodging": "Dodging",
   "StatusEncumbered": "Encumbered",
   "StatusExceedingCarryingCapacity": "Exceeding Carrying Capacity",
+  "StatusFlying": "Flying",
   "StatusHeavilyEncumbered": "Heavily Encumbered",
   "StatusHidden": "Hidden",
   "StatusMarked": "Marked",

diff --git a/less/elements.less b/less/elements.less
@@ -149,6 +149,10 @@ item-list-controls search {
       .filter {
         color: var(--dnd5e-color-gold);
         border-right: 1px solid var(--color-border-light-1);
+
+        @media (prefers-contrast: more) {
+          color: var(--dnd5e-color-dark);
+        }
       }
 
       .filter-list { display: flex; }
@@ -161,9 +165,12 @@ item-list-controls search {
     display: flex;
     align-items: center;
     padding: .5rem 0;
+    align-self: stretch;
+    align-items: stretch;
   }
 
   .filter-control {
+    height: 100%;
     color: var(--color-text-light-6);
     font-size: var(--font-size-16);
     padding: 0 .375rem;
@@ -180,4 +187,8 @@ item-list-controls search {
   }
 
   .filter-control[data-action="sort"] { padding-left: .625rem; }
+
+  @media (prefers-contrast: more) {
+    border-color: var(--dnd5e-color-dark);
+  }
 }
diff --git a/less/v1/actors.less b/less/v1/actors.less
@@ -205,6 +205,7 @@
     border-radius: 3px;
 
     .ability {
+      min-width: 100%;
       height: 70px;
       text-align: center;
       border-bottom: var(--dnd5e-border-groove);

diff --git a/less/v1/apps.less b/less/v1/apps.less
@@ -12,6 +12,10 @@ h5 {
   label:has(input[type="checkbox"]) {
     display: flex;
     margin-block-end: 0.5em;
+
+    > input[type="checkbox"] {
+      flex-basis: auto;
+    }
   }
 }
 

diff --git a/less/v1/inventory.less b/less/v1/inventory.less
@@ -24,7 +24,8 @@
         color: var(--dnd5e-color-tan);
       }
       input[type="text"], input[type="number"] {
-        flex: 0 0 48px;
+        min-inline-size: 24px;
+        max-inline-size: 48px;
         text-align: center;
         margin-inline-start: 8px;
         border-block-end: var(--dnd5e-border-groove);

diff --git a/less/v2/apps.less b/less/v2/apps.less
@@ -15,12 +15,11 @@
     .header-button {
       border-radius: 100%;
       background: rgb(0 0 0 / 25%);
-      width: 20px;
-      height: 20px;
+      width: 1.3em;
+      aspect-ratio: 1;
       line-height: unset;
       display: grid;
       place-content: center;
-      font-size: var(--font-size-12);
 
       > i { margin: 0 }
     }
@@ -64,6 +63,10 @@
     box-shadow: 0 0 6px var(--dnd5e-shadow-45);
     border: 1px solid var(--dnd5e-color-gold);
 
+    @media (prefers-contrast: more) {
+      border-color: var(--dnd5e-color-dark);
+    }
+
     .header {
       background: linear-gradient(to right, var(--dnd5e-color-hd-1), var(--dnd5e-color-hd-2));
       color: white;
@@ -179,13 +182,21 @@
     max-width: 280px;
     position: relative;
 
+    @media (prefers-contrast: more) {
+      border-color: var(--dnd5e-color-dark);
+    }
+
     &.empty {
       border: 2px dashed var(--dnd5e-color-black);
       color: var(--dnd5e-color-black);
       border-radius: 4px;
       display: grid;
       place-content: center;
       opacity: .25;
+
+      @media (prefers-contrast: more) {
+        opacity: .5;
+      }
     }
 
     .gold-icon {
@@ -345,6 +356,7 @@
     &.progress, .progress {
       --bar-percentage: 0%;
       --border-width: 3px;
+      overflow: hidden;
 
       &::before {
         content: "";
@@ -358,12 +370,30 @@
     }
 
     .label {
-      color: var(--color-text-light-0);
+      width: 100%;
+      display: flex;
+      align-items: center;
+      gap: .25rem;
       position: relative;
-      padding-left: .5rem;
+      padding-inline-start: .5rem;
+      padding-inline-end: .75rem;
+      color: var(--color-text-light-0);
 
+      &[hidden] { display: none; }
       .value, .max { text-shadow: 0 0 4px var(--dnd5e-color-gold); }
       .separator { color: var(--dnd5e-color-gold); }
+      .bonus {
+        margin-inline-start: auto;
+        font-size: var(--font-size-14);
+        opacity: .8;
+      }
+
+      @media (prefers-contrast: more) {
+        .value, .max {
+          text-shadow: 0 0 2px var(--dnd5e-color-dark);
+          filter: drop-shadow(0 0 2px var(--dnd5e-color-dark));
+        }
+      }
     }
   }
 
@@ -373,12 +403,13 @@
 
   /* Reset button & input styles */
   input.uninput, button.unbutton {
-    border: none;
+    --border: none;
+    border: var(--border);
     box-shadow: none;
 
     &:hover, &:focus {
       box-shadow: none;
-      border: none;
+      border: var(--border);
     }
   }
 
@@ -582,7 +613,13 @@
       object-fit: contain;
     }
 
-    .system-info { font-size: var(--font-size-16); }
+    .system-info {
+      font-size: var(--font-size-16);
+      i {
+        padding-inline-start: 2px;
+        font-size: var(--font-size-12);
+      }
+    }
   }
 
   /* ---------------------------------- */
@@ -761,17 +798,24 @@
     --icon-size: 18px;
 
     .condition {
+      --border-style: 1px dashed var(--color-border-light-1);
       display: flex;
       gap: .5rem;
       padding: .5625rem .75rem;
       align-items: center;
       cursor: pointer;
-      border-bottom: 1px dashed var(--color-border-light-1);
-      border-right: 1px dashed var(--color-border-light-1);
+      border-bottom: var(--border-style);
+      border-right: var(--border-style);
       color: var(--color-text-light-6);
       --icon-fill: var(--color-text-light-6);
       --icon-stroke: var(--dnd5e-color-card);
 
+      @media (prefers-contrast: more) {
+        --border-style: var(--dnd5e-border-dark);
+        span { color: var(--color-text-dark-5); }
+        &.active span { color: var(--color-text-dark-1); }
+      }
+
       &.active {
         color: var(--color-text-dark-primary);
         --icon-fill: var(--color-text-dark-primary);