pf2e-sage-stats 0.2.5 → 0.2.6

package/README.md

@@ -4,104 +4,118 @@ sage! macro set name=flat dice="[{o:m} d20 >= {0} flat {...}]" cat=Misc tier=Ser
 ```
 ### Strikes
 ```
-sage! macro set name="melee" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::melee.{s:default}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::melee.{s:default}.desc:} {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`({c:+0} AC) `} {ac} {utils::{t:known}:ac} {{t:none}::{r:ac}:} {c} {{p}::melee.{s:default}.damage:} {...}]" cat=Strikes tier=Server -y
+sage! macro set name="melee" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::melee.{s:default}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::melee.{s:default}.desc:} {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`({c:+0} AC) `} {ac} {utils::{t:known}:ac} {{t:none}::{r:ac}:} {c} {{p}::melee.{s:default}.damage:} {...}]" cat=Strikes tier=Server -y
 ```
 ```
-sage! macro set name="ranged" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::ranged.{s:default}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::ranged.{s:default}.desc:} {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`({c:+0} AC) `} {ac} {utils::{t:known}:ac} {{t:none}::{r:ac}:} {c} {{p}::ranged.{s:default}.damage:} {...}]" cat=Strikes tier=Server -y
+sage! macro set name="ranged" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::ranged.{s:default}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::ranged.{s:default}.desc:} {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`({c:+0} AC) `} {ac} {utils::{t:known}:ac} {{t:none}::{r:ac}:} {c} {{p}::ranged.{s:default}.damage:} {...}]" cat=Strikes tier=Server -y
 ```
 ```
-sage! macro set name="spell" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::spells:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) Spell Attack {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`({c:+0} AC) `} {ac} {utils::{t:known}:ac} {{t:none}::{r:ac}:} {c} {...}]" cat=Strikes tier=Server -y
+sage! macro set name="spell" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::spells:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) Spell Attack {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`({c:+0} AC) `} {ac} {utils::{t:known}:ac} {{t:none}::{r:ac}:} {c} {...}]" cat=Strikes tier=Server -y
 ```
 ### Saves
 ```
-sage! macro set name="fort" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::fort:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::fort.info:} Fortitude Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
+sage! macro set name="fort" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::fort:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::fort.info:} Fortitude Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
 ```
 ```
-sage! macro set name="fortitude" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::fort:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::fort.info:} Fortitude Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
+sage! macro set name="fortitude" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::fort:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::fort.info:} Fortitude Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
 ```
 ```
-sage! macro set name="ref" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::reflex:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::reflex.info:} Reflex Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
+sage! macro set name="ref" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::reflex:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::reflex.info:} Reflex Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
 ```
 ```
-sage! macro set name="reflex" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::reflex:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::reflex.info:} Reflex Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
+sage! macro set name="reflex" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::reflex:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::reflex.info:} Reflex Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
 ```
 ```
-sage! macro set name="will" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::will:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::will.info:} Will Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
+sage! macro set name="will" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::will:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::will.info:} Will Save {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Saves tier=Server -y
 ```
 ### Initiative
 ```
-sage! macro set name="init" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::{s:Perception}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::initiative.info:} Initiative `({s:Perception}) `{...}]" cat=Initiative tier=Server -y
+sage! macro set name="init" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::{s:Perception}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::initiative.info:} Initiative `({s:Perception}) `{...}]" cat=Initiative tier=Server -y
 ```
 ```
-sage! macro set name="initiative" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::{s:Perception}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::initiative.info:} Initiative `({s:Perception}) `{...}]" cat=Initiative tier=Server -y
+sage! macro set name="initiative" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::{s:Perception}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::initiative.info:} Initiative `({s:Perception}) `{...}]" cat=Initiative tier=Server -y
 ```
-### Skills
+### Skills 1
 ```
-sage! macro set name="acrobatics" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::acrobatics:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::acrobatics.info:} Acrobatics Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="acrobatics" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::acrobatics:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::acrobatics.info:} Acrobatics Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="arcana" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::arcana:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::arcana.info:} Arcana Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="arcana" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::arcana:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::arcana.info:} Arcana Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="athletics" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::athletics:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::athletics.info:} Athletics Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="athletics" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::athletics:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::athletics.info:} Athletics Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="crafting" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::crafting:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::crafting.info:} Crafting Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="crafting" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::crafting:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::crafting.info:} Crafting Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="craft" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::crafting:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::crafting.info:} Crafting Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="craft" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::crafting:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::crafting.info:} Crafting Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
+### Skills 2
 ```
-sage! macro set name="deception" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::deception:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::deception.info:} Deception Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="deception" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::deception:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::deception.info:} Deception Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="diplomacy" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::diplomacy:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::diplomacy.info:} Diplomacy Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="diplomacy" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::diplomacy:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::diplomacy.info:} Diplomacy Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="intimidation" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::intimidation:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::intimidation.info:} Intimidation Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="intimidation" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::intimidation:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::intimidation.info:} Intimidation Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="medicine" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::medicine:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::medicine.info:} Medicine Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="medicine" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::medicine:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::medicine.info:} Medicine Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="nature" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::nature:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::nature.info:} Nature Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="nature" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::nature:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::nature.info:} Nature Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
+### Skills 3
 ```
-sage! macro set name="occultism" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::occultism:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::occultism.info:} Occultism Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="occultism" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::occultism:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::occultism.info:} Occultism Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="performance" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::performance:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::performance.info:} Performance Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="performance" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::performance:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::performance.info:} Performance Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="perfomance" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::performance:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::performance.info:} Performance Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="perfomance" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::performance:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::performance.info:} Performance Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="religion" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::religion:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::religion.info:} Religion Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="religion" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::religion:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::religion.info:} Religion Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="society" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::society:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::society.info:} Society Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="society" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::society:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::society.info:} Society Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
+### Skills 4
 ```
-sage! macro set name="stealth" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::stealth:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::stealth.info:} Stealth Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="stealth" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::stealth:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::stealth.info:} Stealth Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="survival" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::survival:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::survival.info:} Survival Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="survival" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::survival:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::survival.info:} Survival Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="thievery" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::thievery:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::thievery.info:} Thievery Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="thievery" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::thievery:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::thievery.info:} Thievery Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="perception" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::perception:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::perception.info:} Perception Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="perception" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::perception:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::perception.info:} Perception Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="lore" dice="[{{p}::out:m} {flat::{f:none}:} {d:1}d20+{{p}::lore.{0}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::lore.{0}.info:} {{p}::lore.{0}.name:} Lore Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="lore" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::lore.{0}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::lore.{0}.info:} {{p}::lore.{0}.name:} Lore Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
+### Skills 5
 ```
-sage! macro set name="assurance" dice="[{{p}::out:m} {flat::{f:none}:} (10)d20+{0:0}-10 {v} {{p}::name:} Assurance Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="assurance" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} (10)d20+{0:0}-10 {v} {{p}::name:} Assurance Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="skill" dice="[{{p}::out:m} {flat::{f:none}:} d20+{0:0} {v} {{p}::name:} Skill Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="skill" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} d20+{0:0} {v} {{p}::name:} Skill Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
 ```
 ```
