Merge pull request #334 from mrkwnzl/develop

Update 2.10.0

CHANGELOG.md

@@ -4,6 +4,24 @@ 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).
 
+## [2.10.0] - 2023-09-24
+### Added
+- The difficulty control panel now has an option to use the difficulty as the base value for NPC (and for non-player communities and vehicles) initiative instead of their level. This way, all lower level NPCs would still act at the same time as the highest level NPCs, if the difficulty is set to the level of the highest level NPC, as per the rules. Within the NPC group, they are still sorted by level (see changes below).
+- Power shifts now have a toggle to display a temporary power shifts (for example, for temporary blood shifts from Stay Alive!). Note that this is, as all power shifts are, mainly a cosmetic setting. It doesn’t ease any rolls automatically. That needs to be accounted for manually.
+- A new game setting to always show the roll result details (see below) by default.
+
+### Changed
+- The Cypher logo (and custom logos) now use more of the space they have available, making them effectively a little bigger on the sheet.
+- The dark tabletop scene now has a new table texture. Exisiting scenes are automatically using the new texture.
+- NPC (and non-player community and vehicle) initiative now has the level of the NPC as the tie breaker. The initiative value now goes to one-thousands. This is only relevant, if you use the difficulty control panel to set the base for the initiative instead of the level of the NPC (see additions above). For example, a level 4 NPC with an initiative base set to difficulty 5 will have an initiative value of 4.504. 4.5 is the base difficulty 5 minus 0.5 as the tie breaker against PCs, and 0.004 is added as a tie breaker against other NPCs.
+- The roll button for abilities now better reflects the All-in-One dialog settings.
+- The chat output for the All-in-One rolls (including quick rolls) has been revamped so that the most important information is shown and understandable at a quick glance. With a click on each title, you get all the details.
+
+### Fixed
+- The initial cost in the All-in-One Roll Dialog is now calculated correctly.
+- The Count Quantity macro to use in conjunction with Marker tokens now works correctly again.
+- The button to toggle active armor works again.
+
 ## [2.9.0] - 2023-08-31
 ### Added
 - The roll engine now has a hook with the actor and roll data, which can be called using `Hooks.on("rollEngine", actor, data);`.

ReadMe.md

