diff --git a/src/App.fsproj b/src/App.fsproj index 74f462f..052c53a 100644 --- a/src/App.fsproj +++ b/src/App.fsproj @@ -11,6 +11,7 @@ + diff --git a/src/Main.fs b/src/Main.fs index db4c2b6..5ebcbbc 100644 --- a/src/Main.fs +++ b/src/Main.fs @@ -15,10 +15,17 @@ let Router() = React.router [ router.onUrlChanged updateUrl router.children [ + class' "header" Html.div [ + classP' "srcLink" Html.a [ + prop.href "https://github.com/MaxWilson/rpg/" + prop.children [Html.img [prop.ariaLabel "GitHub"; prop.src "img/GitHub_Logo.png"]] + prop.target "_blank" + ] + ] match currentUrl with - | [ "spells" ] -> UI.PriestSpells.View() + | [ "spells" ] -> UI.PriestSpellsView.View() | otherwise -> - UI.PriestSpells.View() + UI.PriestSpellsView.View() ] ] diff --git a/src/UI/Components/PriestSpells.fs b/src/UI/Components/PriestSpells.fs index 2de0891..1fd5728 100644 --- a/src/UI/Components/PriestSpells.fs +++ b/src/UI/Components/PriestSpells.fs @@ -1,175 +1,146 @@ module UI.PriestSpells -open Feliz #nowarn "40" // Disabling the recursive initialization warning for this file because the parser is recursive, but isn't doing anything weird like calling ctor args during construction. -module Data = - type SphereName = string - type SpellName = string - type DeityName = string - type Spell = { name: SpellName; level: int; spheres: SphereName list } - with - override this.ToString() = - let level = match this.level with 1 -> "1st" | 2 -> "2nd" | 3 -> "3rd" | n -> $"{n}th" - $"""{this.name} ({level} level {this.spheres |> String.concat "/"})""" - type Sphere = { name: SphereName; spells: Spell list } - type AccessLevel = Major | Minor - type SphereAccess = { sphere: SphereName; access: AccessLevel } - type Deity = { name: DeityName; spheres: SphereAccess list } - let consolidateSpells spheres = - // return a list of spells, not spheres, with no duplicates and with all spheres for a given spell linked to it - let spells = spheres |> List.collect (fun sphere -> sphere.spells) |> List.groupBy (fun spell -> spell.name) - [ for _, group in spells do - let spheres = group |> List.collect (fun spell -> spell.spheres) |> List.distinct - { group[0] with spheres = spheres } - ] - let consolidateSpheres (spells: Spell list) spheres = - let spells = spells |> List.map (fun spell -> spell.name, spell) |> Map.ofList - spheres |> List.map (fun sphere -> { sphere with spells = sphere.spells |> List.map (fun spell -> spells.[spell.name]) }) - let spheres = """ - All: Bless 1, Combine 1, Detect Evil 1, Purify Food & Drink 1, Atonement 5 - Animal: Animal Friendship 1, Invisibility to Animals 1, Locate Animals or Plants 1, Charm Person or Mammal 2, Messenger 2, - Snake Charm 2, Speak With Animals 2, Hold Animal 3, Summon Insects 3, Animal Summoning I 4, Call Woodland Beings 4, - Giant Insect 4, Repel Insects 4, Animal Growth 5, Animal Summoning II 5, Animal Summoning III 6, Anti-Animal Shell 6, Creeping Doom 7 - Astral: Plane Shift 5, Astral Spell 7 - Charm: Command 1, Remove Fear 1, Enthrall 2, Hold Person 2, Cloak of Bravery 4, Free Action 4, Imbue With Spell Ability 4, Quest 5, Confusion 7, Exaction 7 - Combat: Magical Stone 1, Shillelagh 1, Chant 2, Spiritual Hammer 2, Prayer 3, Flame Strike 5, Insect Plague 5, Holy Word 7 - Creation: Create Food & Water 3, Animate Object 6, Blade Barrier 6, Heroes' Feast 6, Wall of Thorns 6, Changestaff 7, Chariot of Sustarre 7 - Divination: Detect Magic 1, Detect Poison 1, Detect Snares & Pits 1, Locate Animals or Plants 1, Augury 2, Detect Charm 2, Find Traps 2, - Know Alignment 2, Speak With Animals 2, Locate Object 3, Speak With Dead 3, Detect Lie 4, Divination 4, Reflecting Pool 4, Tongues 4, Commune 5, - Commune With Nature 5, Magic Font 5, True Seeing 5, Find the Path 6, Speak With Monsters 6 - Elemental: Create Water 1, Dust Devil 2, Fire Trap 2, Flame Blade 2, Heat Metal 2, Produce Flame 2, Flame Walk 3, Meld Into Stone 3, Protection From Fire 3, - Pyrotechnics 3, Stone Shape 3, Water Breathing 3, Water Walk 3, Lower Water 4, Produce Fire 4, Air Walk 5, Commune With Nature 5, Spike Stones 5, Transmute Rock to Mud 5, - Wall of Fire 5, Conjure Fire Elemental 6, Fire Seeds 6, Part Water 6, Stone Tell 6, Transmute Water to Dust 6, Animate Rock 7, Chariot of Sustarre 7, Conjure Earth Elemental 7, - Earthquake 7, Fire Storm 7, Transmute Metal to Wood 7, Wind Walk 7 - Guardian: Silence 2, Wyvern Watch 2, Glyph of Warding 3, Blade Barrier 6, Symbol 7 - Healing: Cure Light Wounds 1, Slow Poison 2, Cure Serious Wounds 4, Neutralize Poison 4, Cure Critical Wounds 5, Heal 6 - Necromantic: Invisibility to Undead 1, Aid 2, Animate Dead 3, Cure Blindness or Deafness 3, Cure Disease 3, Feign Death 3, Negative Plane Protection 3, Raise Dead 5, - Regenerate 7, Reincarnate 7, Restoration 7, Resurrection 7 - Plant: Entangle 1, Pass Without Trace 1, Shillelagh 1, Barksin 2, Goodberry 2, Trip 2, Warp Wood 2, Plant Growth 3, Snare 3, Spike Growth 3, Tree 3, Hallucinatory Forest 4, - Hold Plant 4, Plant Door 4, Speak With Plants 4, Sticks to Snakes 4, Anti-Plant Shell 5, Pass Plant 5, Liveoak 6, Transport Via Plants 6, Turn Wood 6, Wall of Thorns 6, Changestaff 7 - Protection: Endure Cold 1, Endure Heat 1, Protection From Evil 1, Sanctuary 1, Barkskin 2, Resist Fire 2, Resist Cold 2, Withdraw 2, Dispel Magic 3, Magical Vestment 3, - Negative Plane Protection 3, Protection From Fire 3, Remove Curse 3, Remove Paralysis 3, Protection From Evil 10' Radius 4, Protection From Lightning 4, Repel Insects 4, - Spell Immunity 4, Anti-Plant Shell 5, Dispel Evil 5, Anti-Animal Shell 6 - Summoning: Abjure 4, Animal Summoning I 4, Call Woodland Beings 4, Animal Summoning II 5, Dispel Evil 5, Aerial Servant 6, Animal Summoning III 6, Animate Objects 6, Conjure Animals 6, - Wall of Thorns 6, Weather Summoning 6, Word of Recall 6, Conjure Earth Elemental 7, Creeping Doom 7, Exaction 7, Gate 7, Succor 7 - Sun: Light 1, Continual Light 3, Starshine 3, Moonbeam 5, Rainbow 5, Sunray 7 - Weather: Faerie Fire 1, Obscurement 2, Call Lightning 3, Control Temperature 10' Radius 4, Protection From Lightning 4, Control Winds 5, Rainbow 5, Weather Summoning 6, Control Weather 7 - """ - module Parser = - // #load @"c:\code\rpg\src\Core\Common.fs" - // #load @"c:\code\rpg\src\Core\CQRS.fs" - // #load @"c:\code\rpg\src\Core\Coroutine.fs" - // #load @"c:\code\rpg\src\Core\Packrat.fs" - open Packrat - let (|SpellLevel|_|) = function - | OWS(Int(n, ((Char((',' | '\n' | '\r'), _) | End) as rest))) -> Some(n, rest) - | _ -> None - let (|NameChunk|_|) = - let chars = alphanumeric + Set.ofList ['\''; ','; '&'; '-';] // e.g. Protection From Evil, 10' Radius has a comma and an apostrophe; some spells have Food & Water or Anti-Plant - function - | SpellLevel _ -> None // spell level takes priority over NameChunk; don't mistake a " 1" for " 10' Radius" - | OWS(Chars chars (v, OWS rest)) -> Some(v, rest) - | _ -> None - let rec (|Names|_|) = pack <| function - | NameChunk(lhs, Names(rhs, rest)) -> Some(lhs + " " + rhs, rest) - | NameChunk(v, rest) -> Some(v, rest) - | _ -> None - let rec (|Spell|_|) = function - | Names(name, SpellLevel(level, rest)) -> Some({ name = name; level = level; spheres = [] }, rest) - | _ -> None - let rec (|Spells|_|) = pack <| function - | Spell(lhs, Str "," (Spells(rhs, rest))) -> Some(lhs :: rhs, rest) - | Spell(v, rest) -> Some([v], rest) - | _ -> None - - let rec (|Sphere|_|) = function - | Names(sphereName, Str ":" (Spells(spells, rest))) -> Some( { name = sphereName; spells = spells |> List.map (fun spell -> { spell with spheres = [sphereName] }) }, rest) - | _ -> None - let rec (|Spheres|_|) = function - | Sphere(lhs, OWS (Spheres(rhs, rest))) -> Some(lhs::rhs, rest) - | Sphere(v, rest) -> Some([v], rest) - | _ -> None - // let partial (|Recognizer|_|) txt = match ParseArgs.Init txt with | Recognizer(v, _) -> v - // let partialR (|Recognizer|_|) txt = match ParseArgs.Init txt with | Recognizer(v, (input, pos)) -> v, input.input.Substring pos - // partial (|Spheres|_|) spheres |> List.collect _.spells |> List.filter (fun spell -> spell.name = "Chariot of Sustarre") - // partial (|Spheres|_|) spheres |> fun spheres -> (consolidateSpells spheres) |> List.filter (fun spell -> spell.name = "Chariot of Sustarre") - // partial (|Spheres|_|) spheres |> fun spheres -> spheres |> consolidateSpheres (consolidateSpells spheres) |> List.filter (fun sphere -> sphere.name = "Plant") |> List.collect _.spells |> List.map _.ToString() - // |> String.join ", " - module Storage = - open LocalStorage - module Spheres = - let key = "Spheres" - let cacheRead, cacheInvalidate = Cache.create() - let read (): Sphere list = - cacheRead (thunk2 read key (fun () -> Packrat.parser Parser.(|Spheres|_|) (spheres.Trim()) |> fun spheres -> spheres |> consolidateSpheres (consolidateSpells spheres))) - let write (v: Sphere list) = - write key v - cacheInvalidate() - module Notes = - let key = "Notes" - let cacheRead, cacheInvalidate = Cache.create() - let read (): Map = - cacheRead (thunk2 read key (thunk Map.empty)) - let write (v: Map) = - write key v - cacheInvalidate() - module Deities = - let key = "Deities" - let cacheRead, cacheInvalidate = Cache.create() - let read (): Deity list = - cacheRead (thunk2 read key (thunk [])) - let write (v: Deity list) = - write key v - cacheInvalidate() - module SpellPicks = - let key = "Picks" - let cacheRead, cacheInvalidate = Cache.create() - let read (): Map = - cacheRead (thunk2 read key (thunk Map.empty)) - let write (v: Map) = - write key v - cacheInvalidate() +type SphereName = string +type SpellName = string +type DeityName = string +type Spell = { name: SpellName; level: int; spheres: SphereName list } + with + override this.ToString() = + let level = match this.level with 1 -> "1st" | 2 -> "2nd" | 3 -> "3rd" | n -> $"{n}th" + $"""{this.name} ({level} level {this.spheres |> String.concat "/"})""" +type Sphere = { name: SphereName; spells: Spell list } +type AccessLevel = Major | Minor +type SphereAccess = { sphere: SphereName; access: AccessLevel } +type Deity = { name: DeityName; spheres: SphereAccess list } +let consolidateSpells spheres = + // return a list of spells, not spheres, with no duplicates and with all spheres for a given spell linked to it + let spells = spheres |> List.collect (fun sphere -> sphere.spells) |> List.groupBy (fun spell -> spell.name) + [ for _, group in spells do + let spheres = group |> List.collect (fun spell -> spell.spheres) |> List.distinct + { group[0] with spheres = spheres } + ] +let consolidateSpheres (spells: Spell list) spheres = + let spells = spells |> List.map (fun spell -> spell.name, spell) |> Map.ofList + spheres |> List.map (fun sphere -> { sphere with spells = sphere.spells |> List.map (fun spell -> spells.[spell.name]) }) +let spheres = """ +All: Bless 1, Combine 1, Detect Evil 1, Purify Food & Drink 1, Atonement 5 +Animal: Animal Friendship 1, Invisibility to Animals 1, Locate Animals or Plants 1, Charm Person or Mammal 2, Messenger 2, + Snake Charm 2, Speak With Animals 2, Hold Animal 3, Summon Insects 3, Animal Summoning I 4, Call Woodland Beings 4, + Giant Insect 4, Repel Insects 4, Animal Growth 5, Animal Summoning II 5, Animal Summoning III 6, Anti-Animal Shell 6, Creeping Doom 7 +Astral: Plane Shift 5, Astral Spell 7 +Charm: Command 1, Remove Fear 1, Enthrall 2, Hold Person 2, Cloak of Bravery 4, Free Action 4, Imbue With Spell Ability 4, Quest 5, Confusion 7, Exaction 7 +Combat: Magical Stone 1, Shillelagh 1, Chant 2, Spiritual Hammer 2, Prayer 3, Flame Strike 5, Insect Plague 5, Holy Word 7 +Creation: Create Food & Water 3, Animate Object 6, Blade Barrier 6, Heroes' Feast 6, Wall of Thorns 6, Changestaff 7, Chariot of Sustarre 7 +Divination: Detect Magic 1, Detect Poison 1, Detect Snares & Pits 1, Locate Animals or Plants 1, Augury 2, Detect Charm 2, Find Traps 2, + Know Alignment 2, Speak With Animals 2, Locate Object 3, Speak With Dead 3, Detect Lie 4, Divination 4, Reflecting Pool 4, Tongues 4, Commune 5, + Commune With Nature 5, Magic Font 5, True Seeing 5, Find the Path 6, Speak With Monsters 6 +Elemental: Create Water 1, Dust Devil 2, Fire Trap 2, Flame Blade 2, Heat Metal 2, Produce Flame 2, Flame Walk 3, Meld Into Stone 3, Protection From Fire 3, + Pyrotechnics 3, Stone Shape 3, Water Breathing 3, Water Walk 3, Lower Water 4, Produce Fire 4, Air Walk 5, Commune With Nature 5, Spike Stones 5, Transmute Rock to Mud 5, + Wall of Fire 5, Conjure Fire Elemental 6, Fire Seeds 6, Part Water 6, Stone Tell 6, Transmute Water to Dust 6, Animate Rock 7, Chariot of Sustarre 7, Conjure Earth Elemental 7, + Earthquake 7, Fire Storm 7, Transmute Metal to Wood 7, Wind Walk 7 +Guardian: Silence 2, Wyvern Watch 2, Glyph of Warding 3, Blade Barrier 6, Symbol 7 +Healing: Cure Light Wounds 1, Slow Poison 2, Cure Serious Wounds 4, Neutralize Poison 4, Cure Critical Wounds 5, Heal 6 +Necromantic: Invisibility to Undead 1, Aid 2, Animate Dead 3, Cure Blindness or Deafness 3, Cure Disease 3, Feign Death 3, Negative Plane Protection 3, Raise Dead 5, + Regenerate 7, Reincarnate 7, Restoration 7, Resurrection 7 +Plant: Entangle 1, Pass Without Trace 1, Shillelagh 1, Barksin 2, Goodberry 2, Trip 2, Warp Wood 2, Plant Growth 3, Snare 3, Spike Growth 3, Tree 3, Hallucinatory Forest 4, + Hold Plant 4, Plant Door 4, Speak With Plants 4, Sticks to Snakes 4, Anti-Plant Shell 5, Pass Plant 5, Liveoak 6, Transport Via Plants 6, Turn Wood 6, Wall of Thorns 6, Changestaff 7 +Protection: Endure Cold 1, Endure Heat 1, Protection From Evil 1, Sanctuary 1, Barkskin 2, Resist Fire 2, Resist Cold 2, Withdraw 2, Dispel Magic 3, Magical Vestment 3, + Negative Plane Protection 3, Protection From Fire 3, Remove Curse 3, Remove Paralysis 3, Protection From Evil 10' Radius 4, Protection From Lightning 4, Repel Insects 4, + Spell Immunity 4, Anti-Plant Shell 5, Dispel Evil 5, Anti-Animal Shell 6 +Summoning: Abjure 4, Animal Summoning I 4, Call Woodland Beings 4, Animal Summoning II 5, Dispel Evil 5, Aerial Servant 6, Animal Summoning III 6, Animate Objects 6, Conjure Animals 6, + Wall of Thorns 6, Weather Summoning 6, Word of Recall 6, Conjure Earth Elemental 7, Creeping Doom 7, Exaction 7, Gate 7, Succor 7 +Sun: Light 1, Continual Light 3, Starshine 3, Moonbeam 5, Rainbow 5, Sunray 7 +Weather: Faerie Fire 1, Obscurement 2, Call Lightning 3, Control Temperature 10' Radius 4, Protection From Lightning 4, Control Winds 5, Rainbow 5, Weather Summoning 6, Control Weather 7 +""" +module private Parser = + // #load @"c:\code\rpg\src\Core\Common.fs" + // #load @"c:\code\rpg\src\Core\CQRS.fs" + // #load @"c:\code\rpg\src\Core\Coroutine.fs" + // #load @"c:\code\rpg\src\Core\Packrat.fs" + open Packrat + let (|SpellLevel|_|) = function + | OWS(Int(n, ((Char((',' | '\n' | '\r'), _) | End) as rest))) -> Some(n, rest) + | _ -> None + let (|NameChunk|_|) = + let chars = alphanumeric + Set.ofList ['\''; ','; '&'; '-';] // e.g. Protection From Evil, 10' Radius has a comma and an apostrophe; some spells have Food & Water or Anti-Plant + function + | SpellLevel _ -> None // spell level takes priority over NameChunk; don't mistake a " 1" for " 10' Radius" + | OWS(Chars chars (v, OWS rest)) -> Some(v, rest) + | _ -> None + let rec (|Names|_|) = pack <| function + | NameChunk(lhs, Names(rhs, rest)) -> Some(lhs + " " + rhs, rest) + | NameChunk(v, rest) -> Some(v, rest) + | _ -> None + let rec (|Spell|_|) = function + | Names(name, SpellLevel(level, rest)) -> Some({ name = name; level = level; spheres = [] }, rest) + | _ -> None + let rec (|Spells|_|) = pack <| function + | Spell(lhs, Str "," (Spells(rhs, rest))) -> Some(lhs :: rhs, rest) + | Spell(v, rest) -> Some([v], rest) + | _ -> None + let rec (|Sphere|_|) = function + | Names(sphereName, Str ":" (Spells(spells, rest))) -> Some( { name = sphereName; spells = spells |> List.map (fun spell -> { spell with spheres = [sphereName] }) }, rest) + | _ -> None + let rec (|Spheres|_|) = function + | Sphere(lhs, OWS (Spheres(rhs, rest))) -> Some(lhs::rhs, rest) + | Sphere(v, rest) -> Some([v], rest) + | _ -> None + // let partial (|Recognizer|_|) txt = match ParseArgs.Init txt with | Recognizer(v, _) -> v + // let partialR (|Recognizer|_|) txt = match ParseArgs.Init txt with | Recognizer(v, (input, pos)) -> v, input.input.Substring pos + // partial (|Spheres|_|) spheres |> List.collect _.spells |> List.filter (fun spell -> spell.name = "Chariot of Sustarre") + // partial (|Spheres|_|) spheres |> fun spheres -> (consolidateSpells spheres) |> List.filter (fun spell -> spell.name = "Chariot of Sustarre") + // partial (|Spheres|_|) spheres |> fun spheres -> spheres |> consolidateSpheres (consolidateSpells spheres) |> List.filter (fun sphere -> sphere.name = "Plant") |> List.collect _.spells |> List.map _.ToString() + // |> String.join ", " +module Storage = + open LocalStorage + module Spheres = + let key = "Spheres" + let cacheRead, cacheInvalidate = Cache.create() + let read (): Sphere list = + cacheRead (thunk2 read key (fun () -> Packrat.parser Parser.(|Spheres|_|) (spheres.Trim()) |> fun spheres -> spheres |> consolidateSpheres (consolidateSpells spheres))) + let write (v: Sphere list) = + write key v + cacheInvalidate() + module Notes = + let key = "Notes" + let cacheRead, cacheInvalidate = Cache.create() + let read (): Map = + cacheRead (thunk2 read key (thunk Map.empty)) + let write (v: Map) = + write key v + cacheInvalidate() + module Deities = + let key = "Deities" + let cacheRead, cacheInvalidate = Cache.create() + let read (): Deity list = + cacheRead (thunk2 read key (thunk [])) + let write (v: Deity list) = + write key v + cacheInvalidate() + module SpellPicks = + let key = "Picks" + let cacheRead, cacheInvalidate = Cache.create() + let read (): Map = + cacheRead (thunk2 read key (thunk Map.empty)) + let write (v: Map) = + write key v + cacheInvalidate() -module Impl = - open Data - type Options = { spells: Spell list; notes: Map; spheres: Sphere list; deities: Deity list } - type Model = { options: Options; picks: Map } - type Msg = NoOp - let init() = - let spheres = Storage.Spheres.read() - let options = { spells = consolidateSpells spheres; notes = Storage.Notes.read(); spheres = spheres; deities = Storage.Deities.read() } - { options = options; picks = Storage.SpellPicks.read() } - let update msg model = model - let filteredSpells (filter: string) (model: Model) = - match filter.Trim() with - | "" -> model.options.spells - | filter -> - let fragments = filter.Split(' ') |> List.ofArray - model.options.spells |> List.filter (fun spell -> fragments |> List.every (fun fragment -> String.containsIgnoreCase (spell.ToString()) fragment)) -open Impl +type Options = { spells: Spell list; notes: Map; spheres: Sphere list; deities: Deity list } +type Model = { options: Options; picks: Map } +type Msg = NoOp +let init() = + let spheres = Storage.Spheres.read() + let options = { spells = consolidateSpells spheres; notes = Storage.Notes.read(); spheres = spheres; deities = Storage.Deities.read() } + { options = options; picks = Storage.SpellPicks.read() } +let update msg model = model +let filteredSpells (filter: string) (model: Model) = + match filter.Trim() with + | "" -> model.options.spells + | filter -> + let fragments = filter.Split(' ') |> List.ofArray + model.options.spells |> List.filter (fun spell -> fragments |> List.every (fun fragment -> String.containsIgnoreCase (spell.ToString()) fragment)) -[] -let View() = - let model, dispatch = React.useElmishSimple init update - let filter, setFilter = React.useState "" - Html.div [ - Html.h1 "Priest Spells" - Html.input [ - prop.value filter - prop.placeholder "Spell name, sphere or deity" - prop.onChange (fun txt -> setFilter txt) - ] - Html.ul [ - for spell in filteredSpells filter model do - Html.li [ - Html.span [ - prop.text (spell.ToString()) - ] - Html.span [ - prop.text (match model.picks.TryFind(spell.name) with Some(n) -> $" ({n})" | None -> "") - ] - ] - ] - ] diff --git a/src/UI/Components/PriestSpellsView.fs b/src/UI/Components/PriestSpellsView.fs new file mode 100644 index 0000000..bb6458d --- /dev/null +++ b/src/UI/Components/PriestSpellsView.fs @@ -0,0 +1,29 @@ +// separate from UI.Priestspells for the sake of HMR. +module UI.PriestSpellsView + +open Feliz +open UI.PriestSpells + +[] +let View() = + let model, dispatch = React.useElmishSimple init update + let filter, setFilter = React.useState "" + Html.div [ + Html.h1 "Priest Spells" + Html.input [ + prop.value filter + prop.placeholder "Spell name, sphere or deity" + prop.onChange (fun txt -> setFilter txt) + ] + Html.ul [ + for spell in filteredSpells filter model do + Html.li [ + Html.span [ + prop.text (spell.ToString()) + ] + Html.span [ + prop.text (match model.picks.TryFind(spell.name) with Some(n) -> $" ({n})" | None -> "") + ] + ] + ] + ]