Merge pull request #1011 from ben/new-datasworn

Datasworn 2
ben · Aug 29, 2024 · 84e79af · 84e79af
2 parents 054310f + 736bde8
commit 84e79af
Show file tree

Hide file tree

Showing 1,950 changed files with 126,768 additions and 103,090 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 ## Next Release
 
+This is a major update that includes Sundered Isles content, but also brings along a host of changes:
+
+- Selection of content happens in the first-start dialog, which will show the first time you open your world after this update. The checkboxes you select will affect everything in the world, so you can give every character access to both Delve and Sundered Isles moves and oracles.
+- For module/macro authors:
+  - Registration of custom oracle/move content has a few changes:
+    - The `'ironsworn'` tree is now called `'classic'`
+    - Delve content is now under the `'delve'` tree
+    - There's a new `'sundered_isles'` tree
+    - Category names have changed, e.g. the `'Adventure'` move category is now called `'Adventure Moves'`
+  - The string you pass to `CONFIG.IRONSWORN.applications.IronswornPrerollDialog.showForOfficialMove` is now a Datasworn ID. Dataforged IDs will no longer work.
+  - Embedded links to oracle categories are changing format. See below for the before-and-after, and see [these files](https://github.com/rsek/datasworn/tree/v0.1.0/src/legacy_ids/dataforged) if you need to make a change.
+
+```html
+<!-- Oracle-category link changes: -->
+<!-- BEFORE: Dataforged-style ID -->
+<a class="entity-link oracle-category-link" data-dfid="Starforged/Oracles/Location_Themes/Chaotic">
+  <i class="fa fa-caret-right"></i> Chaotic
+</a>
+<!-- AFTER: Datasworn 2 ID -->
+<a class="entity-link oracle-category-link" data-dsid="oracle_collection:starforged/location_theme/chaotic">
+  <i class="fa fa-caret-right"></i> Chaotic
+</a>
+```
+
 ## 1.23.7
 
 - Fix Cinder and Wraith dice with dice-so-nice 5 ([#1009](https://github.com/ben/foundry-ironsworn/pull/1009))

diff --git a/README.md b/README.md
@@ -15,9 +15,13 @@ For information on how to play a game, check out [the wiki](https://github.com/b
 
 # System Development
 
+> [!IMPORTANT]
+> Currently you **must** have [Datasworn](https://github.com/rsek/datasworn/tree/v0.1.0) checked out to the `v0.1.0` branch in the same directory as this repo in order for the build to succeed.
+> I don't like it either, and as soon as there's an NPM release, I'll fix it and remove this note.
+
 Here's what you'll need to make changes to this system:
 
-1. Install Foundry 10 or later, and start it up.
+1. Install Foundry 11 or later, and start it up.
 2. Install the main `foundry-ironsworn` system, and create a world that uses it.
 3. Clone this repo somewhere you can find it, and run `npm install`.
 4. Run `npm start` from this repository.
@@ -37,6 +41,8 @@ Some things to remember:
 
 This work is based on Ironsworn (found at https://www.ironswornrpg.com), created by Shawn Tomkin, and licensed for our use under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International license (creativecommons.org/licenses/by-nc-sa/4.0/).
 
+Data courtesy of [Datasworn](https://github.com/rsek/datasworn), which is used here under its MIT license.
+
 Hand-drawn map scene courtesy of [McSekcer](https://www.reddit.com/user/McSekcer/).
 
 Starforged scenes courtesy of [Unsplash](https://unsplash.com), and used under their [license](https://unsplash.com/license).

diff --git a/json-packs/assets/Alchemist_98bf680786f73035.json b/json-packs/assets/Alchemist_98bf680786f73035.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Path/Alchemist",
+      "dsid": "asset:classic/path/alchemist"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!98bf680786f73035"
-}
+}
diff --git a/json-packs/assets/Animal_Kin_03b1a72871745961.json b/json-packs/assets/Animal_Kin_03b1a72871745961.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Path/Animal_Kin",
+      "dsid": "asset:classic/path/animal_kin"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!03b1a72871745961"
-}
+}
diff --git a/json-packs/assets/Archer_6926a7946db88fb0.json b/json-packs/assets/Archer_6926a7946db88fb0.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Combat_Talent/Archer",
+      "dsid": "asset:classic/combat_talent/archer"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!6926a7946db88fb0"
-}
+}
diff --git a/json-packs/assets/Augur_153f1eb966607782.json b/json-packs/assets/Augur_153f1eb966607782.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Ritual/Augur",
+      "dsid": "asset:classic/ritual/augur"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!153f1eb966607782"
-}
+}
diff --git a/json-packs/assets/Awakening_f046c70dae00c59e.json b/json-packs/assets/Awakening_f046c70dae00c59e.json
@@ -34,7 +34,6 @@
     "track": {
       "enabled": true,
       "name": "Health",
-      "current": 0,
       "max": 3,
       "value": 3,
       "min": 0
@@ -47,17 +46,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Ritual/Awakening",
+      "dsid": "asset:classic/ritual/awakening"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!f046c70dae00c59e"
-}
+}
diff --git a/json-packs/assets/Banner_Sworn_bc8db0abea6bdc73.json b/json-packs/assets/Banner_Sworn_bc8db0abea6bdc73.json
@@ -52,17 +52,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Path/Banner-Sworn",
+      "dsid": "asset:classic/path/banner_sworn"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!bc8db0abea6bdc73"
-}
+}
diff --git a/json-packs/assets/Battle_Scarred_66c77ad45a248aa4.json b/json-packs/assets/Battle_Scarred_66c77ad45a248aa4.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Path/Battle-Scarred",
+      "dsid": "asset:classic/path/battle_scarred"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!66c77ad45a248aa4"
-}
+}
diff --git a/json-packs/assets/Berserker_706e4c7598fbe5cf.json b/json-packs/assets/Berserker_706e4c7598fbe5cf.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Combat_Talent/Berserker",
+      "dsid": "asset:classic/combat_talent/berserker"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!706e4c7598fbe5cf"
-}
+}
diff --git a/json-packs/assets/Bind_5dae96957d13ef59.json b/json-packs/assets/Bind_5dae96957d13ef59.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Ritual/Bind",
+      "dsid": "asset:classic/ritual/bind"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!5dae96957d13ef59"
-}
+}
diff --git a/json-packs/assets/Blade_Bound_04c87926913c3612.json b/json-packs/assets/Blade_Bound_04c87926913c3612.json
@@ -52,17 +52,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Path/Blade-Bound",
+      "dsid": "asset:classic/path/blade_bound"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!04c87926913c3612"
-}
+}
diff --git a/json-packs/assets/Bonded_527f8eb6bdcc729d.json b/json-packs/assets/Bonded_527f8eb6bdcc729d.json
@@ -47,17 +47,16 @@
   "effects": [],
   "sort": 0,
   "ownership": {
-    "default": 0,
-    "oPggPZM6rWjfN0q2": 3
+    "default": 0
+  },
+  "flags": {
+    "foundry-ironsworn": {
+      "dfid": "Ironsworn/Assets/Path/Bonded",
+      "dsid": "asset:classic/path/bonded"
+    }
   },
-  "flags": {},
   "_stats": {
-    "systemId": "foundry-ironsworn",
-    "systemVersion": "1.22.4",
-    "coreVersion": "11.309",
-    "createdTime": 1695949021198,
-    "modifiedTime": 1695949021198,
-    "lastModifiedBy": "oPggPZM6rWjfN0q2"
+    "systemId": "foundry-ironsworn"
   },
   "_key": "!items!527f8eb6bdcc729d"
-}
+}