Merge pull request #328 from mrkwnzl/develop

v2.8.4
mrkwnzl · Jul 30, 2023 · bbe3083 · bbe3083
2 parents 7890f5b + ae0e6f0
commit bbe3083
Show file tree

Hide file tree

Showing 30 changed files with 76 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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.8.4] - 2023-07-30
+### Changed
+- Prototype tokens of newly created actors no longer have a pre-defined display name and disposition. This allows you to set your own token defaults in the system settings. Already existing actors as well as actors form compendiums keep their prototype token settings.
+- Updated languages.
+- The notification if players try to roll initiative before an encounter has ben created has been clarified.
+
 ## [2.8.3] - 2023-07-20
 ### Fixed
 - Fixed a translation string for light armor.

diff --git a/lang/en.json b/lang/en.json
@@ -279,7 +279,7 @@
   "CYPHERSYSTEM.CountQuantityOnInitiative": "Count Quantity on Initiative",
   "CYPHERSYSTEM.Initiative": "Initiative",
   "CYPHERSYSTEM.NoTokensOnScene": "{name} has no tokens on the active scene.",
-  "CYPHERSYSTEM.NoCombatActive": "No combat is currently active.",
+  "CYPHERSYSTEM.NoCombatActive": "Initiative can only be rolled after the GM created an encounter.",
   "CYPHERSYSTEM.UseAsInitiativeRoll": "Use Roll Results as Initiative Roll",
   "CYPHERSYSTEM.AdditionalSentenceField": "Additional Sentence Field",
   "CYPHERSYSTEM.AdditionalPoolSetting": "Additional Pool",

diff --git a/lang/pt_BR.json b/lang/pt_BR.json
@@ -105,7 +105,7 @@
   "CYPHERSYSTEM.RecoveryHours": "10 Horas",
   "CYPHERSYSTEM.Attacks": "Ataques",
   "CYPHERSYSTEM.Abilities": "Habilidades",
-  "CYPHERSYSTEM.PointCost": "Custo",
+  "CYPHERSYSTEM.PointCost": "Custo de Pontos",
   "CYPHERSYSTEM.GeneralSettings": "Configurações Gerais",
   "CYPHERSYSTEM.GameMode": "Modo de Jogo",
   "CYPHERSYSTEM.DefaultTab": "Guia Padrão",
@@ -153,7 +153,7 @@
   "CYPHERSYSTEM.Hindered": "Dificultado",
   "CYPHERSYSTEM.hinderedBy": "dificultado em",
   "CYPHERSYSTEM.HinderedBySteps": "Dificultado em {amount} passos",
-  "CYPHERSYSTEM.By": "em",
+  "CYPHERSYSTEM.By": "por",
   "CYPHERSYSTEM.Step": "passo",
   "CYPHERSYSTEM.Up": "Cima",
   "CYPHERSYSTEM.Down": "Baixo",
@@ -515,9 +515,9 @@
   "CYPHERSYSTEM.AttackDealsPointsDamage": "Ataque causa {amount} pontos de dano.",
   "CYPHERSYSTEM.PCIsImpaired": "Enfraquecido: Esforço custa +1 por nível.",
   "CYPHERSYSTEM.TaskUnmodified": "Tarefa não modificada.",
-  "CYPHERSYSTEM.AttackDealsPointDamage": "Ataque causa {amount} pontos de dano.",
+  "CYPHERSYSTEM.AttackDealsPointDamage": "Ataque causa {amount} ponto de dano.",
   "CYPHERSYSTEM.TaskCostsPoints": "Custo total: {amount} pontos de {pool}.",
-  "CYPHERSYSTEM.TaskCostsPoint": "Custo total: {amount} pontos de {pool}.",
+  "CYPHERSYSTEM.TaskCostsPoint": "Custo total: {amount} ponto de {pool}.",
   "CYPHERSYSTEM.PCIsDebilitated": "Debilitado: Esforço custa +1 por nível.",
   "CYPHERSYSTEM.CharacterPreview": "Visualização de Info do Personagem",
   "CYPHERSYSTEM.BGImageFoundry": "Padrão do Foundry",

diff --git a/module/cyphersystem.js b/module/cyphersystem.js
@@ -288,36 +288,25 @@ Hooks.on("getSceneControlButtons", function (hudButtons) {
 });
 
 Hooks.on("preCreateActor", async function (actor) {
-  if (["pc", "community", "vehicle"].includes(actor.type)) {
+  if (["pc", "community"].includes(actor.type)) {
     actor.updateSource({
-      "prototypeToken.displayName": CONST.TOKEN_DISPLAY_MODES.HOVER,
-      "prototypeToken.disposition": CONST.TOKEN_DISPOSITIONS.NEUTRAL,
       "prototypeToken.actorLink": true
     });
   } else if (actor.type == "npc") {
     actor.updateSource({
       "prototypeToken.bar1": {"attribute": "pools.health"},
-      "prototypeToken.bar2": {"attribute": "basic.level"},
-      "prototypeToken.displayName": CONST.TOKEN_DISPLAY_MODES.OWNER_HOVER,
-      "prototypeToken.displayBars": CONST.TOKEN_DISPLAY_MODES.OWNER,
-      "prototypeToken.disposition": CONST.TOKEN_DISPOSITIONS.NEUTRAL
+      "prototypeToken.bar2": {"attribute": "basic.level"}
     });
   } else if (actor.type == "companion") {
     actor.updateSource({
       "prototypeToken.bar1": {"attribute": "pools.health"},
       "prototypeToken.bar2": {"attribute": "basic.level"},
-      "prototypeToken.displayName": CONST.TOKEN_DISPLAY_MODES.OWNER_HOVER,
-      "prototypeToken.displayBars": CONST.TOKEN_DISPLAY_MODES.OWNER,
-      "prototypeToken.disposition": CONST.TOKEN_DISPOSITIONS.NEUTRAL,
       "prototypeToken.actorLink": true
     });
   } else if (actor.type == "marker") {
     actor.updateSource({
       "prototypeToken.bar1": {"attribute": "pools.quantity"},
-      "prototypeToken.bar2": {"attribute": "basic.  level"},
-      "prototypeToken.displayName": CONST.TOKEN_DISPLAY_MODES.HOVER,
-      "prototypeToken.displayBars": CONST.TOKEN_DISPLAY_MODES.ALWAYS,
-      "prototypeToken.disposition": CONST.TOKEN_DISPOSITIONS.NEUTRAL
+      "prototypeToken.bar2": {"attribute": "basic.level"}
     });
   }
 });

diff --git a/packs/markers/000279.log → packs/markers/000333.log b/packs/markers/000279.log → packs/markers/000333.log
diff --git a/packs/markers/CURRENT b/packs/markers/CURRENT
@@ -1 +1 @@
-MANIFEST-000278
+MANIFEST-000332
diff --git a/packs/markers/LOG b/packs/markers/LOG
@@ -1,3 +1,3 @@
-2023/07/20-11:06:29.822815 30f520000 Recovering log #277
-2023/07/20-11:06:29.823345 30f520000 Delete type=0 #277
-2023/07/20-11:06:29.823380 30f520000 Delete type=3 #276
+2023/07/29-17:53:00.855457 30f197000 Recovering log #330
+2023/07/29-17:53:00.856119 30f197000 Delete type=0 #330
+2023/07/29-17:53:00.856171 30f197000 Delete type=3 #328
diff --git a/packs/markers/LOG.old b/packs/markers/LOG.old
@@ -1,3 +1,8 @@
-2023/07/17-21:03:55.785087 312f3c000 Recovering log #274
-2023/07/17-21:03:55.785497 312f3c000 Delete type=3 #272
-2023/07/17-21:03:55.785545 312f3c000 Delete type=0 #274
+2023/07/29-17:41:11.869490 30f197000 Recovering log #327
+2023/07/29-17:41:11.870167 30f197000 Delete type=0 #327
+2023/07/29-17:41:11.870226 30f197000 Delete type=3 #326
+2023/07/29-17:52:57.266910 30aaab000 Level-0 table #331: started
+2023/07/29-17:52:57.266932 30aaab000 Level-0 table #331: 0 bytes OK
+2023/07/29-17:52:57.268000 30aaab000 Delete type=0 #329
+2023/07/29-17:52:57.268135 30aaab000 Manual compaction at level-0 from '!actors!5Q0EHfaj9oRsZI60' @ 72057594037927935 : 1 .. '!actors!y0TbX4GPi4HOajtz' @ 0 : 0; will stop at (end)
+2023/07/29-17:52:57.268807 30aaab000 Manual compaction at level-1 from '!actors!5Q0EHfaj9oRsZI60' @ 72057594037927935 : 1 .. '!actors!y0TbX4GPi4HOajtz' @ 0 : 0; will stop at (end)
diff --git a/packs/markers/MANIFEST-000278 → packs/markers/MANIFEST-000332 b/packs/markers/MANIFEST-000278 → packs/markers/MANIFEST-000332
diff --git a/packs/roll-macros/000279.log → packs/roll-macros/000333.log b/packs/roll-macros/000279.log → packs/roll-macros/000333.log
diff --git a/packs/roll-macros/CURRENT b/packs/roll-macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000278
+MANIFEST-000332
diff --git a/packs/roll-macros/LOG b/packs/roll-macros/LOG
@@ -1,3 +1,3 @@
-2023/07/20-11:06:29.822430 310d1d000 Recovering log #277
-2023/07/20-11:06:29.822824 310d1d000 Delete type=0 #277
-2023/07/20-11:06:29.822855 310d1d000 Delete type=3 #276
+2023/07/29-17:53:00.855443 30f996000 Recovering log #330
+2023/07/29-17:53:00.856170 30f996000 Delete type=0 #330
+2023/07/29-17:53:00.856232 30f996000 Delete type=3 #328
diff --git a/packs/roll-macros/LOG.old b/packs/roll-macros/LOG.old
@@ -1,3 +1,8 @@
-2023/07/17-21:03:55.785081 31373b000 Recovering log #274
-2023/07/17-21:03:55.785460 31373b000 Delete type=3 #272
-2023/07/17-21:03:55.785505 31373b000 Delete type=0 #274
+2023/07/29-17:41:11.869485 310195000 Recovering log #327
+2023/07/29-17:41:11.870202 310195000 Delete type=0 #327
+2023/07/29-17:41:11.870257 310195000 Delete type=3 #326
+2023/07/29-17:52:57.265513 30aaab000 Level-0 table #331: started
+2023/07/29-17:52:57.265534 30aaab000 Level-0 table #331: 0 bytes OK
+2023/07/29-17:52:57.265737 30aaab000 Delete type=0 #329
+2023/07/29-17:52:57.266259 30aaab000 Manual compaction at level-0 from '!macros!2EXYyOk3BhpGWdsz' @ 72057594037927935 : 1 .. '!macros!zauvL2uFWfNk1eoa' @ 0 : 0; will stop at (end)
+2023/07/29-17:52:57.268104 30aaab000 Manual compaction at level-1 from '!macros!2EXYyOk3BhpGWdsz' @ 72057594037927935 : 1 .. '!macros!zauvL2uFWfNk1eoa' @ 0 : 0; will stop at (end)
diff --git a/packs/roll-macros/MANIFEST-000278 → packs/roll-macros/MANIFEST-000332 b/packs/roll-macros/MANIFEST-000278 → packs/roll-macros/MANIFEST-000332
diff --git a/packs/scenes/000282.log → packs/scenes/000336.log b/packs/scenes/000282.log → packs/scenes/000336.log
diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT
@@ -1 +1 @@
-MANIFEST-000281
+MANIFEST-000335
diff --git a/packs/scenes/LOG b/packs/scenes/LOG
@@ -1,3 +1,3 @@
-2023/07/20-11:06:29.826381 30fd1f000 Recovering log #280
-2023/07/20-11:06:29.826886 30fd1f000 Delete type=3 #279
-2023/07/20-11:06:29.826931 30fd1f000 Delete type=0 #280
+2023/07/29-17:53:00.858551 30f996000 Recovering log #333
+2023/07/29-17:53:00.859247 30f996000 Delete type=3 #331
+2023/07/29-17:53:00.859360 30f996000 Delete type=0 #333
diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old
@@ -1,3 +1,8 @@
-2023/07/17-21:03:55.788480 313f3a000 Recovering log #277
-2023/07/17-21:03:55.789324 313f3a000 Delete type=3 #275
-2023/07/17-21:03:55.789401 313f3a000 Delete type=0 #277
+2023/07/29-17:41:11.874509 310195000 Recovering log #330
+2023/07/29-17:41:11.875133 310195000 Delete type=0 #330
+2023/07/29-17:41:11.875191 310195000 Delete type=3 #329
+2023/07/29-17:52:57.268821 30aaab000 Level-0 table #334: started
+2023/07/29-17:52:57.268839 30aaab000 Level-0 table #334: 0 bytes OK
+2023/07/29-17:52:57.269076 30aaab000 Delete type=0 #332
+2023/07/29-17:52:57.270148 30aaab000 Manual compaction at level-0 from '!scenes!cyegwAT3gg2ReiDd' @ 72057594037927935 : 1 .. '!scenes.tiles!zGOpPJI2pfmCRiwr.oJ1bePM16XIyXFV2' @ 0 : 0; will stop at (end)
+2023/07/29-17:52:57.270563 30aaab000 Manual compaction at level-1 from '!scenes!cyegwAT3gg2ReiDd' @ 72057594037927935 : 1 .. '!scenes.tiles!zGOpPJI2pfmCRiwr.oJ1bePM16XIyXFV2' @ 0 : 0; will stop at (end)
diff --git a/packs/scenes/MANIFEST-000281 → packs/scenes/MANIFEST-000335 b/packs/scenes/MANIFEST-000281 → packs/scenes/MANIFEST-000335
diff --git a/packs/secret-settings/000282.log → packs/secret-settings/000336.log b/packs/secret-settings/000282.log → packs/secret-settings/000336.log
diff --git a/packs/secret-settings/CURRENT b/packs/secret-settings/CURRENT
@@ -1 +1 @@
-MANIFEST-000281
+MANIFEST-000335
diff --git a/packs/secret-settings/LOG b/packs/secret-settings/LOG
@@ -1,3 +1,3 @@
-2023/07/20-11:06:29.830763 30fd1f000 Recovering log #280
-2023/07/20-11:06:29.831114 30fd1f000 Delete type=3 #279
-2023/07/20-11:06:29.831176 30fd1f000 Delete type=0 #280
+2023/07/29-17:53:00.862574 30f996000 Recovering log #333
+2023/07/29-17:53:00.863165 30f996000 Delete type=3 #331
+2023/07/29-17:53:00.863268 30f996000 Delete type=0 #333
diff --git a/packs/secret-settings/LOG.old b/packs/secret-settings/LOG.old
@@ -1,3 +1,8 @@
-2023/07/17-21:03:55.791853 31373b000 Recovering log #277
-2023/07/17-21:03:55.792208 31373b000 Delete type=3 #275
-2023/07/17-21:03:55.792247 31373b000 Delete type=0 #277
+2023/07/29-17:41:11.882029 30f996000 Recovering log #330
+2023/07/29-17:41:11.882601 30f996000 Delete type=0 #330
+2023/07/29-17:41:11.882659 30f996000 Delete type=3 #329
+2023/07/29-17:52:57.269875 30aaab000 Level-0 table #334: started
+2023/07/29-17:52:57.269896 30aaab000 Level-0 table #334: 0 bytes OK
+2023/07/29-17:52:57.270099 30aaab000 Delete type=0 #332
+2023/07/29-17:52:57.270551 30aaab000 Manual compaction at level-0 from '!folders!8ErwbQwBInWCNZrK' @ 72057594037927935 : 1 .. '!macros!zKoXNFTgRvzhyQ80' @ 0 : 0; will stop at (end)
+2023/07/29-17:52:57.270649 30aaab000 Manual compaction at level-1 from '!folders!8ErwbQwBInWCNZrK' @ 72057594037927935 : 1 .. '!macros!zKoXNFTgRvzhyQ80' @ 0 : 0; will stop at (end)
diff --git a/packs/secret-settings/MANIFEST-000281 → packs/secret-settings/MANIFEST-000335 b/packs/secret-settings/MANIFEST-000281 → packs/secret-settings/MANIFEST-000335
diff --git a/packs/utility-macros/000282.log → packs/utility-macros/000336.log b/packs/utility-macros/000282.log → packs/utility-macros/000336.log
diff --git a/packs/utility-macros/CURRENT b/packs/utility-macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000281
+MANIFEST-000335
diff --git a/packs/utility-macros/LOG b/packs/utility-macros/LOG
@@ -1,3 +1,3 @@
-2023/07/20-11:06:29.829033 310d1d000 Recovering log #280
-2023/07/20-11:06:29.829447 310d1d000 Delete type=3 #279
-2023/07/20-11:06:29.829508 310d1d000 Delete type=0 #280
+2023/07/29-17:53:00.859643 310195000 Recovering log #333
+2023/07/29-17:53:00.860250 310195000 Delete type=3 #331
+2023/07/29-17:53:00.860345 310195000 Delete type=0 #333
diff --git a/packs/utility-macros/LOG.old b/packs/utility-macros/LOG.old
@@ -1,3 +1,8 @@
-2023/07/17-21:03:55.790448 312f3c000 Recovering log #277
-2023/07/17-21:03:55.790759 312f3c000 Delete type=3 #275
-2023/07/17-21:03:55.790796 312f3c000 Delete type=0 #277
+2023/07/29-17:41:11.877940 30f197000 Recovering log #330
+2023/07/29-17:41:11.878642 30f197000 Delete type=0 #330
+2023/07/29-17:41:11.878690 30f197000 Delete type=3 #329
+2023/07/29-17:52:57.269130 30aaab000 Level-0 table #334: started
+2023/07/29-17:52:57.269145 30aaab000 Level-0 table #334: 0 bytes OK
+2023/07/29-17:52:57.269810 30aaab000 Delete type=0 #332
+2023/07/29-17:52:57.270160 30aaab000 Manual compaction at level-0 from '!folders!4UbhADT9HJqnF5SH' @ 72057594037927935 : 1 .. '!macros!zsIv77BoamIDFfk2' @ 0 : 0; will stop at (end)
+2023/07/29-17:52:57.270574 30aaab000 Manual compaction at level-1 from '!folders!4UbhADT9HJqnF5SH' @ 72057594037927935 : 1 .. '!macros!zsIv77BoamIDFfk2' @ 0 : 0; will stop at (end)
diff --git a/packs/utility-macros/MANIFEST-000281 → packs/utility-macros/MANIFEST-000335 b/packs/utility-macros/MANIFEST-000281 → packs/utility-macros/MANIFEST-000335
diff --git a/system.json b/system.json
@@ -2,14 +2,14 @@
   "id": "cyphersystem",
   "title": "Cypher System",
   "description": "A flexible implementation of the Cypher System for Foundry VTT.",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "compatibility": {
     "minimum": "11",
     "verified": "11.305"
   },
   "url": "https://github.com/mrkwnzl/cyphersystem-foundryvtt",
   "manifest": "https://raw.githubusercontent.com/mrkwnzl/cyphersystem-foundryvtt/main/system.json",
-  "download": "https://github.com/mrkwnzl/cyphersystem-foundryvtt/releases/download/v2.8.3/release.zip",
+  "download": "https://github.com/mrkwnzl/cyphersystem-foundryvtt/releases/download/v2.8.4/release.zip",
   "authors": [
     {
       "name": "Marko Wenzel",