Merge pull request #349 from gmmatt/dev

v3.6.0 dev->master merge
gmmatt · Mar 8, 2024 · fb1c29a · fb1c29a
2 parents 95addef + e5d67ab
commit fb1c29a
Show file tree

Hide file tree

Showing 17 changed files with 811 additions and 385 deletions.
diff --git a/Readme.md b/Readme.md
@@ -7,6 +7,15 @@
 For manual installation, use the provided manifest URL in the "_Install System_" popup window while managing game
 systems.
 
+v. 3.6.0
+- Resolved a bug where dice-so-nice-rendered dices were only shown to the player- now everyone sees them
+- Resolved a bug, where active effects were not correctly applied to threats
+- Since the last Google Chrome-Update, scrollbars were shown inside Actor SKs boxes.
+- Styling-Issues solved
+- By creating an item and threat, it will have the proper default image (and token)
+- Threats can now roll skills unskilled
+- Storm Knights and vehicles now have a possibility to change the size
+
 v. 3.5.0
 
 - Drama cards now will be shown although no combatants are joint in the combat tracker (aids simple DSR mechanics).

diff --git a/css/journal.css b/css/journal.css
@@ -215,9 +215,8 @@ form button {
   margin: 0.5em 0;
 }
 
-.sheet.journal-entry .journal-entry-page p + p {
+.sheet.journal-entry .journal-entry-page :is(p,blockquote) + p {
   text-indent: 0.75rem;
-  /*margin-bottom: 0.75rem;*/
 }
 
 .sheet.journal-entry .journal-entry-page p:first-of-type {
@@ -410,7 +409,7 @@ blockquote {
   padding: 5px 10px;
   font-size: 14px;
   text-align: justify;
-  overflow: hidden;
+  overflow: inherit;
   border-left: none;
   font-style: normal;
 }
@@ -423,6 +422,10 @@ blockquote p + p {
   text-indent: 0px;
 }
 
+blockquote em {
+  font-style:italic;
+}
+
 /*...................................................................*/
 /*Inline links are pretty boring in standard-style, let's pimp'em!*/
 a.entity-link,

diff --git a/css/torgeternity.css b/css/torgeternity.css
@@ -196,8 +196,9 @@ div.actor ::-webkit-scrollbar {
 
 form.actor-sheet header.sheet-header-vehicle {
   display: flex;
-  justify-content: center;
-  align-items: center;
+  justify-content: space-around;
+  align-items: baseline;
+  flex-wrap: nowrap;
 }
 
 .window-content .actor-sheet .vehicle-header-image {
@@ -219,9 +220,13 @@ form.actor-sheet header.sheet-header-vehicle {
   color: #0e0909;
 }
 
-.window-content .actor-sheet .vehicle-header-type {
-  padding: 22px;
-  flex-grow: 2;
+.window-content .actor-sheet header.vehicle-stats div{
+  display:flex; 
+  align-items:baseline;
+}
+
+.window-content .actor-sheet header.vehicle-stats div > p{
+  margin-right: 1rem;
 }
 
 .groove-borders {
@@ -2061,6 +2066,7 @@ p.skill-chat-title.skilled {
 
 .torgeternity.actor {
   min-width: 450px;
+  min-height: 636px;
 }
 
 .torgeternity.actor .window-content {
@@ -2162,6 +2168,7 @@ form.actor-sheet header input[name="name"] {
 
 .window-content .actor-sheet section.sheet-body {
   height: 100%;
+  width: 100%;
 }
 
 .window-content .list-section-heading {
@@ -2198,14 +2205,118 @@ form.actor-sheet header input[name="name"] {
   border-image-slice: 50;
   box-shadow: 2px 2px 15px #9e9686;
   transition: all 0.3s cubic-bezier(0.6, -0.07, 0.56, 1.52) 0.2s;
-  overflow: scroll;
+  overflow: auto;
   padding: 0px;
 }
 
 .window-content .actor-sheet div.block:hover {
   box-shadow: 2px 2px 15px black;
 }
 
+.window-content .actor-sheet .sksheet.header.totalbox {
+  display:grid;
+  grid-template-rows:repeat(3,auto); 
+  grid-template-columns:repeat(7,1fr);
+  white-space:nowrap;
+  gap:10px;
+  margin-bottom: 1em;
+
+  position:relative;
+}
+
+.window-content .actor-sheet .sksheet.header.totalbox:before {
+  content: ' ';
+  display: block;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0.2;
+  background-image: url("../images/TORG_Logo.webp");
+  background-repeat: no-repeat;
+  background-position: 50% 0;
+  background-size: contain;
+}
+
+.window-content .actor-sheet .sksheet.header.totalbox > * {
+  position:relative;
+}
+
+.window-content .actor-sheet .sksheet.header.totalbox > h2 {
+  margin:unset;
+  margin-top: 0.5rem;
+  font-size:14px;
+}
+
+.window-content .actor-sheet .sksheet.header.nameinput {
+  grid-row:1/2;
+  grid-column:2/7;
+  margin:unset;
+}
+
+.window-content .actor-sheet .sksheet.header.torglogo {
+  grid-row:1/2;
+  grid-column:5/7;
+}
+
+.window-content .actor-sheet .sksheet.header.CRSbox  {
+  grid-row: 1/4;
+  grid-column: 1/2;
+
+  display: flex; 
+  flex-direction: column; 
+  justify-content: space-evenly;  
+  align-items:center;
+  margin:unset;
+  row-gap:3px;
+}
+
+.window-content .actor-sheet .sksheet.header.axiomsboxheadline {
+  grid-row: 2/3;
+  grid-column: 2/5;  
+}
+
+.window-content .actor-sheet .sksheet.header.axiomsbox {
+  grid-row: 3/4;
+  grid-column: 2/5;
+  display:flex;
+  flex-direction: row;
+  justify-content: space-evenly;
+}
+
+.window-content .actor-sheet .sksheet.header.woundsheadline {
+  grid-row: 2/3;
+  grid-column: 5/6;
+}
+
+.window-content .actor-sheet .sksheet.header.woundsbox {
+  grid-row: 3/4;
+  grid-column:5/6;
+}
+
+.window-content .actor-sheet .sksheet.header.shockheadline {
+  grid-row: 2/3;
+  grid-column: 6/7;
+}
+
+.window-content .actor-sheet .sksheet.header.shockbox {
+  grid-row: 3/4;
+  grid-column:6/7;
+}
+
+.window-content .actor-sheet .sksheet.header.possyheadline {
+  grid-row: 2/3;
+  grid-column: 7/8;
+}
+
+.window-content .actor-sheet .sksheet.header.possybox {
+  grid-row: 3/4;
+  grid-column:7/8;
+  align-content: center;
+  justify-content: center;
+}
+
 .window-content .actor-sheet nav.tabs {
   display: flex;
   flex-direction: row;
@@ -2312,8 +2423,8 @@ form.actor-sheet header input[name="name"] {
   border: none;
   flex: 0 0 60px;
   height: auto;
-  max-height: 120px;
-  max-width: 120px;
+ /* max-height: 120px;
+  max-width: 120px;*/
   width: 80%;
   margin-left: auto;
   margin-right: auto;
@@ -2434,6 +2545,8 @@ form.actor-sheet header input[name="name"] {
   width: auto;
   transition: 0.2s;
   transform: rotate(0deg) scale(1);
+  grid-row:1/2;
+  grid-column:7/8;
 }
 
 .window-content .actor-sheet .sheet-header img.open-hand:hover {
@@ -2474,8 +2587,7 @@ form.actor-sheet header input[name="name"] {
 .window-content .actor-sheet .sheet-header div {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
-  margin-right: 5px;
+  justify-content: space-between;  
   align-items: center;
 }
 
@@ -2573,7 +2685,7 @@ form.actor-sheet header input[name="name"] {
 .window-content .actor-sheet .skills {
   grid-column: 1/5;
   grid-row: 3 / span 7;
-  overflow: scroll;
+  overflow: inherit;
   max-height: 100%;
 }
 
@@ -2597,6 +2709,7 @@ form.actor-sheet header input[name="name"] {
   display: flex;
   flex-direction: column;
   justify-content: space-around;
+  padding:0;
 }
 
 .window-content .actor-sheet .skills ul li {
@@ -3239,6 +3352,10 @@ form.actor-sheet.threat .tab[data-tab].active .editor {
   font-size: 0.9em;
 }
 
+.item-sheet > .sheet-header img {
+  border:none;
+}
+
 .item .window-content form.item-sheet .item-type {
   background: url(../images/separatorRound.webp);
   position: absolute;
@@ -3878,6 +3995,19 @@ form.actor-sheet.threat .tab[data-tab].active .editor {
   font-size: 13px;
 }
 
+form.actor-sheet img.profile-img{
+  height:100%;
+  width:unset;
+  object-fit:cover;
+  object-position: 50% 0;
+  aspect-ratio: 1/1;
+}
+
+form.actor-sheet .vehicle-header-image img{
+  max-height: 120px;
+  max-width: 120px;
+}
+
 .threat-avatar img {
   width: 150px;
   height: 150px;

diff --git a/images/TORG_Logo.webp b/images/TORG_Logo.webp
diff --git a/lang/de.json b/lang/de.json
@@ -107,7 +107,7 @@
       "playsCard": "Spielt aus:",
       "possibility": "Möglichkeit",
       "possibleDisconnect": "Mögliche Abkopplung",
-      "rolled": "rolled",
+      "rolled": "gewürfelt",
       "showDetails": "Zeige Details",
       "skillTestLabel": "Fertigkeitswert",
       "stunt": "Stunt-Probe",
@@ -615,7 +615,7 @@
       "implant": "Implantat",
       "implants": "Implantate",
       "inactiveEffects": "Inaktive Effekte",
-      "inputExisting": "Vorheriges Würfelergebnis",
+      "inputExisting": "Vorheriger Würfelbonus",
       "interactionAttacks": "Interaktionsangriffe",
       "interactionSkills": "Interaktion",
       "keep": "Behalten",
@@ -691,7 +691,7 @@
       "specialAbility": "Spezielle Fähigkeit",
       "spell": "Zauber",
       "spells": "Zauber",
-      "spirit": "Spiritualität",
+      "spirit": "Spirit.",
       "stats": "Werte",
       "statusEffects": "Statuseffekte",
       "stormknight": "Storm Knight",
@@ -834,7 +834,8 @@
       "possibilities": "Möglichkeiten",
       "shock": "Schock",
       "speedModifier": "Geschwindigkeitsmodifikator",
-      "wounds": "Wunden"
+      "wounds": "Wunden",
+      "axioms": "Axiome"
     },
     "statusEffects": {
       "aiming": "Zielt",
@@ -893,6 +894,14 @@
     "yesNo": {
       "false": "Nein",
       "true": "Ja"
+    },
+    "macros": {
+      "commonMacroNoTokensSelected": "Es wurden keine Token ausgewählt. Das Makro kann nicht ausgeführt werden.",
+      "commonMacroNoValue": "Es wurde kein Wert eingegeben. Das Makro kann nicht ausgeführt werden.",
+      "commonMacroOnlyByGM": "Dieses Makro kann nur von Spielleitern ausgeführt werden!",
+      "bonusDieMacroTitle": "Makro für Bonuswürfel",
+      "bonusDieMacroContent": "Wieviele Bonuswürfel sollen denn geworfen werden?",
+      "bonusDieMacroErrorIntegerValue": "Die Eingabe war keine Ganzzahl. Bitte gebe eine Ganzzahl ein."
     }
   }
 }
diff --git a/lang/en.json b/lang/en.json
@@ -834,7 +834,8 @@
       "possibilities": "Possibilities",
       "shock": "Shock",
       "speedModifier": "Vehicle Speed Modifier",
-      "wounds": "Wounds"
+      "wounds": "Wounds",
+      "axioms": "Axioms"
     },
     "statusEffects": {
       "aiming": "Aiming",
@@ -893,6 +894,14 @@
     "yesNo": {
       "false": "No",
       "true": "Yes"
+    },
+    "macros": {
+      "commonMacroNoTokensSelected": "There were no tokens selected. The macro cannot compute.",
+      "commonMacroNoValue": "No value entered. The macro cannot compute.",
+      "commonMacroOnlyByGM": "This Macro is only executionable by GMs!",
+      "bonusDieMacroTitle": "Macro for Bonus-Dice",
+      "bonusDieMacroContent": "How many bonus-di(c)e do you want to throw?",
+      "bonusDieMacroErrorIntegerValue": "The entered value in the dialog was not a number or a float / decimal. Please enter an integer."
     }
   }
 }
diff --git a/module/handlebarHelpers.js b/module/handlebarHelpers.js
@@ -104,6 +104,13 @@ export function registerHelpers() {
     return options.inverse(this);
   });
 
+  Handlebars.registerHelper("isNaN", function (a, options) {
+    if (isNaN(a)) {
+      return options.fn(this);
+    }
+    return options.inverse(this);
+  });
+
   Handlebars.registerHelper("poolList", function (actorId) {
     var testVariable = actorId;
     var poolList = "";