Merge branch 'main' into dependabot/npm_and_yarn/braces-3.0.3

Author: Rughalt

.all-contributorsrc

@@ -215,6 +215,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "arcos",
+      "name": "Andrea Costantini",
+      "avatar_url": "https://avatars.githubusercontent.com/u/143747?v=4",
+      "profile": "https://github.com/arcos",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc

@@ -98,4 +98,4 @@
 		"fromUuidSync": "readonly",
 		"PoolTerm": "readonly"
 	}
-}
+}

.github/workflows/release.yml

@@ -51,6 +51,11 @@ jobs:
           manifest: https://github.com/${{github.repository}}/releases/latest/download/system.json
           download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip
 
+      # Replace "ose-dev" with "ose" in all files inside the dist folder
+      - name: Replace 'ose-dev' with 'ose' in dist folder
+        run: |
+          find dist/ -type f -exec sed -i 's/ose-dev/ose/g' {} +
+
       # Create a zip file with all files required by the module to add to the release
       - name: Create zip file
         # Remember to update the below line when there's a change in repository files/directories

.gitignore

@@ -1,5 +1,7 @@
 node_modules
 foundryconfig.json
+foundryconfig_*.json
+ose-dev.lock
 dist
 .DS_Store
 .env

README.md

@@ -11,7 +11,7 @@
 </p>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-24-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Forge Installs](https://img.shields.io/badge/dynamic/json?label=Forge%20Installs&query=package.installs&suffix=%25&url=https%3A%2F%2Fforge-vtt.com%2Fapi%2Fbazaar%2Fpackage%2Fose&colorB=4aa94a)](https://forge-vtt.com/bazaar#package=ose)
 [![Foundry Hub Endorsements](https://img.shields.io/endpoint?logoColor=white&url=https%3A%2F%2Fwww.foundryvtt-hub.com%2Fwp-json%2Fhubapi%2Fv1%2Fpackage%2Fose%2Fshield%2Fendorsements)](https://www.foundryvtt-hub.com/package/ose/)
@@ -134,6 +134,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Henrik-Bonsmann"><img src="https://avatars.githubusercontent.com/u/112704394?v=4?s=100" width="100px;" alt="Henrik Bonsmann"/><br /><sub><b>Henrik Bonsmann</b></sub></a><br /><a href="https://github.com/vttred/ose/pulls?q=is%3Apr+reviewed-by%3AHenrik-Bonsmann" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/vttred/ose/commits?author=Henrik-Bonsmann" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/apewall"><img src="https://avatars.githubusercontent.com/u/1915182?v=4?s=100" width="100px;" alt="Apewall"/><br /><sub><b>Apewall</b></sub></a><br /><a href="https://github.com/vttred/ose/commits?author=apewall" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/arcos"><img src="https://avatars.githubusercontent.com/u/143747?v=4?s=100" width="100px;" alt="Andrea Costantini"/><br /><sub><b>Andrea Costantini</b></sub></a><br /><a href="https://github.com/vttred/ose/commits?author=arcos" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

src/lang/en.json

@@ -8,6 +8,7 @@
   "OSE.Reset": "Reset",
   "OSE.Cancel": "Cancel",
   "OSE.Roll": "Roll",
+  "OSE.Reroll": "Reroll",
   "OSE.Success": "Success",
   "OSE.Failure": "Failure",
 
@@ -304,13 +305,16 @@
   "OSE.colors.orange": "Orange",
   "OSE.colors.white": "White",
 
+  "OSE.colors.black": "Black",
   "OSE.reaction.check": "Reaction Check",
   "OSE.reaction.Hostile": "{name} is Hostile",
   "OSE.reaction.Unfriendly": "{name} is Unfriendly",
   "OSE.reaction.Neutral": "{name} is Neutral",
   "OSE.reaction.Indifferent": "{name} is Indifferent",
   "OSE.reaction.Friendly": "{name} is Friendly",
 
+  "OSE.combat.SetCombatantAsActive": "Set Active",
+  "OSE.combat.SetCombatantGroups": "Set Combatant Groups",
   "OSE.CombatFlag.SpellDeclared": "Spell Declared",
   "OSE.CombatFlag.RetreatFromMeleeDeclared": "Retreat From Melee Declared",
 

src/lang/es.json

@@ -8,6 +8,7 @@
   "OSE.Reset": "Reinciar",
   "OSE.Cancel": "Cancelar",
   "OSE.Roll": "Tirar",
+  "OSE.Reroll": "Repetir tirada",
   "OSE.Success": "Éxito",
   "OSE.Failure": "Fallo",
   "OSE.dialog.tweaks": "Ajustes",
@@ -279,12 +280,15 @@
   "OSE.colors.blue": "Azul",
   "OSE.colors.orange": "Naranja",
   "OSE.colors.white": "Blanco",
+  "OSE.colors.black": "Negro",
   "OSE.reaction.check": "Chequeo de reacción",
   "OSE.reaction.Hostile": "{name} es hostil",
   "OSE.reaction.Unfriendly": "{name} es poco amistoso",
   "OSE.reaction.Neutral": "{name} es neutral",
   "OSE.reaction.Indifferent": "{name} es indiferente",
   "OSE.reaction.Friendly": "{name} es amistoso",
+  "OSE.combat.SetCombatantAsActive": "Activar",
+  "OSE.combat.SetCombatantGroups": "Establecer grupos de combatientes",
   "OSE.CombatFlag.SpellDeclared": "Hechizo declarado",
   "OSE.CombatFlag.RetreatFromMeleeDeclared": "Retirada declarada",
   "OSE.Tweaks.DontApplyWeaponBonusToDamageRoll": "No aplicar el bonificador del arma a las tiradas de daño",

src/lang/it.json

@@ -13,7 +13,7 @@
   "OSE.dialog.tweaks": "Modifiche",
   "OSE.dialog.partysheet": "Panoramica del Gruppo",
   "OSE.dialog.partysheetplaceholder": "Aggiungi Personaggi al Gruppo trascinandoli e rilasciandoli in questa finestra.",
-  "OSE.dialog.partyselect": "Scegli Pg",
+  "OSE.dialog.partyselect": "Seleziona PG",
   "OSE.dialog.createItem": "Crea Oggetto",
   "OSE.dialog.itemType": "Tipo Oggetto",
   "OSE.dialog.itemName": "Nome Oggetto",

src/module/actor/__tests__/data-model-character.test.ts

@@ -19,16 +19,22 @@ export default ({ describe, it, expect, after, before }: QuenchMethods) => {
   const dataModel = new OseDataModelCharacter();
   const ascendingACSetting = game.settings.get(game.system.id, "ascendingAC");
   const initiativeSetting = game.settings.get(game.system.id, "initiative");
+  const encumbranceSetting = game.settings.get(
+    game.system.id,
+    "encumbranceOption"
+  );
 
   after(() => {
     game.settings.set(game.system.id, "ascendingAC", ascendingACSetting);
     game.settings.set(game.system.id, "initiative", initiativeSetting);
+    game.settings.set(game.system.id, "encumbranceOption", encumbranceSetting);
     cleanUpActorsByKey(key);
   });
 
   // @todo: Can this be tested without creating an actor?
   describe("prepareDerivedData()", () => {
     before(async () => {
+      await game.settings.set(game.system.id, "encumbranceOption", "detailed");
       await createMockActor();
     });
 
@@ -60,9 +66,9 @@ export default ({ describe, it, expect, after, before }: QuenchMethods) => {
       expect(actor?.system.encumbrance.steps).not.undefined;
       expect(actor?.system.encumbrance.value).not.undefined;
       expect(actor?.system.encumbrance.max).not.undefined;
-      expect(actor?.system.encumbrance.atHalfEncumbered).not.undefined;
-      expect(actor?.system.encumbrance.atQuarterEncumbered).not.undefined;
-      expect(actor?.system.encumbrance.atEighthEncumbered).not.undefined;
+      expect(actor?.system.encumbrance.steps).not.undefined;
+      //expect(actor?.system.encumbrance.atQuarterEncumbered).not.undefined;
+      //expect(actor?.system.encumbrance.atEighthEncumbered).not.undefined;
     });
 
     it("has movement", async () => {

src/module/actor/character-sheet.js

@@ -80,6 +80,7 @@ export default class OseActorSheetCharacter extends OseActorSheet {
    */
   async getData() {
     const data = super.getData();
+    
     // Prepare owned items
     this._prepareItems(data);
 
@@ -241,6 +242,7 @@ export default class OseActorSheetCharacter extends OseActorSheet {
           equipped: !item.system.equipped,
         },
       });
+
     });
 
     html.find("a[data-action='generate-scores']").click((ev) => {