Merging in for 1.1.7 release (#78)

* Refactor and update to weapon rolling system (#69)

* adding nationalization strings and changes to support new weapon chat message

* Changed sheet scripts to treat characterweapons and starshipweapons the same as regular items and call on actor.js rollGenericItem.

Changed Actor.js to correctly use characterweapon  items with roll.js performWeaponRoll().

Heavily overhauled roll.js. Created new helper functions to simplify repeated code, including generating strings from challenge dice, which is now down in multiple places. performWeaponRoll() now generates a nice weapon block for chat using the genericItemTemplate, and also generates the damage roll to append to it. I think it looks quite slick.

The genericItemTemplate() now takes an itemId string and appends it to an html element as an attribute named data-item-id to enable functions from the Maestro module.

i18n strings had to be changed for this new weapon roll display, this was done in a previous commmit.

Damage for weapon rolls is computed directly at roll time from the weapon's base damage stat and the owner's security stat rather than scraping the number off the character sheet HTML.

All rolls are now asynchronous, to match the upcoming changes in FoundryVTT. This will prevent depreciation warnings in the console, and breaking change headaches when the new version of FVTT comes out.

All files have been fixed to pass eslint.

This commit addresses outstanding bug/issues #36, #67, and #68

Co-authored-by: Mike Schoen <mkscho63@gmail.com>

* V10 update (#77)

* Dealing with all deprecation warnings, and abstracting the default image.

* More v10 corrections.

* Changed 'name' to 'id' in the system json

* Removed unnecessary leading slash from defaultImage

* Replace sidebar LCARS deco with hard gradient (#63)

* Replace sidebar LCARS deco with hard gradient

* Use overlayed gradients to fix background

* Fixing issue with build and tracker swapped to hiding at the bottom

* Fixing more v10 compatibility issues

* pt_BR Translation for this module (#76)

* Patch fr.json (#73)

* Update fr.json

Hello, it's just for a French translation or spelling

* Update fr.json

* v1.1.7

* fixing a couple minor issues before releasing 1.1.7

Co-authored-by: Ada <hiddenkrypt@gmail.com>
Co-authored-by: IHaveThatPower <mcc@mcc3d.com>
Co-authored-by: Sophia Pearson <codergal89@gmail.com>
Co-authored-by: André S Nascimento <45982225+andre-s-nascimento@users.noreply.github.com>
Co-authored-by: LaPatte <bearsurfeur@gmail.com>

README.md

@@ -62,7 +62,12 @@ You <b> MUST </b> own the <a href="https://www.modiphius.net/collections/star-tr
 - Delapouite for <a href="https://game-icons.net/1x1/delapouite/weight-lifting-up.html" target="_blank">Fitness</a> and <a href="https://game-icons.net/1x1/delapouite/chat-bubble.html" target="_blank">Chat Bubble</a> Icons. It can be found at <a href="https://game-icons.net/" target="_blank">https://game-icons.net/</a>. Personal website: <a href="https://delapouite.com/" target="_blank">https://delapouite.com/</a>
 - Skoll for <a href="https://game-icons.net/1x1/skoll/fist.html" target="_blank">Control</a> and <a href="https://game-icons.net/1x1/skoll/achievement.html" target="_blank">Daring</a> Icon. Can be found at <a href="https://game-icons.net/" target="_blank">https://game-icons.net/</a>.
 - <a href="https://github.com/angrytramp" target="_blank">angrytramp</a> for developing a shared Momentum pool.
-- Thanks to the people who have provided me with translations to the system. Luette for the German translation, LeRatierBretonnien for the French translation, and Alejabar for the Spanish translation.
+
+- Thanks to IHaveThatPower for getting a lot of the heavy lifting done on the v10 upgrade compatibility problems. After their changes, I had relatively few additional fixes to make so it was definitely a ton of help.
+
+- Thanks to both codergal89 and stillday for their submitions on fixing the sidebar in v10. In the end both helped me resolve the issues that had been plaguing development since v9.
+
+- Thanks to the people who have provided me with translations to the system. Luette for the German translation, LeRatierBretonnien and TheBearLaPatte for the French translation, Alejabar for the Spanish translation, and andre-s-nascimento for the Portugese translation.
 
 - A special thanks should also be given to my playtesters and friends that helped me with finding bugs in alpha as well as listening to me gripe through problems I ran into. I was always able to find feedback when I needed it and opinions on how I could improve functionality: Thorgibrewer (Karl), Kribby-D (Chris), Erk/Embabin (Erik), and Jediisaiah13 (Isaiah).
 

gulpfile.js

@@ -319,7 +319,7 @@ function updateManifest(cb) {
 
     /* Update URLs */
 
-    const result = `${rawURL}/v${manifest.file.version}/package/${manifest.file.name}-v${manifest.file.version}.zip`;
+    const result = `${rawURL}/v${manifest.file.version}/package/${manifest.file.id}-v${manifest.file.version}.zip`;
 
     manifest.file.url = repoURL;
     manifest.file.manifest = `${rawURL}/master/${manifestRoot}/${manifest.name}`;

package.json

@@ -26,5 +26,5 @@
 		"prettier": "^2.2.1",
 		"yargs": "^16.2.0"
 	},
-	"version": "1.1.6"
+	"version": "1.1.7"
 }

src/lang/de.json

@@ -149,14 +149,16 @@
   "sta.roll.success": "Erfolg",
   "sta.roll.successPlural": "Erfolge",
   "sta.roll.task.name": "Aufgabe",
+  "sta.roll.challenge.name": "Herausforderung",
   "sta.roll.complicationrange": "Komplikationsspanne ist ",
   "sta.roll.complication": "Das ist eine Komplikation!",
   "sta.roll.complicationPlural": "Das sind |#| Komplikationen!",
   "sta.roll.effect": "Das ist ein Effekt!",
   "sta.roll.effectPlural": "Das sind |#| Effekte!",
   "sta.roll.rerollresults": "Neurollen?",
 
-  "sta.roll.weapon.damage": "<b>|#|</b> Schaden",
+  "sta.roll.weapon.damage": "<b>1</b> Schaden Würfel",
+  "sta.roll.weapon.damagePlural": "<b>|#|</b> Schaden Würfel",
   "sta.roll.armor.protect": "<b>|#|</b> Widerstand",
   "sta.roll.item.quantity": "|#|x Ausrüstungen",
 

src/lang/en.json

@@ -158,14 +158,16 @@
   "sta.roll.success": "Success",
   "sta.roll.successPlural": "Successes",
   "sta.roll.task.name": "Task",
+  "sta.roll.challenge.name": "Challenge",
   "sta.roll.complicationrange": "Complication range is ",
   "sta.roll.complication": "There was a complication!",
   "sta.roll.complicationPlural": "There were |#| complications!",
-  "sta.roll.effect": "There was an effect!",
+  "sta.roll.effect": "There was one effect!",
   "sta.roll.effectPlural": "There were |#| effects!",
   "sta.roll.rerollresults": "Reroll results?",
 
-  "sta.roll.weapon.damage": "<b>|#|</b> Damage",
+  "sta.roll.weapon.damage": "<b>1</b> Damage die",
+  "sta.roll.weapon.damagePlural": "<b>|#|</b> Damage dice",
   "sta.roll.armor.protect": "<b>|#|</b> Resistance",
   "sta.roll.item.quantity": "|#|x Items",
 

src/lang/es.json

@@ -158,14 +158,16 @@
   "sta.roll.success": "Éxito",
   "sta.roll.successPlural": "Éxitos",
   "sta.roll.task.name": "Tarea",
+  "sta.roll.challenge.name": "Desafío",
   "sta.roll.complicationrange": "El Margen de Complicación es ",
   "sta.roll.complication": "¡Sufres una Complicación!",
   "sta.roll.complicationPlural": "¡Sufres |#| Complicaciones!",
   "sta.roll.effect": "¡Consigues un Efecto!",
   "sta.roll.effectPlural": "¡Consigues |#| Efectos!",
   "sta.roll.rerollresults": "¿Repetir la tirada?",
 
-  "sta.roll.weapon.damage": "<b>|#|</b> Daño",
+  "sta.roll.weapon.damage": "<b>|#|</b> Daño dado",
+  "sta.roll.weapon.damagePlural": "<b>|#|</b> Daño dadoes",
   "sta.roll.armor.protect": "<b>|#|</b> Resistencia",
   "sta.roll.item.quantity": "|#|x Objetos",
 

src/lang/fr.json

@@ -5,12 +5,12 @@
     "sta.counting.four": "4",
     "sta.counting.five": "5",
 
-    "sta.actor.character.reputation": "Suivi de Reputation",
+    "sta.actor.character.reputation": "Suivi de Réputation",
     "sta.actor.character.name": "Nom",
     "sta.actor.character.rank": "Grade",
     "sta.actor.character.stress": "Suivi du Stress",
     "sta.actor.character.environment": "Environnement",
-    "sta.actor.character.upbringing": "Upbringing",
+    "sta.actor.character.upbringing": "Éducation",
     "sta.actor.character.species": "Espèce",
     "sta.actor.character.assignment": "Affectation",
     "sta.actor.character.traits": "Traits",
@@ -24,7 +24,7 @@
     "sta.actor.character.attribute.daring": "Audace",
     "sta.actor.character.attribute.fitness": "Forme",
     "sta.actor.character.attribute.insight": "Intuition",
-    "sta.actor.character.attribute.presence": "Presence",
+    "sta.actor.character.attribute.presence": "Présence",
     "sta.actor.character.attribute.reason": "Raison",
     "sta.actor.character.discipline.title": "Disciplines",
     "sta.actor.character.discipline.name": "Nom de Discipline",
@@ -44,13 +44,13 @@
     "sta.actor.injury.title": "Blessures",
     "sta.actor.belonging.title": "Equipements",
     "sta.actor.belonging.weapon.title": "Armes",
-    "sta.actor.belonging.weapon.dmg": "Dg",
-    "sta.actor.belonging.weapon.damage": "Dégat",
+    "sta.actor.belonging.weapon.dmg": "Dmg",
+    "sta.actor.belonging.weapon.damage": "Dégats",
     "sta.actor.belonging.weapon.range": "Portée",
     "sta.actor.belonging.weapon.melee": "Corps à Corps",
     "sta.actor.belonging.weapon.ranged": "Distance",
     "sta.actor.belonging.weapon.close": "Proche",
-    "sta.actor.belonging.weapon.medium": "Medium",
+    "sta.actor.belonging.weapon.medium": "Moyen",
     "sta.actor.belonging.weapon.long": "Long",
     "sta.actor.belonging.weapon.area": "Zone",
     "sta.actor.belonging.weapon.intense": "Intense",
@@ -63,31 +63,31 @@
     "sta.actor.belonging.weapon.grenade": "Grenade",
     "sta.actor.belonging.weapon.inaccurate": "Imprécis",
     "sta.actor.belonging.weapon.nonlethal": "Non Létale",
-    "sta.actor.belonging.weapon.spread": "Diffusion",
-    "sta.actor.belonging.weapon.dampening": "Dampening",
-    "sta.actor.belonging.weapon.calibration": "Calibration",
-    "sta.actor.belonging.weapon.devastating": "Dévastatrice",
-    "sta.actor.belonging.weapon.highyield": "High-Yield",
+    "sta.actor.belonging.weapon.spread": "Dispersion",
+    "sta.actor.belonging.weapon.dampening": "Sapeur",
+    "sta.actor.belonging.weapon.calibration": "Calibrage",
+    "sta.actor.belonging.weapon.devastating": "Destructif",
+    "sta.actor.belonging.weapon.highyield": "Haut rendement",
     "sta.actor.belonging.weapon.hiddenx": "Caché",
     "sta.actor.belonging.weapon.piercingx": "Perforante",
-    "sta.actor.belonging.weapon.viciousx": "Vicieuse",
+    "sta.actor.belonging.weapon.viciousx": "Dévastateur",
     "sta.actor.belonging.weapon.versatilex": "Versatile",
     "sta.actor.belonging.weapon.persistentx": "Persistant",
     "sta.actor.belonging.weapon.hands": "Mains",
     "sta.actor.belonging.weapon.qualities": "Qualités",
-    "sta.actor.belonging.armor.title": "Armorue",
-    "sta.actor.belonging.armor.protect": "Resiste",
-    "sta.actor.belonging.armor.protection": "Resistance",
+    "sta.actor.belonging.armor.title": "Armure",
+    "sta.actor.belonging.armor.protect": "Rés",
+    "sta.actor.belonging.armor.protection": "Résistance",
     "sta.actor.belonging.other.title": "Autres objets",
-    "sta.actor.belonging.other.qty": "Qty",
+    "sta.actor.belonging.other.qty": "Qté",
     "sta.actor.belonging.other.quantity": "Quantité",
 
     "sta.actor.starship.name": "Nom",
     "sta.actor.starship.designation": "Désignation",
-    "sta.actor.starship.servicedate": "Date de mise en Service",
-    "sta.actor.starship.spaceframe": "Space Frame",
+    "sta.actor.starship.servicedate": "Mise en Service",
+    "sta.actor.starship.spaceframe": "Structure spatiale",
     "sta.actor.starship.missionprofile": "Profil de Mission",
-    "sta.actor.starship.refit": "Refit",
+    "sta.actor.starship.refit": "Refontes",
     "sta.actor.starship.traits": "Traits",
     "sta.actor.starship.system.title": "Systèmes",
     "sta.actor.starship.system.name": "Nom du Système",
@@ -98,7 +98,7 @@
     "sta.actor.starship.system.structure": "Structure",
     "sta.actor.starship.system.weapons": "Armes",
     "sta.actor.starship.system.breaches": "Coque",
-    "sta.actor.starship.department.title": "Departements",
+    "sta.actor.starship.department.title": "Départements",
     "sta.actor.starship.department.name": "Nom de Département",
     "sta.actor.starship.department.command": "Commande",
     "sta.actor.starship.department.conn": "Pilotage",
@@ -109,12 +109,12 @@
     "sta.actor.starship.power": "Puissance",
     "sta.actor.starship.shields": "Boucliers",
     "sta.actor.starship.launchbay": "Baie de lancement",
-    "sta.actor.starship.crew": "Equipage",
-    "sta.actor.starship.scale": "Echelle",
+    "sta.actor.starship.crew": "Équipage",
+    "sta.actor.starship.scale": "Échelle",
     "sta.actor.starship.resistance": "Résistance",
     "sta.actor.starship.values": "Directives de Mission",
-    "sta.actor.starship.damage": "Rapport de Dégâts",
-    "sta.actor.starship.equipment": "Equipement",
+    "sta.actor.starship.damage": "Rapports de Dégâts",
+    "sta.actor.starship.equipment": "Équipements",
     "sta.actor.starship.belonging.other.title": "Autre Cargaison",
 
     "sta.actor.smallcraft.parent": "Vaisseau mère",
@@ -124,7 +124,7 @@
     "sta.actor.extendedtask.work": "Effort",
     "sta.actor.extendedtask.difficulty": "Difficulté",
     "sta.actor.extendedtask.resistance": "Résistance",
-    "sta.actor.extendedtask.breakthroughs": "Apleur",
+    "sta.actor.extendedtask.breakthroughs": "Ampleur",
     "sta.actor.extendedtask.completed": "Tâche Etendue Finie!",
 
     "sta.item.genericitem.name": "Nom",
@@ -138,36 +138,38 @@
     "sta.item.talent.type.discipline": "Discipline",
     "sta.item.talent.requires": "Nécessite",
     "sta.item.talent.houselegacy": "Maison",
-    "sta.item.talent.houserequired": "House Legacy of",
+    "sta.item.talent.houserequired": "Maison de",
 
-    "sta.item.house.legacy.title": "House Legacy",
+    "sta.item.house.legacy.title": "Héritage de la maison",
     "sta.item.house.legacy.leaders": "Leaders",
     "sta.item.house.legacy.warriors": "Soldats",
-    "sta.item.house.legacy.spacefarers": "VOyageurs",
+    "sta.item.house.legacy.spacefarers": "Voyageurs",
     "sta.item.house.legacy.engineers": "Ingénieurs",
     "sta.item.house.legacy.scientists": "Scientifiques",
     "sta.item.house.legacy.physicians": "Physiciens",
 
     "sta.apps.dicepoolwindow": "Réserve de Dés",
     "sta.apps.focus": "Utiliser l'Impulsion?",
     "sta.apps.determination": "Utiliser la Détermination?",
-    "sta.apps.complicationrange": "Echelle de Complication (1 par défaut)?",
+    "sta.apps.complicationrange": "Échelle de Complication (1 par défaut)?",
     "sta.apps.pool": "Nombre de Dés dans la réserve",
     "sta.apps.rolldice": "Lancer les Dés",
 
     "sta.roll.success": "Succès",
     "sta.roll.successPlural": "Succès",
     "sta.roll.task.name": "Tâches",
+    "sta.roll.challenge.name": "Défi",
     "sta.roll.complicationrange": "La Marge de Complication est ",
     "sta.roll.complication": "Il y a un Complication!",
     "sta.roll.complicationPlural": "Il y a eu |#| Complications!",
     "sta.roll.effect": "I y a eu des Effets!",
     "sta.roll.effectPlural": "Il y a eu |#| Effets!",
     "sta.roll.rerollresults": "Relancer les résultats?",
 
-    "sta.roll.weapon.damage": "<b>|#|</b> Dégâts",
+    "sta.roll.weapon.damage": "<b>|#|</b> Dégâts dé",
+    "sta.roll.weapon.damagePlural": "<b>|#|</b> Dégâts dés",
     "sta.roll.armor.protect": "<b>|#|</b> Résistance",
-    "sta.roll.item.quantity": "|#|x Items",
+    "sta.roll.item.quantity": "|#|x Objets",
 
 
     "sta.tracker.threat": "Menace",
@@ -179,4 +181,4 @@
     "sta.notifications.threatInvalidPermissions": "Vous n'êtes pas autorisé à changer Menace!",
     "sta.notifications.threatNegative": "Vous ne pouvez pas définir Menace sur une valeur inférieure à 0!",
     "sta.notifications.threatTooGreat": "Il y a trop de Menace!"
-}
+}