-sage! macro set name="secret" dice="[{{p}::out:m} {flat::{f:none}:} d20+{{p}::{0}:{a:0}} {v} {{p}::name:} Secret {0} Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+sage! macro set name="secret" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} d20+{{p}::{0}:{a:0}} {v} {{p}::name:} Secret {0} Check {utils::{t:known}:vs} {{t:none}::name:} {utils::{t:known}:`{r:Spell} DC ({c:+0} DC) `} {dc} {utils::{t:known}:dc} {{t:none}::dc.{r:spells}:} {c} {...}]" cat=Skills tier=Server -y
+```
+### Legacy
+```
+sage! macro set name="mstrike" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::melee.{s:default}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::melee.{s:default}.desc:} vs {{0}::name:} `({c:+0} AC) ` ac {{0}::{r:ac}:} {c} {{p}::melee.{s:default}.damage:} {...}]" cat=Strikes tier=Server -y
+```
+```
+sage! macro set name="rstrike" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::ranged.{s:default}:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) {{p}::ranged.{s:default}.desc:} vs {{0}::name:} `({c:+0} AC) ` ac {{0}::{r:ac}:} {c} {{p}::ranged.{s:default}.damage:} {...}]" cat=Strikes tier=Server -y
+```
+```
+sage! macro set name="sstrike" dice="[{{p}::{o:out}:{o:m}} {x} {flat::{f:none}:{f}} {dice::{d:none}:{d:1}}d20+{{p}::spells:{a:0}} {m} {v} {{p}::name:} (mod `{m:+0}`) Spell Attack vs {{0}::name:} `({c:+0} AC) ` ac {{0}::{r:ac}:} {c} {...}]" cat=Strikes tier=Server -y
 ```

package/dist/app.js

@@ -12,13 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortFolder = exports.formatTracker = exports.newtracker = exports.formatHP = exports.formatTable = exports.formatCommand = exports.formatTSV = exports.flatten = exports.parseStatblock = exports.parseTracker = exports.parseJSON = exports.formatJSON = exports.fromatMap = exports.adjustmentMap = exports.prediceateMap = exports.stub = void 0;
+exports.screenPlay = exports.sortFolder = exports.formatTracker = exports.newtracker = exports.formatHP = exports.formatTable = exports.formatCommand = exports.formatTSV = exports.flatten = exports.parseStatblock = exports.parseTracker = exports.parseJSON = exports.formatJSON = exports.fromatMap = exports.diceMap = exports.flatMap = exports.stub = void 0;
 const zod_1 = __importDefault(require("zod"));
 const tsv_1 = require("tsv");
 const lodash_1 = require("lodash");
 const dedent_js_1 = __importDefault(require("dedent-js"));
 const abbreviate_1 = __importDefault(require("abbreviate"));
 const pluralize_1 = __importDefault(require("pluralize"));
+const jsdom_1 = require("jsdom");
 const promises_1 = require("fs/promises");
 const schema = zod_1.default.object({
     name: zod_1.default.string(),
@@ -201,16 +202,8 @@ const charSchema = zod_1.default.object({
     conditions: zod_1.default.string().default(''),
     children: zod_1.default.array(childSchema).default([]),
 });
-exports.prediceateMap = Object.assign(Object.assign({}, ([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20].map((v) => ([`${v}`, `d20 >= ${v} flat;`])).reduce((p, [k, v]) => { p[k] = v; return p; }, {}))), { c: 'd20 >= 5 flat;', concealed: 'd20 >= 5 flat;', h: 'd20 >= 11 flat;', hidden: 'd20 >= 11 flat;' });
-const adjustmentMap = () => ({
-    'incredibly-easy': '`(Incredibly Easy)`',
-    'very-easy': '`(Very Easy)`',
-    'easy': '`(Easy)`',
-    'hard': '`(Hard)`',
-    'very-hard': '`(Very Easy)`',
-    'incredibly-hard': '`(Incredibly Hard)`',
-});
-exports.adjustmentMap = adjustmentMap;
+exports.flatMap = Object.assign(Object.assign({}, ([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20].map((v) => ([`${v}`, `d20 >= ${v} flat;`])).reduce((p, [k, v]) => { p[k] = v; return p; }, {}))), { c: 'd20 >= 5 flat;', concealed: 'd20 >= 5 flat;', h: 'd20 >= 11 flat;', hidden: 'd20 >= 11 flat;' });
+exports.diceMap = Object.assign(Object.assign({}, ([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20].map((v) => ([`${v}`, `(${v})`])).reduce((p, [k, v]) => { p[k] = v; return p; }, {}))), { a: '+2', adv: '+2', advantage: '+2', d: '-2', dis: '-2', disadvantage: '-2', f: '+2', for: '+2', fort: '+2', fortune: '+2', m: '-2', mis: '-2', misfortune: '-2' });
 const fromatMap = (name, map) => {
     return tsv_1.TSV.stringify([Object.assign({ name }, map)]);
 };
@@ -283,10 +276,7 @@ const locateStrikes = (statblock, alias) => {
                 .replace(/\+\d/g, '')
                 .replace(/Weapon\s+Striking(\s+\((Greater|Major)\))?/gi, '')
                 .replace(/((Greater|Major)\s+)?Striking/gi, '')
-                .replace(/\(Agile\)/gi, '')
-                .replace(/\(Finesse\)/gi, '')
-                .replace(/\(\+\)/gi, '')
-                .replace(/\(\)/gi, '')
+                .replace(/\(.*\)/gi, '')
                 .replace(/\s+/g, ' ')
                 .trim();
             const bps = /(?<=[^\w']|^)[BbPpSs](?=[^\w]|$)/g;
@@ -305,6 +295,8 @@ const locateStrikes = (statblock, alias) => {
                 .replace(/Electricity/, 'electricity')
                 .replace(/Sonic/, 'sonic')
                 .replace(/Spirit/, 'spirit')
+                .replace(/Acid/, 'acid')
+                .replace(/[pP]lus\s(\d+d)/, '+$1')
                 .trim();
             const twoHand = _traits.match(/(two-hand|two-handed)\s+(d\d+)/);
             if (twoHand && twoHand[2]) {
@@ -379,17 +371,7 @@ const toRanged = ([key, value]) => [
     [`ranged.${key}.desc`, value.desc],
     ...(value.damage ? [[`ranged.${key}.damage`, value.damage]] : []),
 ];
-const recallDCs = (level, secret, bump) => ((value) => [
-    ['dc.recall.incredibly-easy', secret ? `||${value - 10}||` : `${value - 10}`],
-    ['dc.recall.very-easy', secret ? `||${value - 5}||` : `${value - 5}`],
-    ['dc.recall.easy', secret ? `||${value - 2}||` : `${value - 2}`],
-    ['dc.recall.default', secret ? `||${value}||` : `${value}`],
-    ['dc.recall', secret ? `||${value}||` : `${value}`],
-    ['dc.recall.hard', secret ? `||${value + 2}||` : `${value + 2}`],
-    ['dc.recall.very-hard', secret ? `||${value + 5}||` : `${value + 5}`],
-    ['dc.recall.incredibly-hard', secret ? `||${value + 10}||` : `${value + 10}`],
-])(dcByLevel[Math.max(Math.min(level + 1, dcByLevel.length - 1), 0)] + bump);
-const flatten = (stats, secretDC = false, defaultSkills = false, recallDC = false) => {
+const flatten = (stats, secretDC = false, defaultSkills = false) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const untrained = stats.untrained;
     const skills = defaultSkills ? Object.assign({ acrobatics: untrained + stats.attributes.dexterity, arcana: untrained + stats.attributes.intelligence, athletics: untrained + stats.attributes.strength, crafting: untrained + stats.attributes.intelligence, deception: untrained + stats.attributes.charisma, diplomacy: untrained + stats.attributes.charisma, intimidation: untrained + stats.attributes.charisma, medicine: untrained + stats.attributes.wisdom, nature: untrained + stats.attributes.wisdom, occultism: untrained + stats.attributes.intelligence, performance: untrained + stats.attributes.charisma, religion: untrained + stats.attributes.wisdom, society: untrained + stats.attributes.intelligence, stealth: untrained + stats.attributes.dexterity, survival: untrained + stats.attributes.wisdom, thievery: untrained + stats.attributes.dexterity }, stats.skills) : stats.skills;
@@ -469,9 +451,6 @@ const flatten = (stats, secretDC = false, defaultSkills = false, recallDC = fals
             ...(0, lodash_1.entries)(skills).map(mod2DC(true, ((_m = stats.bump.skills) !== null && _m !== void 0 ? _m : stats.bump.default))),
             ...(0, lodash_1.entries)(stats.extra).map(mod2DC(true, stats.bump.default)),
         ] : []),
-        ...(recallDC ? [
-            ...recallDCs(stats.level, secretDC, stats.bump.default),
-        ] : []),
         ...(stats.perceptionInfo.length > 0 ? [
             [`perception.info`, `\`(${stats.perceptionInfo.join(', ')})\``]
         ] : []),
