Re-organised source code

rajch · Aug 16, 2024 · f08a674 · f08a674
1 parent 05e8178
commit f08a674
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 34 deletions.
diff --git a/src/brass-basilisk.js b/src/brass-basilisk.js
@@ -1,14 +1,14 @@
 'use strict'
 
-import { ChanceRollPlugin } from "./chancerollplugin"
-import { CharacterSheetPlugin } from "./charactersheetplugin"
-import { CombatPlugin } from "./combatplugin"
+import { ChanceRollPlugin } from "./plugins/chancerollplugin"
+import { CharacterSheetPlugin } from "./plugins/charactersheetplugin"
+import { CombatPlugin } from "./plugins/combatplugin"
 import { DefaultView } from "./defaultview"
-import { DiceBoardPlugin } from "./diceboardplugin"
+import { DiceBoardPlugin } from "./plugins/diceboardplugin"
 import { DefaultStory } from "./defaultstory"
-import { Player } from "./player"
-import { TurnToLinksPlugin } from "./turntolinksplugin"
-import { AttributePhrasePlugin } from "./attributephraseplugin"
+import { Player } from "./core/player"
+import { TurnToLinksPlugin } from "./plugins/turntolinksplugin"
+import { AttributePhrasePlugin } from "./plugins/attributephraseplugin"
 
 
 try {

diff --git a/src/passage.js → src/core/passage.js b/src/passage.js → src/core/passage.js
diff --git a/src/player.js → src/core/player.js b/src/player.js → src/core/player.js
diff --git a/src/plugin.js → src/core/plugin.js b/src/plugin.js → src/core/plugin.js
diff --git a/src/types.js → src/core/types.js b/src/types.js → src/core/types.js
diff --git a/src/defaultstory.js b/src/defaultstory.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import { Passage } from "./passage"
+import { Passage } from "./core/passage"
 
 export class DefaultStory {
     /** @type {HTMLElement} */

diff --git a/src/defaultview.js b/src/defaultview.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import './types'
+import './core/types'
 
 export class DefaultView {
     /** @type {HTMLElement} */
@@ -180,7 +180,7 @@ export class DefaultView {
     }
 
     /**
-     * Gets a container for a "tools" UI element.
+     * Gets a dialog UI element.
      * 
      * In the default implementation, this looks for a dialog with
      * the specified id.

diff --git a/src/attributephraseplugin.js → src/plugins/attributephraseplugin.js b/src/attributephraseplugin.js → src/plugins/attributephraseplugin.js
@@ -1,10 +1,10 @@
 'use strict'
 
 import { CharacterSheetPlugin } from './charactersheetplugin'
-import { Passage } from './passage'
-import { BBScannerPlugin } from './plugin'
+import { Passage } from '../core/passage'
+import { BBScannerPlugin } from '../core/plugin'
 
-import './types'
+import '../core/types'
 
 // This matches a sentence that ends a paragraph.
 const phraseRegex = /Your (VIGOUR|AGILITY|PSI) ((?:is restored)|(?:increases by)|(?:decreases by))( \d{1,2})?\.\n/g
@@ -62,15 +62,6 @@ export class AttributePhrasePlugin extends BBScannerPlugin {
             this.setCurrentState({ acted: true })
         }
 
-        // for (let i = 0; i < this.#phraseActions.length; i++) {
-        //     const phraseAction = this.#phraseActions[i]
-        //     const rexp = new RegExp(phraseAction.phraseRegExp)
-        //     const rexMatches = passageBody.match(rexp)
-        //     if (rexMatches) {
-        //         result = result || phraseAction.action(rexMatches)
-        //     }
-        // }
-
         return result
     }
 }
diff --git a/src/chancerollplugin.js → src/plugins/chancerollplugin.js b/src/chancerollplugin.js → src/plugins/chancerollplugin.js
@@ -1,10 +1,10 @@
 'use strict'
 
 import { DiceBoardPlugin } from "./diceboardplugin";
-import { Passage } from "./passage";
-import { BBScannerPlugin } from "./plugin";
+import { Passage } from "../core/passage";
+import { BBScannerPlugin } from "../core/plugin";
 
-import './types'
+import '../core/types'
 
 const chanceRegEx = /(?:[Rr]oll|[Tt]hrow) (\S*?) di(?:c?)e\.(.*?)(?:\n|$)/
 const actionRegEx = /If you roll (?:a )?(\d{1,2})( or(?: a)? | to |)(\d{0,2}),([^\.\n]*?)(?: [Tt]urn to (\d{1,3}))?\./g

diff --git a/src/charactersheetplugin.js → src/plugins/charactersheetplugin.js b/src/charactersheetplugin.js → src/plugins/charactersheetplugin.js
@@ -1,7 +1,7 @@
 'use strict'
 
-import { BBGlobalStatePlugin } from "./plugin";
-import './types'
+import { BBGlobalStatePlugin } from "../core/plugin";
+import '../core/types'
 
 export class CharacterSheetPlugin extends BBGlobalStatePlugin {
     /** @type CharacterSheet */

diff --git a/src/combatplugin.js → src/plugins/combatplugin.js b/src/combatplugin.js → src/plugins/combatplugin.js
@@ -2,10 +2,10 @@
 
 import { CharacterSheetPlugin } from "./charactersheetplugin";
 import { DiceBoardPlugin } from "./diceboardplugin";
-import { Passage } from "./passage";
-import { BBScannerPlugin } from "./plugin";
+import { Passage } from "../core/passage";
+import { BBScannerPlugin } from "../core/plugin";
 
-import './types'
+import '../core/types'
 
 const combatRegex = /\n+([A-Z\s]+)\s+VIGOUR\s+(\d+)\s*\n+\s*?[Rr]oll\s+(\w+)\s+dice:\n+\s*((?:[Ss]core\s+\d+\s+to\s+\d+[^\n]+\n\s*)+)(?:\n+(.*?)\n)/
 const combatRuleRegex = /score\s+(\d+)\s+to\s+(\d+)\s+(?:[\w;,\-:]+\s)+?(loses?)\s+(\d+)\s+VIGOUR/g

diff --git a/src/diceboardplugin.js → src/plugins/diceboardplugin.js b/src/diceboardplugin.js → src/plugins/diceboardplugin.js
@@ -1,7 +1,7 @@
 'use strict'
 
-import { BBScannerPlugin } from "./plugin";
-import './types'
+import { BBScannerPlugin } from "../core/plugin";
+import '../core/types'
 
 // Raises 'roll' event, with event.detail containing the total roll
 export class DiceBoardPlugin extends BBScannerPlugin {

diff --git a/src/turntolinksplugin.js → src/plugins/turntolinksplugin.js b/src/turntolinksplugin.js → src/plugins/turntolinksplugin.js
@@ -1,8 +1,8 @@
 'use strict'
 
-import { BBPlugin } from "./plugin";
+import { BBPlugin } from "../core/plugin";
 
-import "./types"
+import "../core/types"
 
 export class TurnToLinksPlugin extends BBPlugin {