Merge pull request #363 from mrkwnzl/develop

Update 2.14.0

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+### Added
+- Items with roll buttons now can execute macros when rolling. Specify a macro uuid (right-click the ID button in the header of the item sheet) in the item settings and it will be executed when a roll is made. `rollData` provides all the data of the roll for use in the macro.
+- Tags and recursions can also execeute macros when they are enabled. It works the same as for rolls, but the data is provided as `taggingData` to the macros.
+- Added some macros for use with scripting rolls.
+
+### Fixed
+- The roll buttons are enabled by default again.
+- Unlinked tokens can now use the roll dialog again.
+- The horizontal lines in the chat when an ability without cost is send to the chat has been removed.
+
 ## [2.13.1] - 2024-01-12
 ### Fixed
 - The Recovery Roll button is now included in the option to show the roll buttons only for stats.

css/cyphersystem.css

@@ -1,3 +1,9 @@
+/* Definitions */
+
+:root {
+  --cypher-font: 'Signika', sans-serif;
+}
+
 /* Global */
 
 #logo {
@@ -122,6 +128,10 @@ ol#chat-log .note-roll-dialog {
   font-weight: bold;
 }
 
+.chat-message .message-header .message-metadata {
+  white-space: nowrap;
+}
+
 .dialog-select {
   height: 26px;
   margin-bottom: 2px;
@@ -436,6 +446,7 @@ li.folder.collapsed > .folder-header h3 {
 
 .cyphersystem .window-content {
   overflow: hidden;
+  font-family: var(--cypher-font);
 }
 
 .cyphersystem .background-image {
@@ -1020,7 +1031,7 @@ li.folder.collapsed > .folder-header h3 {
   height: 26px;
   margin-bottom: 2px;
   margin-top: 2px;
-  font-family: "Signika", sans-serif;
+  font-family: var(--cypher-font);
   font-size: 14px;
   text-align-last: center;
   padding: 1px 3px;
@@ -1304,6 +1315,7 @@ select.settings-input {
   text-align: center;
   color: var(--color-text-light-highlight);
   font-size: 22px;
+  font-family: 'Signika', sans-serif;
   /* backdrop-filter: blur(5px); */
 }
 
@@ -1408,6 +1420,10 @@ select.settings-input {
   width: 32%;
 }
 
+.cyphersystem .dialog-button {
+  font-family: var(--cypher-font);
+}
+
 .cyphersystem div.cypher-logo {
   border: none;
   display: flex;
@@ -1439,7 +1455,7 @@ select.settings-input {
 .cyphersystem .items-list button.file-picker {
   height: 26px;
   margin: 0px 0px 0px 5px;
-  font-family: "Signika", sans-serif;
+  font-family: var(--cypher-font);
   font-size: 14px;
   text-align-last: center;
   border: 1px solid var(--color-border-light-tertiary);
@@ -1515,4 +1531,5 @@ section.cypher-note > p {
   line-height: 22px;
   border: 1px solid var(--color-border-light-tertiary);
   background: rgba(0, 0, 0, 0.05);
+  font-family: var(--cypher-font);
 }

lang/de.json

@@ -659,5 +659,24 @@
   "CYPHERSYSTEM.RemoveTagFromItem": "Tag von Item entfernen",
   "CYPHERSYSTEM.AddRecursionToItem": "Rekursion zu Item hinzufügen",
   "CYPHERSYSTEM.RemoveRecursionFromItem": "Rekursion von Item entfernen",
-  "CYPHERSYSTEM.ThisMacroHasBeenDeprecated": "Dieses Makro ist veraltet."
+  "CYPHERSYSTEM.ThisMacroHasBeenDeprecated": "Dieses Makro ist veraltet.",
+  "CYPHERSYSTEM.ExecuteMacroTag": "Führe Makro aus, wenn Tag aktiviert wird",
+  "CYPHERSYSTEM.ExecuteMacroRecursion": "Führe Makro aus, wenn Rekursion aktiviert wird",
+  "CYPHERSYSTEM.macroUuid": "Makro-UUID",
+  "CYPHERSYSTEM.MacroUsed": "Makro: {macro}.",
+  "CYPHERSYSTEM.AmmoLeft": "{name} übrig: {quantity}",
+  "CYPHERSYSTEM.TheCostIsAlreadyPaid": "Die Poolkosten wurden bereits gezahlt.",
+  "CYPHERSYSTEM.CantUseAnotherPCsPool": "Du kannst nicht die Poolpunkte anderer SCs benutzen.",
+  "CYPHERSYSTEM.FourthPoolNotActive": "Der vierte Pool ist nicht aktiv.",
+  "CYPHERSYSTEM.FourthPoolNoEdge": "Der vierte Pool hat keinen Edge-Wert.",
+  "CYPHERSYSTEM.CostTotalFourthPoolPoint": "Kosten: {totalCost} {label}-Punkt",
+  "CYPHERSYSTEM.CostTotalFourthPoolPoints": "Kosten: {totalCost} {label}-Punkte",
+  "CYPHERSYSTEM.FourthPoolBaseCostPoint": "Grundkosten: {baseCost} Punkt",
+  "CYPHERSYSTEM.FourthPoolBaseCostPoints": "Grundkosten: {baseCost} Punkte",
+  "CYPHERSYSTEM.NoAmmo": "Munition verbraucht.",
+  "CYPHERSYSTEM.NotAmmo": "Der angegebene Item-Tpy ist nicht Munition.",
+  "CYPHERSYSTEM.XPLeft": "EP übrig: {quantity}",
+  "CYPHERSYSTEM.Scripting": "Skripte",
+  "CYPHERSYSTEM.ExecuteMacro": "Führe Makro bei Wurf aus",
+  "CYPHERSYSTEM.MacroNotFound": "Makro nicht gefunden. Kann nicht würfeln."
 }

lang/en.json

@@ -655,5 +655,24 @@
   "CYPHERSYSTEM.SubtractDifficulty": "Subtract 1 from difficulty.",
   "CYPHERSYSTEM.AddDifficulty": "Add 1 to difficulty.",
   "CYPHERSYSTEM.ResetDifficulty": "Reset difficulty.",
-  "CYPHERSYSTEM.ToggleTemporaryPowerShift": "Toggle Temporary Power Shift"
+  "CYPHERSYSTEM.ToggleTemporaryPowerShift": "Toggle Temporary Power Shift",
+  "CYPHERSYSTEM.Scripting": "Scripting",
+  "CYPHERSYSTEM.ExecuteMacro": "Execute macro on roll",
+  "CYPHERSYSTEM.ExecuteMacroTag": "Execute macro when tag is enabled",
+  "CYPHERSYSTEM.ExecuteMacroRecursion": "Execute macro when recursion is enabled",
+  "CYPHERSYSTEM.macroUuid": "Macro UUID",
+  "CYPHERSYSTEM.MacroNotFound": "Macro not found. Cannot roll.",
+  "CYPHERSYSTEM.MacroUsed": "Macro: {macro}.",
+  "CYPHERSYSTEM.NoAmmo": "Ammo depleted.",
+  "CYPHERSYSTEM.NotAmmo": "The specified item type is not ammo.",
+  "CYPHERSYSTEM.AmmoLeft": "{name} left: {quantity}",
+  "CYPHERSYSTEM.TheCostIsAlreadyPaid": "The Pool point cost is already paid.",
+  "CYPHERSYSTEM.CantUseAnotherPCsPool": "You can’t use another PC’s Pool points.",
+  "CYPHERSYSTEM.FourthPoolNotActive": "The fourth Pool is not active.",
+  "CYPHERSYSTEM.FourthPoolNoEdge": "The fourth Pool does not have an Edge value.",
+  "CYPHERSYSTEM.CostTotalFourthPoolPoint": "Cost: {totalCost} {label} point",
+  "CYPHERSYSTEM.CostTotalFourthPoolPoints": "Cost: {totalCost} {label} points",
+  "CYPHERSYSTEM.FourthPoolBaseCostPoint": "Base cost: {baseCost} point",
+  "CYPHERSYSTEM.FourthPoolBaseCostPoints": "Base cost: {baseCost} points",
+  "CYPHERSYSTEM.XPLeft": "XP left: {quantity}"
 }