fixes to IOracle.Display.Columns

rsek · Sep 1, 2022 · e184d29 · e184d29
1 parent 839709c
commit e184d29
Show file tree

Hide file tree

Showing 62 changed files with 7,430 additions and 5,061 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * the URIs `Image` and `Icons` are now relative to the root directory rather than pretending that the relative url is somehow useful ;)
     * old: `../../img/vector/Oracles/Creature/Environment/Space.svg`
     * new: `img/vector/Oracles/Creature/Environment/Space.svg`
+* complete overhaul of oracle table display data -- see `IOracle.Display.Columns`
 
 ### Other changes
 * `Source` now includes a `License` property, containing a URL pointing to the relevant license.

diff --git a/_master-data/Ironsworn/Oracles/Name.yaml b/_master-data/Ironsworn/Oracles/Name.yaml
@@ -303,13 +303,18 @@ Oracles:
       Short: Other
     _idFragment: Other
     Display:
-      Table:
-        Roll columns:
-          - Use content from: Ironsworn/Oracles/Name/Other/Giants
-        Result columns:
-          - Use content from: Ironsworn/Oracles/Name/Other/Giants
-          - Use content from: Ironsworn/Oracles/Name/Other/Varou
-          - Use content from: Ironsworn/Oracles/Name/Other/Trolls
+      Columns:
+        - Type: dice range
+          Content: Ironsworn/Oracles/Name/Other/Giants
+        - Type: string
+          Content: Ironsworn/Oracles/Name/Other/Giants
+          Label: Giants
+        - Type: string
+          Content: Ironsworn/Oracles/Name/Other/Varou
+          Label: Varou
+        - Type: string
+          Content: Ironsworn/Oracles/Name/Other/Trolls
+          Label: Trolls
     Source:
       Title: Ironsworn Rulebook
       Page: 187

diff --git a/_master-data/Ironsworn/Oracles/Settlement.yaml b/_master-data/Ironsworn/Oracles/Settlement.yaml
@@ -12,7 +12,7 @@ Oracles:
       Standard: Settlement Name
       Short: Name
     _idFragment: Name
-    Aliases: ["7", "Oracle 7", "Settlement Name"]
+    Aliases: ["7", "Oracle 7"]
     Source:
       Page: 178
     Oracles:
@@ -146,6 +146,16 @@ Oracles:
     _idFragment: Quick Name
     Aliases: ["8", "Oracle 8"]
     Description: Use this oracle as a simpler alternative for settlement names. Roll once for the prefix, and once for the suffix. If the combination doesn’t quite work, look at adjacent rows or reverse the digits.
+    Display:
+      Columns:
+        - Type: dice range
+          Content: Ironsworn/Oracles/Settlement/Quick_Name/Prefix
+        - Type: string
+          Content: Ironsworn/Oracles/Settlement/Quick_Name/Prefix
+          Label: Prefix
+        - Type: string
+          Content: Ironsworn/Oracles/Settlement/Quick_Name/Suffix
+          Label: Suffix
     Usage:
       Roll template:
         Result: "${{Ironsworn/Oracles/Settlement/Quick_Name/Prefix}}${{Ironsworn/Oracles/Settlement/Quick_Name/Suffix}}"
@@ -154,6 +164,8 @@ Oracles:
     Oracles:
       - Title:
           Canonical: Prefix
+        Display:
+          Column of: Ironsworn/Oracles/Settlement/Quick_Name
         Table:
           # - [1, 4, Bleak-]
           # - [5, 8, Green-]
@@ -207,6 +219,8 @@ Oracles:
           - [97, 100, Long]
       - Title:
           Canonical: Suffix
+        Display:
+          Column of: Ironsworn/Oracles/Settlement/Quick_Name
         Table:
           # - [1, 4, -moor]
           # - [5, 8, -ford]

diff --git a/_master-data/Ironsworn/Oracles/Turning_Point.yaml b/_master-data/Ironsworn/Oracles/Turning_Point.yaml
@@ -153,23 +153,25 @@ Oracles:
       Short: Rank
     _idFragment: Challenge Rank
     Display:
