Merge pull request #344 from ben/mix-and-match

Mix and match IS/SF sheets and moves/oracles
ben · May 6, 2022 · de6afca · de6afca
2 parents 160e7e6 + 6bd3472
commit de6afca
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## In progress
 
 - Use the Starforged-style oracle tree for Ironsworn, with Dataforged-powered tables ([#337](https://github.com/ben/foundry-ironsworn/pull/337))
+- Allow explicit setting of which toolbox to use ([#344](https://github.com/ben/foundry-ironsworn/pull/344))
 
 ## 1.10.62
 

diff --git a/src/module/actor/sheets/charactersheet-v2.ts b/src/module/actor/sheets/charactersheet-v2.ts
@@ -1,6 +1,7 @@
 import { IronswornSettings } from '../../helpers/settings'
 import { IronswornVueActorSheet } from '../vueactorsheet'
 import { CharacterMoveSheet } from './charactermovesheet'
+import { SFCharacterMoveSheet } from './sf-charactermovesheet'
 
 export class IronswornCharacterSheetV2 extends IronswornVueActorSheet {
   static get defaultOptions() {
@@ -66,7 +67,12 @@ export class IronswornCharacterSheetV2 extends IronswornVueActorSheet {
     if (this.actor.moveSheet) {
       this.actor.moveSheet.render(true, { focus: true })
     } else {
-      new CharacterMoveSheet(this.actor).render(true)
+      if (IronswornSettings.toolbox === 'starforged') {
+        this.actor.moveSheet ||= new SFCharacterMoveSheet(this.actor)
+        this.actor.moveSheet.render(true, { focus: true })
+        } else {
+        new CharacterMoveSheet(this.actor).render(true)
+      }
     }
   }
 }
diff --git a/src/module/actor/sheets/charactersheet.ts b/src/module/actor/sheets/charactersheet.ts
@@ -2,6 +2,7 @@ import { RollDialog } from '../../helpers/rolldialog'
 import { IronswornSettings } from '../../helpers/settings'
 import { IronswornItem } from '../../item/item'
 import { CharacterMoveSheet } from './charactermovesheet'
+import { SFCharacterMoveSheet } from './sf-charactermovesheet'
 
 export class IronswornCharacterSheet extends ActorSheet {
   static get defaultOptions() {
@@ -82,7 +83,12 @@ export class IronswornCharacterSheet extends ActorSheet {
     if (this.actor.moveSheet) {
       this.actor.moveSheet.render(true, { focus: true })
     } else {
-      new CharacterMoveSheet(this.actor).render(true)
+      if (IronswornSettings.toolbox === 'starforged') {
+        this.actor.moveSheet ||= new SFCharacterMoveSheet(this.actor)
+        this.actor.moveSheet.render(true, { focus: true })
+        } else {
+        new CharacterMoveSheet(this.actor).render(true)
+      }
     }
   }
 

diff --git a/src/module/actor/sheets/sf-charactersheet.ts b/src/module/actor/sheets/sf-charactersheet.ts
@@ -1,5 +1,6 @@
 import { IronswornSettings } from '../../helpers/settings'
 import { IronswornVueActorSheet } from '../vueactorsheet'
+import { CharacterMoveSheet } from './charactermovesheet'
 import { SFCharacterMoveSheet } from './sf-charactermovesheet'
 
 export class StarforgedCharacterSheet extends IronswornVueActorSheet {
@@ -63,7 +64,11 @@ export class StarforgedCharacterSheet extends IronswornVueActorSheet {
   }
 
   _openMoveSheet(_e?: JQuery.ClickEvent) {
-    this.actor.moveSheet ||= new SFCharacterMoveSheet(this.actor)
-    this.actor.moveSheet.render(true, { focus: true })
+    if (IronswornSettings.toolbox === 'ironsworn') {
+      new CharacterMoveSheet(this.actor).render(true)
+    } else {
+      this.actor.moveSheet ||= new SFCharacterMoveSheet(this.actor)
+      this.actor.moveSheet.render(true, { focus: true })
+    }
   }
 }
diff --git a/src/module/helpers/settings.ts b/src/module/helpers/settings.ts
@@ -18,6 +18,20 @@ export class IronswornSettings {
       onChange: reload,
     })
 
+    game.settings.register('foundry-ironsworn', 'toolbox', {
+      name: 'IRONSWORN.Settings.Tools.Name',
+      hint: 'IRONSWORN.Settings.Tools.Hint',
+      scope: 'world',
+      config: true,
+      type: String,
+      choices: {
+        sheet: 'IRONSWORN.Settings.Tools.Sheet',
+        ironsworn: 'IRONSWORN.Ironsworn',
+        starforged: 'IRONSWORN.Starforged',
+      },
+      default: 'sheet',
+    })
+
     game.settings.register('foundry-ironsworn', 'shared-supply', {
       name: 'IRONSWORN.Settings.SharedSupply.Name',
       hint: 'IRONSWORN.Settings.SharedSupply.Hint',
@@ -67,6 +81,10 @@ export class IronswornSettings {
     return game.settings.get('foundry-ironsworn', 'theme') as string
   }
 
+  static get toolbox(): string {
+    return game.settings.get('foundry-ironsworn', 'toolbox') as string
+  }
+
   static get starforgedBeta(): boolean {
     return game.settings.get('foundry-ironsworn', 'starforged-beta') as boolean
   }

diff --git a/system/lang/en.json b/system/lang/en.json
@@ -1,5 +1,7 @@
 {
   "IRONSWORN": {
+    "Ironsworn": "Ironsworn",
+    "Starforged": "Starforged",
     "CreateActor": "Create Actor",
     "YourWorldTruths": "Your World: Truths",
     "TruthQuestStarter": "Quest Starter:",
@@ -201,6 +203,11 @@
         "Ironsworn": "Ironsworn Classic",
         "Starforged": "Starforged (experimental)"
       },
+      "Tools": {
+        "Name": "Character Tools",
+        "Hint": "Which set of moves and oracles will appear when opening a character sheet.",
+        "Sheet": "Match sheet"
+      },
       "SharedSupply": {
         "Name": "Shared Supply Tracker",
         "Hint": "If on, changing any character/shared supply tracker changes all other actors' supply trackers as well."