@@ -114,8 +114,9 @@ Unless explicitely mentioned below, all graphics under `icons/` are taken from [
 
 The following graphics are taken from various sources, or have been created specifically for this system.
 
+- AI-generated using Stable Diffusion: wooden-table_dark.webp ([CC0](https://creativecommons.org/publicdomain/zero/1.0/legalcode))
 - bashcorpo ([https://www.deviantart.com](https://www.deviantart.com/bashcorpo)): Grungy paper texture v.5, CC BY 3.0
-- Marko Wenzel: divider-horizontal.png, divider-vertical.png, grid.png, npcs.png
+- Marko Wenzel: divider-horizontal.png, divider-vertical.png, grid.png, npcs.png.
 - smaug18#2066: xp-marker.png
 - The-Auteur-Stock ([https://www.deviantart.com](https://www.deviantart.com/the-auteur-stock)): Wooden Table Texture, CC BY 3.0
 - wojtar-stock ([https://www.deviantart.com/wojtar-stock](https://www.deviantart.com/wojtar-stock)): metal texture 12, non-commercial use allowed

css/cyphersystem.css

@@ -66,6 +66,14 @@ ol {
   border-top: 1px solid #7a7971;
 }
 
+#chat-log .roll-result-hr {
+  margin-top: 3px;
+  margin-bottom: 3px;
+  border-bottom: none;
+  border-top: 3px double #7a7971;
+  width: 95%;
+}
+
 #chat-log .intrusion {
   color: red;
 }
@@ -285,6 +293,8 @@ form.cyphersystem {
 #chat-log .roll-flavor {
   line-height: 1.3;
   margin-bottom: 3px;
+  font-size: var(--font-size-12);
+  color: var(--color-text-dark-secondary);
 }
 
 ::-webkit-scrollbar-track {
@@ -365,6 +375,30 @@ li.folder.collapsed>.folder-header h3 {
   padding-bottom: 2px;
 }
 
+.roll-result-box {
+  background: rgba(0, 0, 0, 0.05);
+  border: 1px solid #7a7971;
+  border-radius: 3px;
+  padding: 3px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+.roll-result-box.box1718 {
+  background: rgba(0, 0, 255, 0.05);
+  border: 1px solid blue;
+}
+
+.roll-result-box.box1920 {
+  background: rgba(0, 128, 0, 0.05);
+  border: 1px solid green;
+}
+
+.roll-result-box.box1 {
+  background: rgba(255, 0, 0, 0.05);
+  border: 1px solid red;
+}
+
 /* Styles limited to cyphersystem sheets */
 
 .cyphersystem .window-content {
@@ -1305,8 +1339,10 @@ select.settings-input {
 }
 
 .cyphersystem div.cypher-logo {
-  border: 1px solid rgb(0, 0, 0, 0);
+  border: none;
   display: flex;
+  padding: 0;
+  min-width: 154.75px;
 }
 
 .cyphersystem img.cypher-logo {
@@ -1317,24 +1353,19 @@ select.settings-input {
   object-fit: scale-down;
 }
 
-.cyphersystem img.pc-logo {
-  max-height: 75px;
-  max-width: 140px;
+.cyphersystem .sheet-header img.pc-logo {
+  height: auto;
+  max-height: 87px;
 }
 
-.cyphersystem img.npc-logo {
-  max-height: 57px;
-  max-width: 168px;
+.cyphersystem .sheet-header img.npc-logo {
+  max-height: 59px;
 }
 
 .cyphersystem img.cypher-logo.white {
   filter: drop-shadow(0px 0px 3px rgb(0, 0, 0, 0.5));
 }
 
-.cyphersystem img.cypher-logo.custom {
-  height: 75px;
-}
-
 .cyphersystem .items-list button.file-picker {
   height: 26px;
   margin: 0px 0px 0px 5px;

lang/de.json

@@ -9,8 +9,8 @@
   "CYPHERSYSTEM.GettingStarted": "Erste Schritte",
   "CYPHERSYSTEM.UserManual": "Handbuch",
   "CYPHERSYSTEM.GMIntrusion": "SL Eingriff!",
-  "CYPHERSYSTEM.OneDamage": "+1 Schaden",
-  "CYPHERSYSTEM.TwoDamage": "+2 Schaden",
+  "CYPHERSYSTEM.OneDamage": "+1 Punkt Schaden",
+  "CYPHERSYSTEM.TwoDamage": "+2 Punkte Schaden",
   "CYPHERSYSTEM.MinorEffectRoll": "Minderer Effekt",
   "CYPHERSYSTEM.MajorEffectRoll": "Mächtiger Effekt",
   "CYPHERSYSTEM.Difficulty": "Schwierigkeit",
@@ -400,7 +400,7 @@
   "CYPHERSYSTEM.LowTier": "niedriger Rang",
   "CYPHERSYSTEM.MidTier": "mittlerer Rang",
   "CYPHERSYSTEM.HighTier": "hoher Rang",
-  "CYPHERSYSTEM.NoCombatActive": "Zur Zeit ist kein Kampf aktiv.",
+  "CYPHERSYSTEM.NoCombatActive": "Initiative kann nur gewürfelt werden, nachdem die SL einen Kampf gestartet hat.",
   "CYPHERSYSTEM.UseAsInitiativeRoll": "Benutze Würfelergebnis als Initiativewurf",
   "CYPHERSYSTEM.BaseDifficulty": "Basisschwierigkeit",
   "CYPHERSYSTEM.PCIsAttacker": "SC ist aktiv/Angreifer",
@@ -551,15 +551,15 @@
   "CYPHERSYSTEM.CancelButtonTooltip": "Abbrechen (Alt-Klick, um Mehrfachwurfaktion zu fortzusetzen)",
   "CYPHERSYSTEM.TeensCantMultiRoll": "Teen-Formen können keine Mehrfachwurfaktion nutzen.",
   "CYPHERSYSTEM.DamageInfo": "Schaden: {totalDamage}",
-  "CYPHERSYSTEM.DamageWithEffectInfo": "Schaden: {totalDamage} oder {damageWithEffect}",
+  "CYPHERSYSTEM.DamageWithEffectInfo": "Schadenswert: {totalDamage} oder {damageWithEffect} Punkte",
   "CYPHERSYSTEM.AllPCs": "Alle Spielercharaktere",
   "CYPHERSYSTEM.RollButtonTooltip": "Würfel werfen (Alt-Klick, um Mehrfachwurfaktion zu starten oder fortzusetzen)",
   "CYPHERSYSTEM.PayButtonTooltip": "Kosten bezahlen, ohne Würfel zu werfen (Alt-Klick, um Mehrfachwurfaktion zu starten oder fortzusetzen)",
   "TYPES.Actor.marker": "Marker",
   "TYPES.Item.lasting-damage": "Dauerhafter Schaden",
   "TYPES.Item.power-shift": "Power Shift",
-  "CYPHERSYSTEM.DamageOrMinorEffectRoll": "Minderer Effekt oder +3 Schaden",
-  "CYPHERSYSTEM.DamageOrMajorEffectRoll": "Mächtiger Effekt oder +4 Schaden",
+  "CYPHERSYSTEM.DamageOrMinorEffectRoll": "Minderer Effekt oder +3 Punkte Schaden",
+  "CYPHERSYSTEM.DamageOrMajorEffectRoll": "Mächtiger Effekt oder +4 Punkte Schaden",
   "CYPHERSYSTEM.IntrusionAcceptedAndGaveXP": "{actor} hat den Eingriff angenommen (+1 EP) und hat den zusätzlichen EP {selectedActor} gegeben.",
   "CYPHERSYSTEM.MigrationInProgress": "Datenmigration für Cypher System Version {version} wird angewandt. Bitte sei geduldig und schließe das Spiel nicht und fahre deinen Server nicht herunter.",
   "CYPHERSYSTEM.MigrationDone": "Datenmigration für Cypher System Version {version} abgeschlossen!",
@@ -622,11 +622,30 @@
   "CYPHERSYSTEM.HideEmptyCategories": "Verstecke leere Kategorien",
   "CYPHERSYSTEM.CharacterPropertiesCanOnlySharedAcrossPCs": "Charaktereigenschaften können nicht auf diesem Akteurtypen bewegt werden.",
   "CYPHERSYSTEM.Keep": "Behalten",
-  "CYPHERSYSTEM.OnlyNextRoll": "Nur auf den nächsten Wurf anwenden",
+  "CYPHERSYSTEM.OnlyNextRoll": "Wird nur auf den nächsten Wurf angewandt",
   "CYPHERSYSTEM.ItemCreatedAsAttack": "{item} wurde als Angriff kopiert.",
   "CYPHERSYSTEM.ItemCreatedAsEquipment": "{item} wurde als Ausrüstung kopiert.",
   "CYPHERSYSTEM.KeepDifficulty": "Persistenter Schwierigkeitsgrad",
   "CYPHERSYSTEM.ItemCreatedAsSkill": "{item} wurde als Fertigkeit kopiert.",
   "CYPHERSYSTEM.ItemCreatedAsArmor": "{item} wurde als Rüstung kopiert.",
-  "CYPHERSYSTEM.CopyAs": "Kopieren als…"
+  "CYPHERSYSTEM.CopyAs": "Kopieren als…",
+  "CYPHERSYSTEM.DifficultyControlPanel": "Schwierigkeitsgradkontrollen",
+  "CYPHERSYSTEM.ApplyToNPCInitiative": "NSC-Initiative basiert auf Schwierigkeitsgrad",
+  "CYPHERSYSTEM.DifficultyUsedAsBaseForNPCInitiative": "Der Schwierigkeitsgrad wird für die Berechnung der NSC-Initiative benutzt",
+  "CYPHERSYSTEM.NPCsUseTheirLevelForInitiative": "NSCs benutzen ihre Stufe für Initiative",
+  "CYPHERSYSTEM.AddDifficulty": "Füge 1 zum Schwierigkeitsgrad hinzu.",
+  "CYPHERSYSTEM.ResetDifficulty": "Setze Schwierigkeitsgrad zurück.",
+  "CYPHERSYSTEM.SubtractDifficulty": "Ziehe 1 vom Schwierigkeitsgrad ab.",
+  "CYPHERSYSTEM.RollItemPayPoints": "Für Gegenstand würfeln (Alt-Klick, um Poolkosten zu bezahlen)",
+  "CYPHERSYSTEM.RollItemSkip": "Für Gegenstand würfeln (Alt-Klick, um All-in-One-Dialog zu überspringen)",
+  "CYPHERSYSTEM.BaseCost": "Grundkosten",
+  "CYPHERSYSTEM.BaseDamagePoint": "Grundschaden: {baseDamage} Punkt",
+  "CYPHERSYSTEM.BaseDamagePoints": "Grundschaden: {baseDamage} Punkte",
+  "CYPHERSYSTEM.EffectDamagePoint": "Spezialwurf: {baseDamage} Punkt",
+  "CYPHERSYSTEM.DamageInflictedPoint": "Schadenswert: {totalDamage} Punkt",
+  "CYPHERSYSTEM.DamageInflictedPoints": "Schadenswert: {totalDamage} Punkte",
+  "CYPHERSYSTEM.SettingShowRollDetails": "Zeige Wurfdetails",
+  "CYPHERSYSTEM.SettingShowRollDetailsHint": "Aktiviere diese Einstellung, um alle Wurfdetails standardmäßig anzuzeigen.",
+  "CYPHERSYSTEM.EffectDamagePoints": "Spezialwurf: {baseDamage} Punkte",
+  "CYPHERSYSTEM.ToggleTemporaryPowerShift": "Temoprären Power Shift umschalten"
 }

lang/en.json

@@ -58,6 +58,8 @@
   "CYPHERSYSTEM.SettingRollMacroOnlyWhenNoDifficultyIsSet": "Only when no difficulty is set before the roll",
   "CYPHERSYSTEM.SettingMacroAllInOne": "Use All-in-One Dialog as Default",
   "CYPHERSYSTEM.SettingMacroAllInOneHint": "With this setting, the item macros created by dragging an item to the macro bar and the optional roll buttons on character sheets use the All-in-One Roll macro instead of the Quick Roll macro. Alt-click for a quick roll with this setting.",
+  "CYPHERSYSTEM.SettingShowRollDetails": "Show Roll Details",
+  "CYPHERSYSTEM.SettingShowRollDetailsHint": "Enable this setting to show all roll details by default.",
   "CYPHERSYSTEM.SettingShowWelcome": "Show Welcome Message",
   "CYPHERSYSTEM.SettingShowWelcomeHint": "Show the welcome message at every launch of this world.",
   "CYPHERSYSTEM.SettingRollButtons": "Roll Buttons on Character Sheets",
@@ -81,15 +83,19 @@
   "CYPHERSYSTEM.UserManual": "User Manual",
   "CYPHERSYSTEM.JoinDiscord": "Join the Cypher FVTT Dev Discord",
   "CYPHERSYSTEM.GMIntrusion": "GM Intrusion!",
-  "CYPHERSYSTEM.OneDamage": "+1 Damage",
-  "CYPHERSYSTEM.TwoDamage": "+2 Damage",
+  "CYPHERSYSTEM.OneDamage": "+1 Point of Damage",
+  "CYPHERSYSTEM.TwoDamage": "+2 Points of Damage",
   "CYPHERSYSTEM.MinorEffectRoll": "Minor Effect",
-  "CYPHERSYSTEM.DamageOrMinorEffectRoll": "Minor Effect or +3 Damage",
+  "CYPHERSYSTEM.DamageOrMinorEffectRoll": "Minor Effect or +3 Points of Damage",
   "CYPHERSYSTEM.MajorEffectRoll": "Major Effect",
-  "CYPHERSYSTEM.DamageOrMajorEffectRoll": "Major Effect or +4 Damage",
+  "CYPHERSYSTEM.DamageOrMajorEffectRoll": "Major Effect or +4 Points of Damage",
   "CYPHERSYSTEM.Difficulty": "Difficulty",
+  "CYPHERSYSTEM.DifficultyControlPanel": "Difficulty Control Panel",
   "CYPHERSYSTEM.KeepDifficulty": "Persistent difficulty",
-  "CYPHERSYSTEM.OnlyNextRoll": "Apply to next roll only",
+  "CYPHERSYSTEM.OnlyNextRoll": "Applies to next roll only",
+  "CYPHERSYSTEM.ApplyToNPCInitiative": "Base NPC initiative on difficulty",
+  "CYPHERSYSTEM.DifficultyUsedAsBaseForNPCInitiative": "Difficulty is used as base for NPC initiative",
+  "CYPHERSYSTEM.NPCsUseTheirLevelForInitiative": "NPCs use their level for initiative",
   "CYPHERSYSTEM.DifficultyModifier": "Difficulty modifier",
   "CYPHERSYSTEM.RollBeatDifficulty": "Beats difficulty",
   "CYPHERSYSTEM.Success": "Success!",
@@ -127,6 +133,7 @@
   "CYPHERSYSTEM.SpeedEdge": "Speed Edge",
   "CYPHERSYSTEM.IntellectEdge": "Intellect Edge",
   "CYPHERSYSTEM.Cost": "Cost",
+  "CYPHERSYSTEM.BaseCost": "Base cost",
   "CYPHERSYSTEM.TotalCost": "Total cost",
   "CYPHERSYSTEM.BasicModifiers": "Basic Modifiers",
   "CYPHERSYSTEM.AttackModifiers": "Attack Modifiers",
@@ -332,8 +339,14 @@
   "CYPHERSYSTEM.Rating": "Rating",
   "CYPHERSYSTEM.Rating/Cost": "Rating/Cost",
   "CYPHERSYSTEM.Damage": "Damage",
+  "CYPHERSYSTEM.BaseDamagePoint": "Base damage: {baseDamage} point",
+  "CYPHERSYSTEM.BaseDamagePoints": "Base damage: {baseDamage} points",
+  "CYPHERSYSTEM.EffectDamagePoint": "Special roll: {baseDamage} point",
+  "CYPHERSYSTEM.EffectDamagePoints": "Special roll: {baseDamage} points",
+  "CYPHERSYSTEM.DamageInflictedPoint": "Damage inflicted: {totalDamage} point",
+  "CYPHERSYSTEM.DamageInflictedPoints": "Damage inflicted: {totalDamage} points",
   "CYPHERSYSTEM.DamageInfo": "Damage: {totalDamage}",
-  "CYPHERSYSTEM.DamageWithEffectInfo": "Damage: {totalDamage} or {damageWithEffect}",
+  "CYPHERSYSTEM.DamageWithEffectInfo": "Damage inflicted: {totalDamage} or {damageWithEffect} points",
   "CYPHERSYSTEM.Quantity": "Quantity",
   "CYPHERSYSTEM.Max": "Max",
   "CYPHERSYSTEM.Units": "Units",
@@ -345,6 +358,8 @@
   "CYPHERSYSTEM.CreateItem": "Create Item",
   "CYPHERSYSTEM.EditItem": "Open Item Sheet",
   "CYPHERSYSTEM.RollItem": "Roll Item (alt-click for All-in-One dialog)",
+  "CYPHERSYSTEM.RollItemSkip": "Roll Item (alt-click to skip All-in-One dialog)",
+  "CYPHERSYSTEM.RollItemPayPoints": "Roll Item (alt-click to pay Pool points)",
   "CYPHERSYSTEM.PayItem": "Pay Pool Points (alt-click for All-in-One dialog)",
   "CYPHERSYSTEM.CastSpell": "Use Recovery Roll to Cast Spell",
   "CYPHERSYSTEM.ShowDescription": "Show Description (alt-click to send description to chat)",
@@ -627,5 +642,6 @@
   "CYPHERSYSTEM.ItemCreatedAsArmor": "{item} has been copied as armor.",
   "CYPHERSYSTEM.SubtractDifficulty": "Subtract 1 from difficulty.",
   "CYPHERSYSTEM.AddDifficulty": "Add 1 to difficulty.",
-  "CYPHERSYSTEM.ResetDifficulty": "Reset difficulty."
+  "CYPHERSYSTEM.ResetDifficulty": "Reset difficulty.",
+  "CYPHERSYSTEM.ToggleTemporaryPowerShift": "Toggle Temporary Power Shift"
 }