Merge pull request #1622 from StarWarsFoundryVTT/swa_ranks_1572

Swa ranks 1572
StarWarsFoundryVTT · Jul 15, 2024 · 8988631 · 8988631
2 parents d4dcf83 + 65a5d4e
commit 8988631
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@
   * Fixed talent descriptions not showing up on specializations after being dragged-and-dropped ([#1573](https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1573))
   * Fixed destiny pool roll not populating in tracker ([#1592](https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1592))
   * Specializations no longer take forever to open ([#1593](https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1593))
+  * SWA import now properly imports ranked talents ([#1572](https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1572))
+  * SWA import no longer improperly matches the wrong talents in rare occasions
 
 `1.901`
 * Features:

diff --git a/modules/importer/swa-importer.js b/modules/importer/swa-importer.js
@@ -486,18 +486,21 @@ export default class SWAImporter extends FormApplication {
                         name: talent.name,
                         type: "talent",
                         flags: {},
-                        data: {
+                        system: {
                           attributes: {},
                           description: talent.description,
                           activation: {
                             value: "Passive",
                           },
+                          ranks: {
+                            ranked: false,
+                          },
                         },
                       };
 
                       adversary.items.push(adversaryTalent);
                     } else {
-                      const swaTalentKey = Object.keys(CONFIG.temporary.swa.talents).find((t) => talent.includes(t));
+                      const swaTalentKey = Object.keys(CONFIG.temporary.swa.talents).find((t) => talent.substr(0, talent.lastIndexOf(' ')) === t);
 
                       if (swaTalentKey) {
                         const swaTalent = CONFIG.temporary.swa.talents[swaTalentKey];
@@ -512,7 +515,7 @@ export default class SWAImporter extends FormApplication {
                           name: swaTalent.name,
                           type: "talent",
                           flags: {},
-                          data: {
+                          system: {
                             attributes: {},
                             description: swaTalent.description,
                             ranks: {