@@ -484,9 +463,9 @@ const flatten = (stats, secretDC = false, defaultSkills = false, recallDC = fals
     ].reduce((p, [key, value]) => { p[key] = value; return p; }, {});
 };
 exports.flatten = flatten;
-const formatTSV = (stats, secretDC = false, defaultSkills = false, recallDC = false) => (tsv_1.TSV.stringify([(0, exports.flatten)(stats, secretDC, defaultSkills, recallDC)]));
+const formatTSV = (stats, secretDC = false, defaultSkills = false) => (tsv_1.TSV.stringify([(0, exports.flatten)(stats, secretDC, defaultSkills)]));
 exports.formatTSV = formatTSV;
-const formatCommand = (stats, secretDC = false, defaultSkills = false, recallDC = false) => (Object.entries((0, exports.flatten)(stats, secretDC, defaultSkills, recallDC)).map(([k, v]) => `${k}="${v}"`).join(' '));
+const formatCommand = (stats, secretDC = false, defaultSkills = false) => (Object.entries((0, exports.flatten)(stats, secretDC, defaultSkills)).map(([k, v]) => `${k}="${v}"`).join(' '));
 exports.formatCommand = formatCommand;
 const formatTable = (table, season, scenario, _name, gm, players) => {
     const name = _name.replace(/[\s-_]/g, ' ').replace(/[^a-zA-Z0-9 ]/g, '');
@@ -497,7 +476,7 @@ const formatTable = (table, season, scenario, _name, gm, players) => {
     @TableBot create "${gameName}" --gm ${gm} --players ${players} --table-name ${tableName} --ooc-table-name ooc-${tableName} --category Game Tables
     \`\`\`
     \`\`\`
-    sage! game create name="${gameName}" gameSystem="pf2e" ic=" #${tableName} " ooc=" #ooc-${tableName} " gms=" ${gm} " players=" @${gameName} " dialogPost="post" diceSecret="gm" diceCrit="timestwo" diceOutput=M gmCharName="Хронист" diceSecret="gm"
+    sage! game create name="${gameName}" gameSystem="pf2e" ic=" #${tableName} " ooc=" #ooc-${tableName} " gms=" ${gm} " players=" @${gameName} " dialogPost="post" diceSecret="gm" diceCrit="timestwo" diceOutput=M gmCharName="Хронист"
     \`\`\`
   `;
 };
@@ -550,8 +529,10 @@ const newtracker = (status) => {
 };
 exports.newtracker = newtracker;
 const formatTracker = (tracker) => {
+    const aliasSpace = (t) => (t.alias.length > 0 ? 0 : 5);
+    const nameLengthWithAlias = (t) => t.name.length - aliasSpace(t);
     const nameLength = tracker.reduce((p, c) => {
-        const length = c.children.reduce((pp, cc) => pp > cc.name.length ? pp : cc.name.length, c.name.length);
+        const length = c.children.reduce((pp, cc) => pp > nameLengthWithAlias(cc) ? pp : nameLengthWithAlias(cc), nameLengthWithAlias(c));
         return p > length ? p : length;
     }, 0);
     const hpLength = tracker.reduce((p, c) => {
@@ -580,15 +561,15 @@ const formatTracker = (tracker) => {
         if (tracker[index - 1] && tracker[index - 1].foe !== char.foe) {
             ls.push('');
         }
-        const hp = char.foe ? (`-${char.maxhp - char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}`.padStart(hpLength)) : (`${char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}/${char.maxhp}`.padStart(hpLength));
+        const hp = !char.foe && char.hp > 0 ? (`${char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}/${char.maxhp}`.padStart(hpLength)) : char.hp > 0 ? (`-${char.maxhp - char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}`.padStart(hpLength)) : (`${char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}`.padStart(hpLength));
         const hpBar = (value, max) => (value <= 0 ? (':crossed:') : value >= max ? (':healthy:') : (hpMap[Math.round((hpMap.length - 1) * value / max)]));
-        ls.push((`${stateMap[char.state]}**\` ${char.name.padEnd(nameLength)} ▏${char.alias.padEnd(3)} ▏${hp} \`** ${hpBar(char.hp, char.maxhp)} `));
+        ls.push((`${stateMap[char.hp > 0 ? char.state : 'cross']}**\` ${char.name.padEnd(nameLength + aliasSpace(char))}${char.alias.length > 0 ? ` ▏${char.alias.padEnd(3)}` : ''} ▏${hp} \`** ${hpBar(char.hp, char.maxhp)} `));
         if (char.conditions.length > 0) {
             ls.push(`-# ${char.conditions}`);
         }
         for (const child of char.children) {
-            const hhp = char.foe ? (`-${child.maxhp - child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}`.padStart(hpLength)) : (`${child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}/${child.maxhp}`.padStart(hpLength));
-            ls.push((`:smallnode:**\` ${child.name.padEnd(nameLength)} ▏${child.alias.padEnd(3)} ▏${hhp} \`** ${hpBar(child.hp, child.maxhp)} `));
+            const hhp = !char.foe && child.hp > 0 ? (`${child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}/${child.maxhp}`.padStart(hpLength)) : child.hp > 0 ? (`-${child.maxhp - child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}`.padStart(hpLength)) : (`${child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}`.padStart(hpLength));
+            ls.push((`:smallnode:**\` ${child.name.padEnd(nameLength + aliasSpace(child))}${child.alias.length > 0 ? ` ▏${child.alias.padEnd(3)}` : ''} ▏${hhp} \`** ${hpBar(child.hp, child.maxhp)} `));
             if (child.conditions.length > 0) {
                 ls.push(`-# ${child.conditions}`);
             }
@@ -615,3 +596,40 @@ const sortFolder = () => __awaiter(void 0, void 0, void 0, function* () {
     return transformed;
 });
 exports.sortFolder = sortFolder;
+const screenPlay = (htmlContent) => {
+    const dom = new jsdom_1.JSDOM(htmlContent);
+    const document = dom.window.document;
+    const outputLines = [];
+    const preambleEntry = document.querySelector('.preamble__entry');
+    if (preambleEntry) {
+        outputLines.push(`SCENE: ${preambleEntry.textContent}`);
+        outputLines.push('');
+    }
+    // Process all chatlog messages
+    const messages = document.querySelectorAll('.chatlog__message');
+    messages.forEach(message => {
+        var _a, _b, _c, _d;
+        const authorElement = message.querySelector('.chatlog__author');
+        const contentElement = message.querySelector('.chatlog__content');
+        if (!authorElement || !contentElement)
+            return;
+        const author = (_b = (_a = authorElement.textContent) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '';
+        const content = (_d = (_c = contentElement.textContent) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : '';
+        // Skip bot tags in character names
+        const characterName = author.replace(/\s*BOT$/, '');
+        // Add character line
+        outputLines.push(`${characterName.toUpperCase()}`);
+        // Add dialogue/content (wrap long lines)
+        const lines = content.split('\n').map((c) => (c
+            .replace(/(—|--)/g, '-')
+            // eslint-disable-next-line no-irregular-whitespace
+            .replace(/(​|​)/g, '')
+            .trim())).filter((c) => c.length);
+        for (const line of lines) {
+            outputLines.push(`  ${line}`);
+        }
+        outputLines.push('');
+    });
+    return outputLines.join('\n');
+};
+exports.screenPlay = screenPlay;

package/dist/index.js

@@ -24,6 +24,7 @@ const commander_1 = require("commander");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const readline_1 = __importDefault(require("readline"));
+const clipboardy_1 = __importDefault(require("clipboardy"));
 const package_json_1 = __importDefault(require("../package.json"));
 const app_1 = require("./app");
 const program = new commander_1.Command(package_json_1.default.name);
@@ -71,6 +72,19 @@ program.command('sort')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     console.log(yield (0, app_1.sortFolder)());
 }));
+program.command('convert')
+    .description('Convert a discord export file into a txt log')
+    .argument('<file>', 'input file')
+    .option('-o, --output <file>', 'output file')
+    .action((argument, option) => __awaiter(void 0, void 0, void 0, function* () {
+    const file = yield promises_1.default.readFile(argument, { encoding: 'utf-8' });
+    if (option.output) {
+        yield promises_1.default.writeFile(option.output, (0, app_1.screenPlay)(file), { encoding: 'utf-8' });
+    }
+    else {
+        console.log((0, app_1.screenPlay)(file));
+    }
+}));
 program.command('flat')
     .description('Generte a special flat npc tsv')
     .option('-n, --name <string>', 'npc name')
@@ -78,23 +92,23 @@ program.command('flat')
     .action((option) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     if (option.output) {
-        yield promises_1.default.writeFile(option.output, (0, app_1.fromatMap)((_a = option.name) !== null && _a !== void 0 ? _a : 'flat', app_1.prediceateMap), { encoding: 'utf-8' });
+        yield promises_1.default.writeFile(option.output, (0, app_1.fromatMap)((_a = option.name) !== null && _a !== void 0 ? _a : 'flat', app_1.flatMap), { encoding: 'utf-8' });
     }
     else {
-        console.log((0, app_1.fromatMap)((_b = option.name) !== null && _b !== void 0 ? _b : 'flat', app_1.prediceateMap));
+        console.log((0, app_1.fromatMap)((_b = option.name) !== null && _b !== void 0 ? _b : 'flat', app_1.flatMap));
     }
 }));
-program.command('adjustment')
-    .description('Generte a special adjustment npc tsv')
+program.command('dice')
+    .description('Generte a special dice npc tsv')
     .option('-n, --name <string>', 'npc name')
     .option('-o, --output <file>', 'output json')
     .action((option) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     if (option.output) {
-        yield promises_1.default.writeFile(option.output, (0, app_1.fromatMap)((_a = option.name) !== null && _a !== void 0 ? _a : 'adjustment', (0, app_1.adjustmentMap)()), { encoding: 'utf-8' });
+        yield promises_1.default.writeFile(option.output, (0, app_1.fromatMap)((_a = option.name) !== null && _a !== void 0 ? _a : 'dice', app_1.diceMap), { encoding: 'utf-8' });
     }
     else {
-        console.log((0, app_1.fromatMap)((_b = option.name) !== null && _b !== void 0 ? _b : 'adjustment', (0, app_1.adjustmentMap)()));
+        console.log((0, app_1.fromatMap)((_b = option.name) !== null && _b !== void 0 ? _b : 'dice', app_1.diceMap));
     }
 }));
 program.command('statblock')
@@ -131,26 +145,24 @@ program.command('tsv')
     .argument('<file>', 'input json')
     .option('-o, --output <file>', 'output tsv')
     .option('-s, --secretDC', 'produce secret DCs')
-    .option('-r, --recallDC', 'produce recall DCs')
     .option('-d, --defaultSkills', 'produce values for untrained skills')
     .action((argument, option) => __awaiter(void 0, void 0, void 0, function* () {
     const file = yield promises_1.default.readFile(argument, { encoding: 'utf-8' });
     const stats = (0, app_1.parseJSON)(file);
     const output = option.output ? option.output : path_1.default.join(path_1.default.parse(argument).dir, path_1.default.parse(argument).name + '.tsv');
-    yield promises_1.default.writeFile(output, (0, app_1.formatTSV)(stats, option.secretDC, option.defaultSkills, option.recallDC), { encoding: 'utf-8' });
+    yield promises_1.default.writeFile(output, (0, app_1.formatTSV)(stats, option.secretDC, option.defaultSkills), { encoding: 'utf-8' });
 }));
 program.command('command')
     .description('Generte a creation command file from JSON')
     .argument('<file>', 'input json')
     .option('-o, --output <file>', 'output txt')
     .option('-s, --secretDC', 'produce secret DCs')
-    .option('-r, --recallDC', 'produce recall DCs')
     .option('-d, --defaultSkills', 'produce values for untrained skills')
     .action((argument, option) => __awaiter(void 0, void 0, void 0, function* () {
     const file = yield promises_1.default.readFile(argument, { encoding: 'utf-8' });
     const stats = (0, app_1.parseJSON)(file);
     const output = option.output ? option.output : path_1.default.join(path_1.default.parse(argument).dir, path_1.default.parse(argument).name + '-command.txt');
-    yield promises_1.default.writeFile(output, (0, app_1.formatCommand)(stats, option.secretDC, option.defaultSkills, option.recallDC), { encoding: 'utf-8' });
+    yield promises_1.default.writeFile(output, (0, app_1.formatCommand)(stats, option.secretDC, option.defaultSkills), { encoding: 'utf-8' });
 }));
 program.command('newtracker')
     .argument('<file>', 'input text file')
@@ -191,7 +203,9 @@ program.command('track')
         }
         else {
             console.clear();
-            console.log((0, app_1.formatTracker)(tracker));
+            const track = (0, app_1.formatTracker)(tracker);
+            clipboardy_1.default.writeSync(track);
+            console.log(track);
         }
     });
     yield invoke(argument);
@@ -216,7 +230,7 @@ program.command('track')
             }
         }))(),
         (() => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const rl = readline_1.default.createInterface({
                 input: process.stdin,
                 output: process.stdout
@@ -267,19 +281,48 @@ program.command('track')
                             }
                         },
                     }, {
-                        regex: /^\s*(\S+)\s+[sS]\s*"(.*)"/,
+                        regex: /^\s*(\S+)\s+[sS]?\s*=?"([^"]*)"/,
                         map: (match) => {
                             return { command: 'set-conditions', tag: match[1], value: match[2] };
                         },
+                    }, {
+                        regex: /^\s*(\S+)\s+[sS]?\s*\+"([^"]*)"/,
+                        map: (match) => {
+                            return { command: 'add-conditions', tag: match[1], value: match[2] };
+                        },
+                    }, {
+                        regex: /^\s*(\S+)\s+[sS]?\s*-"([^"]*)"/,
+                        map: (match) => {
+                            return { command: 'rem-conditions', tag: match[1], value: match[2] };
+                        },
+                    }, {
+                        regex: /^\s*(\S+)\s+[sS]?\s*\+\+"([^"]*)"/,
+                        map: (match) => {
+                            return { command: 'inc-conditions', tag: match[1], value: match[2] };
+                        },
+                    }, {
+                        regex: /^\s*(\S+)\s+[sS]?\s*--"([^"]*)"/,
+                        map: (match) => {
+                            return { command: 'dec-conditions', tag: match[1], value: match[2] };
+                        },
                     }, {
                         regex: /^\s*(\S+)\s+[cC]/,
                         map: (match) => ({ command: 'check', tag: match[1] }),
                     }, {
                         regex: /^\s*(\S+)\s+[aA]/,
                         map: (match) => ({ command: 'arrow', tag: match[1] }),
+                    }, {
+                        regex: /^\s*(\S+)\s+[eE]/,
+                        map: (match) => ({ command: 'empty', tag: match[1] }),
+                    }, {
+                        regex: /^\s*(\S+)\s+[xX]/,
+                        map: (match) => ({ command: 'cross', tag: match[1] }),
                     }, {
                         regex: /^\s*(\S+)\s+[dD]/,
                         map: (match) => ({ command: 'delete', tag: match[1] }),
+                    }, {
+                        regex: /^\s*(\S+)\s+[wW]/,
+                        map: (match) => ({ command: 'wait', tag: match[1] }),
                     }];
                 const actions = [];
                 while (true) {
@@ -321,6 +364,24 @@ program.command('track')
                             }
                         }
                     }
+                    else if (action.command === 'wait') {
+                        const sorted = [...tracker].sort((a, b) => (a.init === b.init) ? (b.foe ? 1 : 0) - (a.foe ? 1 : 0) : b.init - a.init);
+                        const blocks = [[sorted[0]]];
+                        for (let i = 1; i < sorted.length; ++i) {
+                            if (sorted[i].foe === blocks[blocks.length - 1][0].foe) {
+                                blocks[blocks.length - 1].push(sorted[i]);
+                            }
+                            else {
+                                blocks.push([sorted[i]]);
+                            }
+                        }
+                        const blockIndex = blocks.findIndex((b) => b.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        const block = blocks[blockIndex + 1];
+                        const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag);
+                        if (block && item) {
+                            item.init = ((_b = (_a = block[block.length - 1]) === null || _a === void 0 ? void 0 : _a.init) !== null && _b !== void 0 ? _b : 0) - 1;
+                        }
+                    }
                     else if (action.command === 'check') {
                         const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag);
                         if (item) {
@@ -333,6 +394,18 @@ program.command('track')
                             item.state = "arrow";
                         }
                     }
+                    else if (action.command === 'empty') {
+                        const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag);
+                        if (item) {
+                            item.state = "empty";
+                        }
+                    }
+                    else if (action.command === 'cross') {
+                        const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag);
+                        if (item) {
+                            item.state = "cross";
+                        }
+                    }
                     else if (action.command === 'delete') {
                         tracker = tracker.filter((c) => !(c.id === action.tag || c.alias === action.tag || c.name == action.tag)).map((p) => (Object.assign(Object.assign({}, p), { children: p.children.filter((c) => !(c.id === action.tag || c.alias === action.tag || c.name == action.tag)) })));
                     }
@@ -353,13 +426,13 @@ program.command('track')
                         });
                     }
                     else if (action.command === 'set-thp') {
-                        const item = (_a = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _a !== void 0 ? _a : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        const item = (_c = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _c !== void 0 ? _c : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
                         if (item) {
                             item.temphp = Math.max(0, action.value);
                         }
                     }
                     else if (action.command === 'set-hp') {
-                        const item = (_b = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _b !== void 0 ? _b : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        const item = (_d = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _d !== void 0 ? _d : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
                         if (item) {
                             item.hp = Math.min(item.maxhp, Math.max(0, action.value));
                         }
@@ -371,19 +444,68 @@ program.command('track')
                         }
                     }
                     else if (action.command === 'set-conditions') {
-                        const item = (_c = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _c !== void 0 ? _c : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        const item = (_e = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _e !== void 0 ? _e : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
                         if (item) {
-                            item.conditions = action.value;
+                            item.conditions = action.value.trim();
+                        }
+                    }
+                    else if (action.command === 'add-conditions') {
+                        const item = (_f = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _f !== void 0 ? _f : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        if (item) {
+                            const conditions = [...item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length), action.value.toLowerCase().trim()];
+                            item.conditions = conditions.join(', ');
+                        }
+                    }
+                    else if (action.command === 'rem-conditions') {
+                        const item = (_g = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _g !== void 0 ? _g : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        if (item) {
+                            const conditions = item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length).filter((c) => !c.includes(action.value.toLowerCase().trim()));
+                            item.conditions = conditions.join(', ');
+                        }
+                    }
+                    else if (action.command === 'inc-conditions') {
+                        const item = (_h = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _h !== void 0 ? _h : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        if (item) {
+                            const conditions = item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length).map((c) => {
+                                if (c.includes(action.value.toLowerCase().trim())) {
+                                    const match = c.match(/(.*)\s+(\d+)/);
+                                    if (match && match[1] && match[2]) {
+                                        return `${match[1].trim()} ${parseInt(match[2]) + 1}`;
+                                    }
+                                }
+                                return c;
+                            });
+                            item.conditions = conditions.join(', ');
+                        }
+                    }
+                    else if (action.command === 'dec-conditions') {
+                        const item = (_j = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _j !== void 0 ? _j : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        if (item) {
+                            const conditions = item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length).map((c) => {
+                                if (c.includes(action.value.toLowerCase().trim())) {
+                                    const match = c.match(/(.*)\s+(\d+)/);
+                                    if (match && match[1] && match[2]) {
+                                        if (parseInt(match[2]) > 1) {
+                                            return `${match[1].trim()} ${parseInt(match[2]) - 1}`;
+                                        }
+                                        else {
+                                            return match[1].trim();
+                                        }
+                                    }
+                                }
+                                return c;
+                            });
+                            item.conditions = conditions.join(', ');
                         }
                     }
                     else if (action.command === 'mod-thp') {
-                        const item = (_d = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _d !== void 0 ? _d : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        const item = (_k = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _k !== void 0 ? _k : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
                         if (item) {
                             item.temphp = Math.max(0, item.temphp + action.value);
                         }
                     }
                     else if (action.command === 'mod-hp') {
-                        const item = (_e = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _e !== void 0 ? _e : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
+                        const item = (_l = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)) !== null && _l !== void 0 ? _l : (tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag));
                         if (item) {
                             let hp = item.hp;
                             let thp = item.temphp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pf2e-sage-stats",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "An RPG Sage's .tsv stat generation tool",
   "main": "dist/index.js",
   "author": "ikariott@gmail.com",
@@ -17,6 +17,7 @@
   "devDependencies": {
     "@eslint/js": "^9.17.0",
     "@types/jest": "^29.5.14",
+    "@types/jsdom": "^27.0.0",
     "@types/lodash": "^4.17.13",
     "@types/pluralize": "^0.0.33",
     "@types/tsv": "^0.2.4",
@@ -30,11 +31,14 @@
   },
   "dependencies": {
     "abbreviate": "^0.0.3",
+    "clipboardy": "^5.1.0",
     "commander": "^12.1.0",
     "dedent-js": "^1.0.1",
+    "jsdom": "^28.0.0",
     "lodash": "^4.17.21",
     "pluralize": "^8.0.0",
     "tsv": "^0.2.0",
     "zod": "^3.24.1"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

package/src/app.ts

@@ -4,6 +4,7 @@ import { capitalize, entries, startCase, toLower, kebabCase, keys, difference, g
 import dedent from 'dedent-js';
 import abbreviate from 'abbreviate';
 import pluralize from 'pluralize';
+import { JSDOM } from 'jsdom';
 import { readdir, rename, stat } from 'fs/promises';
 
 const schema = zod.object({
@@ -197,7 +198,7 @@ const charSchema = zod.object({
 
 export type CharSchema = zod.infer<typeof charSchema>;
 
-export const prediceateMap: Record<string, string> = {
+export const flatMap: Record<string, string> = {
   ...([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20].map((v): [string, string] => (
     [`${v}`, `d20 >= ${v} flat;`]
   )).reduce<Record<string, string>>((p, [k, v]) => { p[k] = v; return p }, {})),
@@ -207,14 +208,24 @@ export const prediceateMap: Record<string, string> = {
   hidden: 'd20 >= 11 flat;',
 };
 
-export const adjustmentMap: () => Record<string, string> = () => ({
-  'incredibly-easy': '`(Incredibly Easy)`',
-  'very-easy': '`(Very Easy)`',
-  'easy': '`(Easy)`',
-  'hard': '`(Hard)`',
-  'very-hard': '`(Very Easy)`',
-  'incredibly-hard': '`(Incredibly Hard)`',
-});
+export const diceMap: Record<string, string> = {
+  ...([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20].map((v): [string, string] => (
+    [`${v}`, `(${v})`]
+  )).reduce<Record<string, string>>((p, [k, v]) => { p[k] = v; return p }, {})),
+  a: '+2',
+  adv: '+2',
+  advantage: '+2',
+  d: '-2',
+  dis: '-2',
+  disadvantage: '-2',
+  f: '+2',
+  for: '+2',
+  fort: '+2',
+  fortune: '+2',
+  m: '-2',
+  mis: '-2',
+  misfortune: '-2',
+};
 
 export const fromatMap = (name: string, map: Record<string, string>) => {
   return TSV.stringify([{
@@ -308,10 +319,7 @@ const locateStrikes = (statblock: string, alias: string): Record<string, Schema[
         .replace(/\+\d/g, '')
         .replace(/Weapon\s+Striking(\s+\((Greater|Major)\))?/gi, '')
         .replace(/((Greater|Major)\s+)?Striking/gi, '')
-        .replace(/\(Agile\)/gi, '')
-        .replace(/\(Finesse\)/gi, '')
-        .replace(/\(\+\)/gi, '')
-        .replace(/\(\)/gi, '')
+        .replace(/\(.*\)/gi, '')
         .replace(/\s+/g, ' ')
         .trim();
 
@@ -333,6 +341,8 @@ const locateStrikes = (statblock: string, alias: string): Record<string, Schema[
         .replace(/Electricity/, 'electricity')
         .replace(/Sonic/, 'sonic')
         .replace(/Spirit/, 'spirit')
+        .replace(/Acid/, 'acid')
+        .replace(/[pP]lus\s(\d+d)/, '+$1')
         .trim();
 
       const twoHand = _traits.match(/(two-hand|two-handed)\s+(d\d+)/);
@@ -484,18 +494,7 @@ const toRanged = ([key, value]: [string, Schema['ranged'][string]]): [string, nu
   ...(value.damage ? [[`ranged.${key}.damage`, value.damage] as [string, string]] : []),
 ];
 
-const recallDCs = (level: number, secret: boolean, bump: number): [string, string][] => ((value) => [
-  ['dc.recall.incredibly-easy', secret ? `||${value - 10}||` : `${value - 10}`],
-  ['dc.recall.very-easy', secret ? `||${value - 5}||` : `${value - 5}`],
-  ['dc.recall.easy', secret ? `||${value - 2}||` : `${value - 2}`],
-  ['dc.recall.default', secret ? `||${value}||` : `${value}`],
-  ['dc.recall', secret ? `||${value}||` : `${value}`],
-  ['dc.recall.hard', secret ? `||${value + 2}||` : `${value + 2}`],
-  ['dc.recall.very-hard', secret ? `||${value + 5}||` : `${value + 5}`],
-  ['dc.recall.incredibly-hard', secret ? `||${value + 10}||` : `${value + 10}`],
-])(dcByLevel[Math.max(Math.min(level + 1, dcByLevel.length - 1), 0)] + bump);
-
-export const flatten = (stats: Schema, secretDC: boolean = false, defaultSkills: boolean = false, recallDC: boolean = false): Record<string, string | number> => {
+export const flatten = (stats: Schema, secretDC: boolean = false, defaultSkills: boolean = false): Record<string, string | number> => {
   const untrained = stats.untrained;
   const skills = defaultSkills ? {
     acrobatics: untrained + stats.attributes.dexterity,
@@ -600,9 +599,6 @@ export const flatten = (stats: Schema, secretDC: boolean = false, defaultSkills:
       ...entries(skills).map(mod2DC(true, (stats.bump.skills ?? stats.bump.default))),
       ...entries(stats.extra).map(mod2DC(true, stats.bump.default)),
     ] : []),
-    ...(recallDC ? [
-      ...recallDCs(stats.level, secretDC, stats.bump.default),
-    ] : []),
     ...(stats.perceptionInfo.length > 0 ? [
       [`perception.info`, `\`(${stats.perceptionInfo.join(', ')})\``]
     ] : []),
@@ -615,12 +611,12 @@ export const flatten = (stats: Schema, secretDC: boolean = false, defaultSkills:
   ].reduce<Record<string | number, string | number>>((p, [key, value]) => { p[key] = value; return p }, {});
 }
 
-export const formatTSV = (stats: Schema, secretDC: boolean = false, defaultSkills: boolean = false, recallDC: boolean = false): string => (
-  TSV.stringify([flatten(stats, secretDC, defaultSkills, recallDC)])
+export const formatTSV = (stats: Schema, secretDC: boolean = false, defaultSkills: boolean = false): string => (
+  TSV.stringify([flatten(stats, secretDC, defaultSkills)])
 );
 
-export const formatCommand = (stats: Schema, secretDC: boolean = false, defaultSkills: boolean = false, recallDC: boolean = false): string => (
-  Object.entries(flatten(stats, secretDC, defaultSkills, recallDC)).map(([k, v]) => `${k}="${v}"`).join(' ')
+export const formatCommand = (stats: Schema, secretDC: boolean = false, defaultSkills: boolean = false): string => (
+  Object.entries(flatten(stats, secretDC, defaultSkills)).map(([k, v]) => `${k}="${v}"`).join(' ')
 );
 
 export const formatTable = (table: string, season: string, scenario: string, _name: string, gm: string, players: string) => {
@@ -634,7 +630,7 @@ export const formatTable = (table: string, season: string, scenario: string, _na
     @TableBot create "${gameName}" --gm ${gm} --players ${players} --table-name ${tableName} --ooc-table-name ooc-${tableName} --category Game Tables
     \`\`\`
     \`\`\`
-    sage! game create name="${gameName}" gameSystem="pf2e" ic=" #${tableName} " ooc=" #ooc-${tableName} " gms=" ${gm} " players=" @${gameName} " dialogPost="post" diceSecret="gm" diceCrit="timestwo" diceOutput=M gmCharName="Хронист" diceSecret="gm"
+    sage! game create name="${gameName}" gameSystem="pf2e" ic=" #${tableName} " ooc=" #ooc-${tableName} " gms=" ${gm} " players=" @${gameName} " dialogPost="post" diceSecret="gm" diceCrit="timestwo" diceOutput=M gmCharName="Хронист"
     \`\`\`
   `;
 };
@@ -702,8 +698,11 @@ export const newtracker = (status: string) => {
 };
 
 export const formatTracker = (tracker: CharSchema[]) => {
+  const aliasSpace = (t: { alias: string }) => (t.alias.length > 0 ? 0 : 5);
+  const nameLengthWithAlias = (t: { name: string, alias: string }) => t.name.length - aliasSpace(t);
+
   const nameLength = tracker.reduce((p, c) => {
-    const length = c.children.reduce((pp, cc) => pp > cc.name.length ? pp : cc.name.length, c.name.length);
+    const length = c.children.reduce((pp, cc) => pp > nameLengthWithAlias(cc) ? pp : nameLengthWithAlias(cc), nameLengthWithAlias(c));
 
     return p > length ? p : length;
   }, 0);
@@ -742,10 +741,12 @@ export const formatTracker = (tracker: CharSchema[]) => {
       ls.push('')
     }
 
-    const hp = char.foe ? (
+    const hp = !char.foe && char.hp > 0 ? (
+      `${char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}/${char.maxhp}`.padStart(hpLength)
+    ) : char.hp > 0 ? (
       `-${char.maxhp - char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}`.padStart(hpLength)
     ) : (
-      `${char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}/${char.maxhp}`.padStart(hpLength)
+      `${char.hp}${char.temphp > 0 ? `+${char.temphp}` : ''}`.padStart(hpLength)
     );
 
     const hpBar = (value: number, max: number) => (
@@ -759,7 +760,7 @@ export const formatTracker = (tracker: CharSchema[]) => {
     );
 
     ls.push((
-      `${stateMap[char.state]}**\` ${char.name.padEnd(nameLength)} ▏${char.alias.padEnd(3)} ▏${hp} \`** ${hpBar(char.hp, char.maxhp)} `
+      `${stateMap[char.hp > 0 ? char.state : 'cross']}**\` ${char.name.padEnd(nameLength + aliasSpace(char))}${char.alias.length > 0 ? ` ▏${char.alias.padEnd(3)}` : ''} ▏${hp} \`** ${hpBar(char.hp, char.maxhp)} `
     ))
 
     if (char.conditions.length > 0) {
@@ -767,14 +768,16 @@ export const formatTracker = (tracker: CharSchema[]) => {
     }
 
     for (const child of char.children) {
-      const hhp = char.foe ? (
+      const hhp = !char.foe && child.hp > 0 ? (
+        `${child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}/${child.maxhp}`.padStart(hpLength)
+      ) : child.hp > 0 ? (
         `-${child.maxhp - child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}`.padStart(hpLength)
       ) : (
-        `${child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}/${child.maxhp}`.padStart(hpLength)
+        `${child.hp}${child.temphp > 0 ? `+${child.temphp}` : ''}`.padStart(hpLength)
       );
 
       ls.push((
-        `:smallnode:**\` ${child.name.padEnd(nameLength)} ▏${child.alias.padEnd(3)} ▏${hhp} \`** ${hpBar(child.hp, child.maxhp)} `
+        `:smallnode:**\` ${child.name.padEnd(nameLength + aliasSpace(child))}${child.alias.length > 0 ? ` ▏${child.alias.padEnd(3)}` : ''} ▏${hhp} \`** ${hpBar(child.hp, child.maxhp)} `
       ))
 
       if (child.conditions.length > 0) {
@@ -813,3 +816,52 @@ export const sortFolder = async () => {
 
   return transformed;
 };
+
+export const screenPlay = (htmlContent: string) => {
+  const dom = new JSDOM(htmlContent);
+  const document = dom.window.document;
+  
+  const outputLines = [];
+  
+  const preambleEntry = document.querySelector('.preamble__entry');
+  if (preambleEntry) {
+    outputLines.push(`SCENE: ${preambleEntry.textContent}`);
+    outputLines.push('');
+  }
+  
+  // Process all chatlog messages
+  const messages = document.querySelectorAll('.chatlog__message');
+  
+  messages.forEach(message => {
+    const authorElement = message.querySelector('.chatlog__author');
+    const contentElement = message.querySelector('.chatlog__content');
+    
+    if (!authorElement || !contentElement) return;
+    
+    const author = authorElement.textContent?.trim() ?? '';
+    const content = contentElement.textContent?.trim() ?? '';
+    
+    // Skip bot tags in character names
+    const characterName = author.replace(/\s*BOT$/, '');
+    
+    // Add character line
+    outputLines.push(`${characterName.toUpperCase()}`);
+    
+    // Add dialogue/content (wrap long lines)
+    const lines = content.split('\n').map((c) => (
+      c
+        .replace(/(—|--)/g, '-')
+        // eslint-disable-next-line no-irregular-whitespace
+        .replace(/(​|​)/g, '')
+        .trim()
+    )).filter((c) => c.length);
+    
+    for (const line of lines) {
+      outputLines.push(`  ${line}`);
+    }
+    
+    outputLines.push('');
+  });
+  
+  return outputLines.join('\n');
+}

package/src/index.ts

@@ -4,10 +4,11 @@ import { Command } from 'commander';
 import fs from 'fs/promises';
 import path from 'path';
 import readline from 'readline';
+import clipboardy from 'clipboardy';
 
 import pack from '../package.json';
 
-import { sortFolder, formatCommand, formatJSON, formatTSV, fromatMap, parseJSON, parseStatblock, stub, adjustmentMap, prediceateMap, formatTable, formatHP, newtracker, parseTracker, formatTracker } from './app';
+import { sortFolder, formatCommand, formatJSON, formatTSV, fromatMap, parseJSON, parseStatblock, stub, flatMap, formatTable, formatHP, newtracker, parseTracker, formatTracker, screenPlay, diceMap } from './app';
 
 const program = new Command(pack.name);
 
@@ -57,27 +58,41 @@ program.command('sort')
     console.log(await sortFolder());
   });
 
+program.command('convert')
+  .description('Convert a discord export file into a txt log')
+  .argument('<file>', 'input file')
+  .option('-o, --output <file>', 'output file')
+  .action(async (argument, option) => {
+    const file = await fs.readFile(argument, { encoding: 'utf-8' });
+
+    if (option.output) {
+      await fs.writeFile(option.output, screenPlay(file), { encoding: 'utf-8' })
+    } else {
+      console.log(screenPlay(file));
+    }
+  });
+
 program.command('flat')
   .description('Generte a special flat npc tsv')
   .option('-n, --name <string>', 'npc name')
   .option('-o, --output <file>', 'output json')
   .action(async (option) => {
     if (option.output) {
-      await fs.writeFile(option.output, fromatMap(option.name ?? 'flat', prediceateMap), { encoding: 'utf-8' })
+      await fs.writeFile(option.output, fromatMap(option.name ?? 'flat', flatMap), { encoding: 'utf-8' })
     } else {
-      console.log(fromatMap(option.name ?? 'flat', prediceateMap));
+      console.log(fromatMap(option.name ?? 'flat', flatMap));
     }
   });
 
-program.command('adjustment')
-  .description('Generte a special adjustment npc tsv')
+program.command('dice')
+  .description('Generte a special dice npc tsv')
   .option('-n, --name <string>', 'npc name')
   .option('-o, --output <file>', 'output json')
   .action(async (option) => {
     if (option.output) {
-      await fs.writeFile(option.output, fromatMap(option.name ?? 'adjustment', adjustmentMap()), { encoding: 'utf-8' })
+      await fs.writeFile(option.output, fromatMap(option.name ?? 'dice', diceMap), { encoding: 'utf-8' })
     } else {
-      console.log(fromatMap(option.name ?? 'adjustment', adjustmentMap()));
+      console.log(fromatMap(option.name ?? 'dice', diceMap));
     }
   });
 
@@ -119,7 +134,6 @@ program.command('tsv')
   .argument('<file>', 'input json')
   .option('-o, --output <file>', 'output tsv')
   .option('-s, --secretDC', 'produce secret DCs')
-  .option('-r, --recallDC', 'produce recall DCs')
   .option('-d, --defaultSkills', 'produce values for untrained skills')
   .action(async (argument, option) => {
     const file = await fs.readFile(argument, { encoding: 'utf-8' });
@@ -128,7 +142,7 @@ program.command('tsv')
 
     const output = option.output ? option.output : path.join(path.parse(argument).dir, path.parse(argument).name + '.tsv');
 
-    await fs.writeFile(output, formatTSV(stats, option.secretDC, option.defaultSkills, option.recallDC), { encoding: 'utf-8' });
+    await fs.writeFile(output, formatTSV(stats, option.secretDC, option.defaultSkills), { encoding: 'utf-8' });
   });
 
 program.command('command')
@@ -136,7 +150,6 @@ program.command('command')
   .argument('<file>', 'input json')
   .option('-o, --output <file>', 'output txt')
   .option('-s, --secretDC', 'produce secret DCs')
-  .option('-r, --recallDC', 'produce recall DCs')
   .option('-d, --defaultSkills', 'produce values for untrained skills')
   .action(async (argument, option) => {
     const file = await fs.readFile(argument, { encoding: 'utf-8' });
@@ -145,7 +158,7 @@ program.command('command')
 
     const output = option.output ? option.output : path.join(path.parse(argument).dir, path.parse(argument).name + '-command.txt');
 
-    await fs.writeFile(output, formatCommand(stats, option.secretDC, option.defaultSkills, option.recallDC), { encoding: 'utf-8' });
+    await fs.writeFile(output, formatCommand(stats, option.secretDC, option.defaultSkills), { encoding: 'utf-8' });
   });
 
 program.command('newtracker')
@@ -193,7 +206,10 @@ program.command('track')
         await fs.writeFile(option.output, formatTracker(tracker), { encoding: 'utf-8' })
       } else {
         console.clear();
-        console.log(formatTracker(tracker));
+
+        const track = formatTracker(tracker);
+        clipboardy.writeSync(track)
+        console.log(track);
       }
     }
 
@@ -258,19 +274,48 @@ program.command('track')
               }
             },
           }, {
-            regex: /^\s*(\S+)\s+[sS]\s*"(.*)"/,
+            regex: /^\s*(\S+)\s+[sS]?\s*=?"([^"]*)"/,
             map: (match: RegExpMatchArray) => {
               return { command: 'set-conditions' as const, tag: match[1], value: match[2] };
             },
+          }, {
+            regex: /^\s*(\S+)\s+[sS]?\s*\+"([^"]*)"/,
+            map: (match: RegExpMatchArray) => {
+              return { command: 'add-conditions' as const, tag: match[1], value: match[2] };
+            },
+          }, {
+            regex: /^\s*(\S+)\s+[sS]?\s*-"([^"]*)"/,
+            map: (match: RegExpMatchArray) => {
+              return { command: 'rem-conditions' as const, tag: match[1], value: match[2] };
+            },
+          }, {
+            regex: /^\s*(\S+)\s+[sS]?\s*\+\+"([^"]*)"/,
+            map: (match: RegExpMatchArray) => {
+              return { command: 'inc-conditions' as const, tag: match[1], value: match[2] };
+            },
+          }, {
+            regex: /^\s*(\S+)\s+[sS]?\s*--"([^"]*)"/,
+            map: (match: RegExpMatchArray) => {
+              return { command: 'dec-conditions' as const, tag: match[1], value: match[2] };
+            },
           }, {
             regex: /^\s*(\S+)\s+[cC]/,
             map: (match: RegExpMatchArray) => ({ command: 'check' as const, tag: match[1] }),
           }, {
             regex: /^\s*(\S+)\s+[aA]/,
             map: (match: RegExpMatchArray) => ({ command: 'arrow' as const, tag: match[1] }),
+          }, {
+            regex: /^\s*(\S+)\s+[eE]/,
+            map: (match: RegExpMatchArray) => ({ command: 'empty' as const, tag: match[1] }),
+          }, {
+            regex: /^\s*(\S+)\s+[xX]/,
+            map: (match: RegExpMatchArray) => ({ command: 'cross' as const, tag: match[1] }),
           }, {
             regex: /^\s*(\S+)\s+[dD]/,
             map: (match: RegExpMatchArray) => ({ command: 'delete' as const, tag: match[1] }),
+          }, {
+            regex: /^\s*(\S+)\s+[wW]/,
+            map: (match: RegExpMatchArray) => ({ command: 'wait' as const, tag: match[1] }),
           }];
 
           const actions: ReturnType<typeof commands[number]['map']>[] = [];
@@ -322,6 +367,26 @@ program.command('track')
                   blocks[i].forEach((b) => b.state = 'empty')
                 }
               }
+            } else if (action.command === 'wait') {
+              const sorted = [...tracker].sort((a, b) => (a.init === b.init) ? (b.foe ? 1 : 0) - (a.foe ? 1 : 0) : b.init - a.init);
+
+              const blocks = [[sorted[0]]];
+
+              for (let i=1; i < sorted.length; ++i) {
+                if (sorted[i].foe === blocks[blocks.length-1][0].foe) {
+                  blocks[blocks.length-1].push(sorted[i])
+                } else {
+                  blocks.push([sorted[i]])
+                } 
+              }
+
+              const blockIndex = blocks.findIndex((b) => b.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag))
+              const block = blocks[blockIndex + 1]
+              const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
+
+              if (block && item) {
+                item.init = (block[block.length - 1]?.init ?? 0) - 1;
+              }
             } else if (action.command === 'check') {
               const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
 
@@ -334,6 +399,18 @@ program.command('track')
               if (item) {
                 item.state = "arrow"
               }
+            } else if (action.command === 'empty') {
+              const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
+
+              if (item) {
+                item.state = "empty"
+              }
+            } else if (action.command === 'cross') {
+              const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
+
+              if (item) {
+                item.state = "cross"
+              }
             } else if (action.command === 'delete') {
               tracker = tracker.filter((c) => !(c.id === action.tag || c.alias === action.tag || c.name == action.tag)).map((p) => ({
                 ...p,
@@ -381,7 +458,71 @@ program.command('track')
               )
 
               if (item) {
-                item.conditions = action.value
+                item.conditions = action.value.trim()
+              }
+            } else if (action.command === 'add-conditions') {
+              const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag) ?? (
+                tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
+              )
+
+              if (item) {
+                const conditions = [...item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length), action.value.toLowerCase().trim()];
+
+                item.conditions = conditions.join(', ')
+              }
+            } else if (action.command === 'rem-conditions') {
+              const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag) ?? (
+                tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
+              )
+
+              if (item) {
+                const conditions = item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length).filter((c) => !c.includes(action.value.toLowerCase().trim()));
+
+                item.conditions = conditions.join(', ')
+              }
+            } else if (action.command === 'inc-conditions') {
+              const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag) ?? (
+                tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
+              )
+
+              if (item) {
+                const conditions = item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length).map((c) => {
+                  if (c.includes(action.value.toLowerCase().trim())) {
+                    const match = c.match(/(.*)\s+(\d+)/);
+
+                    if (match && match[1] && match[2]) {
+                      return `${match[1].trim()} ${parseInt(match[2]) + 1}`
+                    }
+                  }
+
+                  return c;
+                });
+
+                item.conditions = conditions.join(', ')
+              }
+            } else if (action.command === 'dec-conditions') {
+              const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag) ?? (
+                tracker.flatMap((c) => c.children).find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag)
+              )
+
+              if (item) {
+                const conditions = item.conditions.split(',').map((c) => c.toLowerCase().trim()).filter((c) => c.length).map((c) => {
+                  if (c.includes(action.value.toLowerCase().trim())) {
+                    const match = c.match(/(.*)\s+(\d+)/);
+
+                    if (match && match[1] && match[2]) {
+                      if (parseInt(match[2]) > 1) {
+                        return `${match[1].trim()} ${parseInt(match[2]) - 1}`
+                      } else {
+                        return match[1].trim()
+                      }
+                    }
+                  }
+
+                  return c;
+                });
+
+                item.conditions = conditions.join(', ')
               }
             } else if (action.command === 'mod-thp') {
               const item = tracker.find((c) => c.id === action.tag || c.alias === action.tag || c.name == action.tag) ?? (