-      Table:
-        Roll columns:
-          - Label: Roll
-            Use content from: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Quest
-        Result columns:
-          - Use content from: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Quest
-            Label: Rank
-            Key: Result
-          - Use content from: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Quest
-            Label: Quest
-            Key: Summary
-          - Use content from: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Journey
-            Label: Journey
-            Key: Summary
-          - Use content from: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Foes
-            Label: Foes
-            Key: Summary
+      Columns:
+        - Type: dice range
+          Content: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Quest
+        - Content: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Quest
+          Label: Rank
+          Type: string
+          Key: Result
+        - Content: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Quest
+          Label: Quest
+          Type: string
+          Key: Summary
+        - Content: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Journey
+          Label: Journey
+          Type: string
+          Key: Summary
+        - Content: Ironsworn/Oracles/Turning_Point/Challenge_Rank/Foes
+          Label: Foes
+          Type: string
+          Key: Summary
     Aliases: ["19", "Oracle 19"]
     Description: Use this oracle when you want to randomly determine the challenge rank of a quest, journey, or foe.
     Source:

diff --git a/_master-data/Starforged/Oracles/Character_Creation.yaml b/_master-data/Starforged/Oracles/Character_Creation.yaml
@@ -15,36 +15,38 @@ Character Creation:
       Description: |-
         If you want some direction for your starting paths, roll or pick from the table below and take the two paths associated with your selected background.
       Display:
-        Table:
-          Result columns:
-            - Label: Background
-              Key: Result
-            - Label: Assets
-              Key: Summary
+        Columns:
+          - Type: dice range
+          - Type: string
+            Label: Background
+            Key: Result
+          - Type: string
+            Label: Assets
+            Key: Summary
       Content:
         Part of speech: [noun, common noun]
         Tags: [actor]
       Table:
-        - [1, 5, Battlefield Medic, "[HEALER](Starforged/Assets/Path/Healer); [VETERAN](Starforged/Assets/Path/Veteran)", Suggestions: {Assets: [Starforged/Assets/Path/Healer, Starforged/Assets/Path/Veteran]}]
-        - [6, 10, Delegate, "[BANNERSWORN](Starforged/Assets/Path/Bannersworn); [DIPLOMAT](Starforged/Assets/Path/Diplomat)", Suggestions: {Assets: [Starforged/Assets/Path/Bannersworn, Starforged/Assets/Path/Diplomat]}]
-        - [11, 15, Exobiologist, "[LORE HUNTER](Starforged/Assets/Path/Hunter); [NATURALIST](Starforged/Assets/Path/Naturalist)", Suggestions: {Assets: [Starforged/Assets/Path/Lore Hunter, Starforged/Assets/Path/Naturalist]}]
-        - [16, 20, Far Trader, "[NAVIGATOR](Starforged/Assets/Path/Navigator); [TRADER](Starforged/Assets/Path/Trader)", Suggestions: {Assets: [Starforged/Assets/Path/Navigator, Starforged/Assets/Path/Trader]}]
-        - [21, 25, Fugitive Hunter, "[ARMORED](Starforged/Assets/Path/Armored); [BOUNTY HUNTER](Starforged/Assets/Path/Bounty_Hunter)", Suggestions: {Assets: [Starforged/Assets/Path/Armored, Starforged/Assets/Path/Bounty Hunter]}]
-        - [26, 30, Hacker, "[INFILTRATOR](Starforged/Assets/Path/Infiltrator); [TECH](Starforged/Assets/Path/Tech)", Suggestions: {Assets: [Starforged/Assets/Path/Infiltrator, Starforged/Assets/Path/Tech]}]
-        - [31, 35, Hotshot Pilot, "[ACE](Starforged/Assets/Path/Ace); [NAVIGATOR](Starforged/Assets/Path/Navigator)", Suggestions: {Assets: [Starforged/Assets/Path/Ace, Starforged/Assets/Path/Navigator]}]
-        - [36, 40, Interstellar Scout, "[EXPLORER](Starforged/Assets/Path/Explorer); [VOIDBORN](Starforged/Assets/Path/Voidborn)", Suggestions: {Assets: [Starforged/Assets/Path/Explorer, Starforged/Assets/Path/Voidborn]}]
-        - [41, 45, Monster Hunter, "[GUNNER](Starforged/Assets/Path/Gunner); [SLAYER](Starforged/Assets/Path/Slayer)", Suggestions: {Assets: [Starforged/Assets/Path/Gunner, Starforged/Assets/Path/Slayer]}]
-        - [46, 50, Occultist, "[OUTCAST](Starforged/Assets/Path/Outcast); [SHADE](Starforged/Assets/Path/Shade)", Suggestions: {Assets: [Starforged/Assets/Path/Outcast, Starforged/Assets/Path/Shade]}]
-        - [51, 55, Operative, "[INFILTRATOR](Starforged/Assets/Path/Infiltrator); [BLADEMASTER](Starforged/Assets/Path/Blademaster)", Suggestions: {Assets: [Starforged/Assets/Path/Infiltrator, Starforged/Assets/Path/Blademaster]}]
-        - [56, 60, Outlaw, "[FUGITIVE](Starforged/Assets/Path/Fugitive); [GUNSLINGER](Starforged/Assets/Path/Gunslinger)", Suggestions: {Assets: [Starforged/Assets/Path/Fugitive, Starforged/Assets/Path/Gunslinger]}]
-        - [61, 65, Private Investigator, "[BRAWLER](Starforged/Assets/Path/Brawler); [SLEUTH](Starforged/Assets/Path/Sleuth)", Suggestions: {Assets: [Starforged/Assets/Path/Brawler, Starforged/Assets/Path/Sleuth]}]
-        - [66, 70, Prophet, "[DEVOTANT](Starforged/Assets/Path/Devotant); [SEER](Starforged/Assets/Path/Seer)", Suggestions: {Assets: [Starforged/Assets/Path/Devotant, Starforged/Assets/Path/Seer]}]
-        - [71, 75, Psionicist, "[KINETIC](Starforged/Assets/Path/Kinetic); [VESTIGE](Starforged/Assets/Path/Vestige)", Suggestions: {Assets: [Starforged/Assets/Path/Kinetic, Starforged/Assets/Path/Vestige]}]
-        - [76, 80, Smuggler, "[COURIER](Starforged/Assets/Path/Courier); [SCOUNDREL](Starforged/Assets/Path/Scoundrel)", Suggestions: {Assets: [Starforged/Assets/Path/Courier, Starforged/Assets/Path/Scoundrel]}]
-        - [81, 85, Spiritualist, "[HAUNTED](Starforged/Assets/Path/Haunted); [EMPATH](Starforged/Assets/Path/Empath)", Suggestions: {Assets: [Starforged/Assets/Path/Haunted, Starforged/Assets/Path/Empath]}]
-        - [86, 90, Starship Engineer, "[GEARHEAD](Starforged/Assets/Path/Gearhead); [TECH](Starforged/Assets/Path/Tech)", Suggestions: {Assets: [Starforged/Assets/Path/Gearhead, Starforged/Assets/Path/Tech]}]
-        - [91, 95, Supersoldier, "[AUGMENTED](Starforged/Assets/Path/Augmented); [MERCENARY](Starforged/Assets/Path/Mercenary)", Suggestions: {Assets: [Starforged/Assets/Path/Augmented, Starforged/Assets/Path/Mercenary]}]
-        - [96, 100, Tomb Raider, "[SCAVENGER](Starforged/Assets/Path/Scavenger); [SCOUNDREL](Starforged/Assets/Path/Scoundrel)", Suggestions: {Assets: [Starforged/Assets/Path/Scavenger, Starforged/Assets/Path/Scoundrel]}]
+        - [1, 5, Battlefield Medic, "[Healer](Starforged/Assets/Path/Healer); [Veteran](Starforged/Assets/Path/Veteran)", Suggestions: {Assets: [Starforged/Assets/Path/Healer, Starforged/Assets/Path/Veteran]}]
+        - [6, 10, Delegate, "[Bannersworn](Starforged/Assets/Path/Bannersworn); [Diplomat](Starforged/Assets/Path/Diplomat)", Suggestions: {Assets: [Starforged/Assets/Path/Bannersworn, Starforged/Assets/Path/Diplomat]}]
+        - [11, 15, Exobiologist, "[Lore Hunter](Starforged/Assets/Path/Hunter); [Naturalist](Starforged/Assets/Path/Naturalist)", Suggestions: {Assets: [Starforged/Assets/Path/Lore Hunter, Starforged/Assets/Path/Naturalist]}]
+        - [16, 20, Far Trader, "[Navigator](Starforged/Assets/Path/Navigator); [Trader](Starforged/Assets/Path/Trader)", Suggestions: {Assets: [Starforged/Assets/Path/Navigator, Starforged/Assets/Path/Trader]}]
+        - [21, 25, Fugitive Hunter, "[Armored](Starforged/Assets/Path/Armored); [Bounty Hunter](Starforged/Assets/Path/Bounty_Hunter)", Suggestions: {Assets: [Starforged/Assets/Path/Armored, Starforged/Assets/Path/Bounty Hunter]}]
+        - [26, 30, Hacker, "[Infiltrator](Starforged/Assets/Path/Infiltrator); [Tech](Starforged/Assets/Path/Tech)", Suggestions: {Assets: [Starforged/Assets/Path/Infiltrator, Starforged/Assets/Path/Tech]}]
+        - [31, 35, Hotshot Pilot, "[Ace](Starforged/Assets/Path/Ace); [Navigator](Starforged/Assets/Path/Navigator)", Suggestions: {Assets: [Starforged/Assets/Path/Ace, Starforged/Assets/Path/Navigator]}]
+        - [36, 40, Interstellar Scout, "[Explorer](Starforged/Assets/Path/Explorer); [Voidborn](Starforged/Assets/Path/Voidborn)", Suggestions: {Assets: [Starforged/Assets/Path/Explorer, Starforged/Assets/Path/Voidborn]}]
+        - [41, 45, Monster Hunter, "[Gunner](Starforged/Assets/Path/Gunner); [Slayer](Starforged/Assets/Path/Slayer)", Suggestions: {Assets: [Starforged/Assets/Path/Gunner, Starforged/Assets/Path/Slayer]}]
+        - [46, 50, Occultist, "[Outcast](Starforged/Assets/Path/Outcast); [Shade](Starforged/Assets/Path/Shade)", Suggestions: {Assets: [Starforged/Assets/Path/Outcast, Starforged/Assets/Path/Shade]}]
+        - [51, 55, Operative, "[Infiltrator](Starforged/Assets/Path/Infiltrator); [Blademaster](Starforged/Assets/Path/Blademaster)", Suggestions: {Assets: [Starforged/Assets/Path/Infiltrator, Starforged/Assets/Path/Blademaster]}]
+        - [56, 60, Outlaw, "[Fugitive](Starforged/Assets/Path/Fugitive); [Gunslinger](Starforged/Assets/Path/Gunslinger)", Suggestions: {Assets: [Starforged/Assets/Path/Fugitive, Starforged/Assets/Path/Gunslinger]}]
+        - [61, 65, Private Investigator, "[Brawler](Starforged/Assets/Path/Brawler); [Sleuth](Starforged/Assets/Path/Sleuth)", Suggestions: {Assets: [Starforged/Assets/Path/Brawler, Starforged/Assets/Path/Sleuth]}]
+        - [66, 70, Prophet, "[Devotant](Starforged/Assets/Path/Devotant); [Seer](Starforged/Assets/Path/Seer)", Suggestions: {Assets: [Starforged/Assets/Path/Devotant, Starforged/Assets/Path/Seer]}]
+        - [71, 75, Psionicist, "[Kinetic](Starforged/Assets/Path/Kinetic); [Vestige](Starforged/Assets/Path/Vestige)", Suggestions: {Assets: [Starforged/Assets/Path/Kinetic, Starforged/Assets/Path/Vestige]}]
+        - [76, 80, Smuggler, "[Courier](Starforged/Assets/Path/Courier); [Scoundrel](Starforged/Assets/Path/Scoundrel)", Suggestions: {Assets: [Starforged/Assets/Path/Courier, Starforged/Assets/Path/Scoundrel]}]
+        - [81, 85, Spiritualist, "[Haunted](Starforged/Assets/Path/Haunted); [Empath](Starforged/Assets/Path/Empath)", Suggestions: {Assets: [Starforged/Assets/Path/Haunted, Starforged/Assets/Path/Empath]}]
+        - [86, 90, Starship Engineer, "[Gearhead](Starforged/Assets/Path/Gearhead); [Tech](Starforged/Assets/Path/Tech)", Suggestions: {Assets: [Starforged/Assets/Path/Gearhead, Starforged/Assets/Path/Tech]}]
+        - [91, 95, Supersoldier, "[Augmented](Starforged/Assets/Path/Augmented); [Mercenary](Starforged/Assets/Path/Mercenary)", Suggestions: {Assets: [Starforged/Assets/Path/Augmented, Starforged/Assets/Path/Mercenary]}]
+        - [96, 100, Tomb Raider, "[Scavenger](Starforged/Assets/Path/Scavenger); [Scoundrel](Starforged/Assets/Path/Scoundrel)", Suggestions: {Assets: [Starforged/Assets/Path/Scavenger, Starforged/Assets/Path/Scoundrel]}]
     - Title:
         Canonical: Backstory Prompts
       Source:

diff --git a/_master-data/Starforged/Oracles/Characters.yaml b/_master-data/Starforged/Oracles/Characters.yaml
@@ -313,13 +313,18 @@ Characters:
       Description: |-
         Given and family names are presented as a pair, so you may roll once for both or twice to mix-and-match. You can also try reversing given and family names, or use either independently as a standalone name. If you’d like to give a character a callsign, which are the monikers used by spacers, you may roll separately or take the one provided for your rolled name.
       Display:
-        Table:
-          Roll columns:
-            - Use content from: Starforged/Oracles/Characters/Name/Given_Name
-          Result columns:
-            - Use content from: Starforged/Oracles/Characters/Name/Given_Name
-            - Use content from: Starforged/Oracles/Characters/Name/Family_Name
-            - Use content from: Starforged/Oracles/Characters/Name/Callsign
+        Columns:
+          - Type: dice range
+            Content: Starforged/Oracles/Characters/Name/Given_Name
+          - Type: string
+            Content: Starforged/Oracles/Characters/Name/Given_Name
+            Label: Given Name
+          - Type: string
+            Content: Starforged/Oracles/Characters/Name/Family_Name
+            Label: Family Name
+          - Type: string
+            Content: Starforged/Oracles/Characters/Name/Callsign
+            Label: Callsign
       Usage:
         Initial: true
       Oracles:

diff --git a/_master-data/Starforged/Oracles/Creatures.yaml b/_master-data/Starforged/Oracles/Creatures.yaml
@@ -68,15 +68,25 @@ Creatures:
       Content:
         Part of speech: [fragment]
       Display:
-        Table:
-          Roll columns:
-            - Use content from: Starforged/Oracles/Creatures/Basic_Form/Space
-            - Use content from: Starforged/Oracles/Creatures/Basic_Form/Interior
-            - Use content from: Starforged/Oracles/Creatures/Basic_Form/Land
-            - Use content from: Starforged/Oracles/Creatures/Basic_Form/Liquid
-            - Use content from: Starforged/Oracles/Creatures/Basic_Form/Air
-          Result columns:
-            - Use content from: Starforged/Oracles/Creatures/Basic_Form/Space
+        Columns:
+            - Type: dice range
+              Content: Starforged/Oracles/Creatures/Basic_Form/Space
+              Label: Space
+            - Type: dice range
+              Content: Starforged/Oracles/Creatures/Basic_Form/Interior
+              Label: Interior
+            - Type: dice range
+              Content: Starforged/Oracles/Creatures/Basic_Form/Land
+              Label: Land
+            - Type: dice range
+              Content: Starforged/Oracles/Creatures/Basic_Form/Liquid
+              Label: Liquid
+            - Type: dice range
+              Content: Starforged/Oracles/Creatures/Basic_Form/Air
+              Label: Air
+            - Type: string
+              Content: Starforged/Oracles/Creatures/Basic_Form/Space
+              Key: Result
       Description: |-
         Roll for a basic form, and flesh out the creature’s appearance using the First Look table.
       Oracles:

diff --git a/_master-data/Starforged/Oracles/Derelicts.yaml b/_master-data/Starforged/Oracles/Derelicts.yaml
@@ -40,13 +40,18 @@ Derelicts:
         Initial: true
         Requires: *attr:Location.Any
       Display:
-        Table:
-          Roll columns:
-            - Use content from: Starforged/Oracles/Derelicts/Type/Planetside
-            - Use content from: Starforged/Oracles/Derelicts/Type/Orbital
-            - Use content from: Starforged/Oracles/Derelicts/Type/Deep_Space
-          Result columns:
-            - Use content from: Starforged/Oracles/Derelicts/Type/Planetside
+        Columns:
+          - Type: dice range
+            Content: Starforged/Oracles/Derelicts/Type/Planetside
+            Label: Planetside
+          - Type: dice range
+            Content: Starforged/Oracles/Derelicts/Type/Orbital
+            Label: Orbital
+          - Type: dice range
+            Content: Starforged/Oracles/Derelicts/Type/Deep_Space
+            Label: Deep Space
+          - Type: string
+            Content: Starforged/Oracles/Derelicts/Type/Planetside
       Oracles:
         - Display: &derelictTypeDisplay
             Column of: Starforged/Oracles/Derelicts/Type
@@ -162,12 +167,15 @@ Derelicts:
         Short: Zones
       _idFragment: Zones
       Display:
-        Table:
-          Roll columns:
-            - Use content from: Starforged/Oracles/Derelicts/Zones/Starship
-            - Use content from: Starforged/Oracles/Derelicts/Zones/Settlement
-          Result columns:
-            - Use content from: Starforged/Oracles/Derelicts/Zones/Starship
+        Columns:
+          - Type: dice range
+            Content: Starforged/Oracles/Derelicts/Zones/Starship
+            Label: Starship
+          - Type: dice range
+            Content: Starforged/Oracles/Derelicts/Zones/Settlement
+            Label: Settlement
+          - Type: string
+            Content: Starforged/Oracles/Derelicts/Zones/Starship
       Usage:
         Repeatable: true
         Requires: