diff --git a/module/rfrp-utility.js b/module/rfrp-utility.js index c93b70e..9aced1c 100644 --- a/module/rfrp-utility.js +++ b/module/rfrp-utility.js @@ -18,6 +18,10 @@ export class RFRPUtility { this.skillCategories.sort((a, b) => a.name.localeCompare(b.name)); } + static getGameSystem() { + return this.gameSystem; + } + /* -------------------------------------------- */ static getSkillCategories() { return this.skillCategories diff --git a/module/sheets/apps/rmss_import_skill_categories.js b/module/sheets/apps/rmss_import_skill_categories.js index 88069e9..822aae8 100644 --- a/module/sheets/apps/rmss_import_skill_categories.js +++ b/module/sheets/apps/rmss_import_skill_categories.js @@ -1,3 +1,5 @@ +import { RFRPUtility } from "../../rfrp-utility.js"; + export default class RMSSToolsSCImporter extends FormApplication { constructor(selectOptions, character) { @@ -42,13 +44,13 @@ export default class RMSSToolsSCImporter extends FormApplication { const skillCategoryData = await pack.getIndex(); console.log("Importing New Skills/Skill Categories."); - + let gameSystem = RFRPUtility.getGameSystem(); for (const sc of skillCategoryData) { const newitem = await pack.getDocument(sc._id); - + let newDocuments = []; - if (newitem.type === itemType) { - console.log(newitem); + if (newitem.type === itemType && (newitem.system.game_system === "common" || newitem.system.game_system === gameSystem)) { + //console.log(newitem); newDocuments.push(newitem); } if (newDocuments.length > 0) { diff --git a/packs/skill_categories/000115.log b/packs/skill_categories/000127.log similarity index 100% rename from packs/skill_categories/000115.log rename to packs/skill_categories/000127.log diff --git a/packs/skill_categories/CURRENT b/packs/skill_categories/CURRENT index f97fd0f..70936fe 100644 --- a/packs/skill_categories/CURRENT +++ b/packs/skill_categories/CURRENT @@ -1 +1 @@ -MANIFEST-000113 +MANIFEST-000125 diff --git a/packs/skill_categories/LOG b/packs/skill_categories/LOG index fcec773..f9b33f3 100644 --- a/packs/skill_categories/LOG +++ b/packs/skill_categories/LOG @@ -1,8 +1,8 @@ -2024/08/10-00:13:42.653716 7f9286a006c0 Recovering log #111 -2024/08/10-00:13:42.702147 7f9286a006c0 Delete type=3 #109 -2024/08/10-00:13:42.702252 7f9286a006c0 Delete type=0 #111 -2024/08/10-00:15:09.358300 7f9285a006c0 Level-0 table #116: started -2024/08/10-00:15:09.358337 7f9285a006c0 Level-0 table #116: 0 bytes OK -2024/08/10-00:15:09.364353 7f9285a006c0 Delete type=0 #114 -2024/08/10-00:15:09.392733 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) -2024/08/10-00:15:09.392780 7f9285a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) +2024/08/10-00:20:42.417666 7f9287e006c0 Recovering log #123 +2024/08/10-00:20:42.428409 7f9287e006c0 Delete type=3 #121 +2024/08/10-00:20:42.428461 7f9287e006c0 Delete type=0 #123 +2024/08/10-00:24:00.419073 7f9285a006c0 Level-0 table #128: started +2024/08/10-00:24:00.419133 7f9285a006c0 Level-0 table #128: 0 bytes OK +2024/08/10-00:24:00.425273 7f9285a006c0 Delete type=0 #126 +2024/08/10-00:24:00.455588 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) +2024/08/10-00:24:00.455633 7f9285a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) diff --git a/packs/skill_categories/LOG.old b/packs/skill_categories/LOG.old index 3347102..e0423c4 100644 --- a/packs/skill_categories/LOG.old +++ b/packs/skill_categories/LOG.old @@ -1,8 +1,8 @@ -2024/08/10-00:12:37.568139 7f9287e006c0 Recovering log #107 -2024/08/10-00:12:37.578251 7f9287e006c0 Delete type=3 #105 -2024/08/10-00:12:37.578313 7f9287e006c0 Delete type=0 #107 -2024/08/10-00:13:00.464797 7f9285a006c0 Level-0 table #112: started -2024/08/10-00:13:00.464827 7f9285a006c0 Level-0 table #112: 0 bytes OK -2024/08/10-00:13:00.471404 7f9285a006c0 Delete type=0 #110 -2024/08/10-00:13:00.478060 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) -2024/08/10-00:13:00.478094 7f9285a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) +2024/08/10-00:18:04.248055 7f9286a006c0 Recovering log #119 +2024/08/10-00:18:04.258807 7f9286a006c0 Delete type=3 #117 +2024/08/10-00:18:04.258908 7f9286a006c0 Delete type=0 #119 +2024/08/10-00:18:22.913947 7f9285a006c0 Level-0 table #124: started +2024/08/10-00:18:22.913981 7f9285a006c0 Level-0 table #124: 0 bytes OK +2024/08/10-00:18:22.920952 7f9285a006c0 Delete type=0 #122 +2024/08/10-00:18:22.934571 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) +2024/08/10-00:18:22.934639 7f9285a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end) diff --git a/packs/skill_categories/MANIFEST-000113 b/packs/skill_categories/MANIFEST-000125 similarity index 75% rename from packs/skill_categories/MANIFEST-000113 rename to packs/skill_categories/MANIFEST-000125 index fda7286..aabe363 100644 Binary files a/packs/skill_categories/MANIFEST-000113 and b/packs/skill_categories/MANIFEST-000125 differ diff --git a/packs/skills-merp/000004.log b/packs/skills-merp/000012.log similarity index 100% rename from packs/skills-merp/000004.log rename to packs/skills-merp/000012.log diff --git a/packs/skills-merp/CURRENT b/packs/skills-merp/CURRENT index 1a84852..3051f81 100644 --- a/packs/skills-merp/CURRENT +++ b/packs/skills-merp/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000010 diff --git a/packs/skills-merp/LOG b/packs/skills-merp/LOG index c7747b1..9f3364e 100644 --- a/packs/skills-merp/LOG +++ b/packs/skills-merp/LOG @@ -1,5 +1,8 @@ -2024/08/10-00:13:42.782130 7f9287e006c0 Delete type=3 #1 -2024/08/10-00:15:09.364559 7f9285a006c0 Level-0 table #5: started -2024/08/10-00:15:09.368108 7f9285a006c0 Level-0 table #5: 33871 bytes OK -2024/08/10-00:15:09.374591 7f9285a006c0 Delete type=0 #3 -2024/08/10-00:15:09.392750 7f9285a006c0 Manual compaction at level-0 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) +2024/08/10-00:18:04.261355 7f92874006c0 Recovering log #8 +2024/08/10-00:18:04.271365 7f92874006c0 Delete type=3 #6 +2024/08/10-00:18:04.271415 7f92874006c0 Delete type=0 #8 +2024/08/10-00:18:22.906854 7f9285a006c0 Level-0 table #13: started +2024/08/10-00:18:22.906926 7f9285a006c0 Level-0 table #13: 0 bytes OK +2024/08/10-00:18:22.913782 7f9285a006c0 Delete type=0 #11 +2024/08/10-00:18:22.934544 7f9285a006c0 Manual compaction at level-0 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) +2024/08/10-00:18:22.934626 7f9285a006c0 Manual compaction at level-1 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) diff --git a/packs/skills-merp/LOG.old b/packs/skills-merp/LOG.old new file mode 100644 index 0000000..57ecda3 --- /dev/null +++ b/packs/skills-merp/LOG.old @@ -0,0 +1,8 @@ +2024/08/10-00:16:16.693967 7f92874006c0 Recovering log #4 +2024/08/10-00:16:16.704014 7f92874006c0 Delete type=3 #2 +2024/08/10-00:16:16.704134 7f92874006c0 Delete type=0 #4 +2024/08/10-00:17:37.874387 7f9285a006c0 Level-0 table #9: started +2024/08/10-00:17:37.874475 7f9285a006c0 Level-0 table #9: 0 bytes OK +2024/08/10-00:17:37.881498 7f9285a006c0 Delete type=0 #7 +2024/08/10-00:17:37.894547 7f9285a006c0 Manual compaction at level-0 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) +2024/08/10-00:17:37.894586 7f9285a006c0 Manual compaction at level-1 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) diff --git a/packs/skills-merp/MANIFEST-000002 b/packs/skills-merp/MANIFEST-000002 deleted file mode 100644 index bc3b8d0..0000000 Binary files a/packs/skills-merp/MANIFEST-000002 and /dev/null differ diff --git a/packs/skills-merp/MANIFEST-000010 b/packs/skills-merp/MANIFEST-000010 new file mode 100644 index 0000000..1eef94f Binary files /dev/null and b/packs/skills-merp/MANIFEST-000010 differ diff --git a/packs/skills-rmfrp/000004.log b/packs/skills-rmfrp/000012.log similarity index 100% rename from packs/skills-rmfrp/000004.log rename to packs/skills-rmfrp/000012.log diff --git a/packs/skills-rmfrp/CURRENT b/packs/skills-rmfrp/CURRENT index 1a84852..3051f81 100644 --- a/packs/skills-rmfrp/CURRENT +++ b/packs/skills-rmfrp/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000010 diff --git a/packs/skills-rmfrp/LOG b/packs/skills-rmfrp/LOG index 8e99b96..ed780c1 100644 --- a/packs/skills-rmfrp/LOG +++ b/packs/skills-rmfrp/LOG @@ -1,5 +1,8 @@ -2024/08/10-00:13:42.844297 7f9286a006c0 Delete type=3 #1 -2024/08/10-00:15:09.374814 7f9285a006c0 Level-0 table #5: started -2024/08/10-00:15:09.380438 7f9285a006c0 Level-0 table #5: 109466 bytes OK -2024/08/10-00:15:09.386532 7f9285a006c0 Delete type=0 #3 -2024/08/10-00:15:09.392760 7f9285a006c0 Manual compaction at level-0 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end) +2024/08/10-00:18:04.273721 7f928cc006c0 Recovering log #8 +2024/08/10-00:18:04.284604 7f928cc006c0 Delete type=3 #6 +2024/08/10-00:18:04.284657 7f928cc006c0 Delete type=0 #8 +2024/08/10-00:18:22.934766 7f9285a006c0 Level-0 table #13: started +2024/08/10-00:18:22.934803 7f9285a006c0 Level-0 table #13: 0 bytes OK +2024/08/10-00:18:22.944819 7f9285a006c0 Delete type=0 #11 +2024/08/10-00:18:22.973938 7f9285a006c0 Manual compaction at level-0 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end) +2024/08/10-00:18:22.973982 7f9285a006c0 Manual compaction at level-1 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end) diff --git a/packs/skills-rmfrp/LOG.old b/packs/skills-rmfrp/LOG.old new file mode 100644 index 0000000..ca14413 --- /dev/null +++ b/packs/skills-rmfrp/LOG.old @@ -0,0 +1,8 @@ +2024/08/10-00:16:16.707097 7f9287e006c0 Recovering log #4 +2024/08/10-00:16:16.718136 7f9287e006c0 Delete type=3 #2 +2024/08/10-00:16:16.718187 7f9287e006c0 Delete type=0 #4 +2024/08/10-00:17:37.881615 7f9285a006c0 Level-0 table #9: started +2024/08/10-00:17:37.881641 7f9285a006c0 Level-0 table #9: 0 bytes OK +2024/08/10-00:17:37.888187 7f9285a006c0 Delete type=0 #7 +2024/08/10-00:17:37.894563 7f9285a006c0 Manual compaction at level-0 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end) +2024/08/10-00:17:37.894604 7f9285a006c0 Manual compaction at level-1 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end) diff --git a/packs/skills-rmfrp/MANIFEST-000002 b/packs/skills-rmfrp/MANIFEST-000002 deleted file mode 100644 index 575b2a2..0000000 Binary files a/packs/skills-rmfrp/MANIFEST-000002 and /dev/null differ diff --git a/packs/skills-rmfrp/MANIFEST-000010 b/packs/skills-rmfrp/MANIFEST-000010 new file mode 100644 index 0000000..8020f4f Binary files /dev/null and b/packs/skills-rmfrp/MANIFEST-000010 differ diff --git a/packs/skills/000029.log b/packs/skills/000033.log similarity index 100% rename from packs/skills/000029.log rename to packs/skills/000033.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 3bf5164..d95f027 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000027 +MANIFEST-000031 diff --git a/packs/skills/LOG b/packs/skills/LOG index d31314a..a3ab837 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2024/08/10-00:12:37.581095 7f928cc006c0 Recovering log #25 -2024/08/10-00:12:37.591191 7f928cc006c0 Delete type=3 #23 -2024/08/10-00:12:37.591242 7f928cc006c0 Delete type=0 #25 -2024/08/10-00:13:00.458023 7f9285a006c0 Level-0 table #30: started -2024/08/10-00:13:00.458082 7f9285a006c0 Level-0 table #30: 0 bytes OK -2024/08/10-00:13:00.464677 7f9285a006c0 Delete type=0 #28 -2024/08/10-00:13:00.478046 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) -2024/08/10-00:13:00.478087 7f9285a006c0 Manual compaction at level-1 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) +2024/08/10-00:20:42.430762 7f9286a006c0 Recovering log #29 +2024/08/10-00:20:42.440202 7f9286a006c0 Delete type=3 #27 +2024/08/10-00:20:42.440254 7f9286a006c0 Delete type=0 #29 +2024/08/10-00:24:00.432479 7f9285a006c0 Level-0 table #34: started +2024/08/10-00:24:00.432516 7f9285a006c0 Level-0 table #34: 0 bytes OK +2024/08/10-00:24:00.438691 7f9285a006c0 Delete type=0 #32 +2024/08/10-00:24:00.455614 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) +2024/08/10-00:24:00.455646 7f9285a006c0 Manual compaction at level-1 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index e560837..d31314a 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2024/08/10-00:09:58.191133 7f9287e006c0 Recovering log #21 -2024/08/10-00:09:58.202000 7f9287e006c0 Delete type=3 #19 -2024/08/10-00:09:58.202091 7f9287e006c0 Delete type=0 #21 -2024/08/10-00:12:27.849269 7f9285a006c0 Level-0 table #26: started -2024/08/10-00:12:27.849334 7f9285a006c0 Level-0 table #26: 0 bytes OK -2024/08/10-00:12:27.856159 7f9285a006c0 Delete type=0 #24 -2024/08/10-00:12:27.862891 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) -2024/08/10-00:12:27.862915 7f9285a006c0 Manual compaction at level-1 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) +2024/08/10-00:12:37.581095 7f928cc006c0 Recovering log #25 +2024/08/10-00:12:37.591191 7f928cc006c0 Delete type=3 #23 +2024/08/10-00:12:37.591242 7f928cc006c0 Delete type=0 #25 +2024/08/10-00:13:00.458023 7f9285a006c0 Level-0 table #30: started +2024/08/10-00:13:00.458082 7f9285a006c0 Level-0 table #30: 0 bytes OK +2024/08/10-00:13:00.464677 7f9285a006c0 Delete type=0 #28 +2024/08/10-00:13:00.478046 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) +2024/08/10-00:13:00.478087 7f9285a006c0 Manual compaction at level-1 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000027 b/packs/skills/MANIFEST-000031 similarity index 78% rename from packs/skills/MANIFEST-000027 rename to packs/skills/MANIFEST-000031 index 1339c93..c44bc14 100644 Binary files a/packs/skills/MANIFEST-000027 and b/packs/skills/MANIFEST-000031 differ diff --git a/system.json b/system.json index 858fcca..f7ee653 100644 --- a/system.json +++ b/system.json @@ -3,7 +3,7 @@ "title": "Rolemaster FRP System", "description": "The Rolemaster FRP system for FoundryVTT.", "manifest": "https://www.uberwald.me/gitea/public/fvtt-rolemaster-frp/raw/branch/develop/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-rolemaster-frp/archive/v12.0.13.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-rolemaster-frp/archive/v12.0.14.zip", "authors": [ { "name": "Cynicide", @@ -14,7 +14,7 @@ "email": "" } ], - "version": "12.0.13", + "version": "12.0.14", "compatibility": { "minimum": "12", "verified": "12" @@ -31,17 +31,10 @@ "type": "Item" }, { - "name": "skill-merp", - "label": "Skills (MERP)", + "name": "skill", + "label": "Skills", "system": "fvtt-rolemaster-frp", - "path": "./packs/skills-merp", - "type": "Item" - }, - { - "name": "skill-rmfrp", - "label": "Skills (RMFRP)", - "system": "fvtt-rolemaster-frp", - "path": "./packs/skills-rmfrp", + "path": "./packs/skills", "type": "Item" } ], diff --git a/templates/sheets/apps/app_skill_category_importer.html b/templates/sheets/apps/app_skill_category_importer.html index 27710e4..fad8b6b 100644 --- a/templates/sheets/apps/app_skill_category_importer.html +++ b/templates/sheets/apps/app_skill_category_importer.html @@ -4,6 +4,7 @@

Import Skill Categories/Skills

WARNING: This will erase your existing Skill Categories or Skills and import all Skill Categories/Skills from the selected Compendium. + Note that the import will select only skills and categories matching the "Common" items and the selected game system.
Select Skill Categories Compendium: