A few changes for Spells (form and view)

forms/spell.json

@@ -4,6 +4,18 @@
     {
       "type": "group",
       "fields": [
+        {
+          "title": "Common.Actions",
+          "type": "picker",
+          "attribute": "data.actions",
+          "attributeType": "Action",
+        },
+        {
+          "title": "Common.ActionsMult",
+          "type": "picker",
+          "attribute": "data.actionsmult",
+          "attributeType": "ActionMult",
+        },
         {
           "title": "Common.Type",
           "type": "picker",
@@ -44,18 +56,22 @@
     {
       "type": "group",
       "fields": [
-        {
-          "title": "Common.Actions",
-          "type": "picker",
-          "attribute": "data.actions",
-          "attributeType": "Action",
-        },
         {
           "title": "Spell.Traditions",
           "type": "multiPicker",
           "attribute": "data.traditions",
           "attributeType": "MagicalTradition"
         },
+        {
+          "title": "Spell.Muse",
+          "type": "text",
+          "attribute": "data.muse"
+        },
+        {
+          "title": "Spell.Trigger",
+          "type": "text",
+          "attribute": "data.trigger"
+        },
         {
           "title": "Spell.Requirements",
           "type": "text",
@@ -71,11 +87,6 @@
           "type": "text",
           "attribute": "data.cost"
         },
-        {
-          "title": "Spell.Trigger",
-          "type": "text",
-          "attribute": "data.trigger"
-        },
         {
           "title": "Spell.Range",
           "type": "text",

lang/en.json

@@ -81,6 +81,7 @@
   "Class.KeyTerms": "Key Terms",
   "Common.AC": "AC",
   "Common.Actions": "Actions",
+  "Common.ActionsMult": "Actions 1 to X",
   "Common.Alignment": "Alignment",
   "Common.ArmorClass": "Armor Class",
   "Common.AttackModifier": "Attack Modifier",
@@ -129,6 +130,7 @@
   "Common.Subcategory": "Subcategory",
   "Common.Summary": "Summary",
   "Common.Tags": "Tags",
+  "Common.To": "to",
   "Common.Token": "Token",
   "Common.Trait": "Trait",
   "Common.Traits": "Traits",
@@ -372,7 +374,7 @@
   "ItemSubcategory.VisionAssistance": "Vision Assistance",
   "ItemSubcategory.WeaponPropertyRune": "Weapon Property Rune",
   "Language.Aklo": "Aklo",
-  "Language.Cthonian": "Cthonian",
+  "Language.Cthonian": "Chthonian",
   "Language.Common": "Common",
   "Language.Diabolic": "Diabolic",
   "Language.Draconic": "Draconic",
@@ -458,6 +460,7 @@
   "Spell.Cost": "Cost",
   "Spell.Defense": "Defense",
   "Spell.Duration": "Duration",
+  "Spell.Muse": "Muse",
   "Spell.Name": "Name",
   "Spell.Range": "Range",
   "Spell.Rank": "Rank",
@@ -534,6 +537,7 @@
   "TraitType.Shield": "Shield",
   "TraitType.Tradition": "Tradition",
   "TraitType.Weapon": "Weapon",
+  "TraitType.WeaponGroup": "Weapon Group",
   "WeaponCategory.Advanced": "Advanced",
   "WeaponCategory.Martial": "Martial",
   "WeaponCategory.Simple": "Simple",

lang/fr.json

@@ -81,6 +81,7 @@
   "Class.KeyTerms": "Mots clés",
   "Common.AC": "CA",
   "Common.Actions": "Actions",
+  "Common.ActionsMult": "Actions 1 à X",
   "Common.Alignment": "Alignement",
   "Common.ArmorClass": "Classe d'armure",
   "Common.AttackModifier": "Modificateur d'Attaque",
@@ -129,6 +130,7 @@
   "Common.Subcategory": "Sous-Catégorie",
   "Common.Summary": "Résumé",
   "Common.Tags": "Tags",
+  "Common.To": "à",
   "Common.Token": "Token",
   "Common.Trait": "Trait",
   "Common.Traits": "Traits",
@@ -372,7 +374,7 @@
   "ItemSubcategory.VisionAssistance": "Vision Assistance",
   "ItemSubcategory.WeaponPropertyRune": "Weapon Property Rune",
   "Language.Aklo": "Aklo",
-  "Language.Cthonian": "Cthonien",
+  "Language.Cthonian": "Chthonien",
   "Language.Common": "Commun",
   "Language.Diabolic": "Diabolique",
   "Language.Draconic": "Draconique",
@@ -458,6 +460,7 @@
   "Spell.Cost": "Coût",
   "Spell.Defense": "Défense",
   "Spell.Duration": "Durée",
+  "Spell.Muse": "Muse",
   "Spell.Name": "Nom",
   "Spell.Range": "Portée",
   "Spell.Rank": "Rang",
@@ -534,6 +537,7 @@
   "TraitType.Shield": "Shield",
   "TraitType.Tradition": "Tradition",
   "TraitType.Weapon": "Arme",
+  "TraitType.WeaponGroup": "Groupe d'armes",
   "WeaponCategory.Advanced": "Armes évoluées",
   "WeaponCategory.Martial": "Armes de guerre",
   "WeaponCategory.Simple": "Armes simples",

types.json

@@ -288,6 +288,7 @@
     "shield": "TraitType.Shield", 
     "tradition": "TraitType.Tradition", 
     "weapon": "TraitType.Weapon", 
+    "weapongroup": "TraitType.WeaponGroup", 
   },
   "CreatureType": {
     "aberration": "CreatureType.Aberration",

views/partials/ability.md

@@ -1 +1 @@
-**{{ability.name}}**{% if ability.actions %} ![Action](/icons/actions/{{ability.actions}}.png#height=18){% endif %}{% if ability.traits %} ({{ability.traits|map: 'Trait'|lowercase}}){% endif %} {{ability.text}}
+**{{ability.name}}**{% if ability.actions %} ![Action](/icons/actions/{{ability.actions}}.png#height=18){% endif %}{% if ability.traits %} ({% for key, value in ability.traits %}[{{key|map:’Trait’|lowercase}}](trait){% if forloop.last != true %}, {% endif %}{% endfor %}) {% endif %} {{ability.text}}

views/partials/attack.md

@@ -1 +1 @@
-**{{ability.type|default: 'melee'|map: 'Attack'}}** {% if ability.actions %}![Action](/icons/actions/{{ability.actions}}.png#height=18) {% endif %}{{ability.name|lowercase}} {% if ability.attack %}[{{ability.attack|signed}}](roll "{{ability.name}}/attack"){% endif %} {% if ability.traits %}({{ability.traits|map: 'Trait'|lowercase}}) {% endif %}**{{'Common.Damage'|l|capitalize}}** {{ability.damage}}
+**{{ability.type|default: 'melee'|map: 'Attack'}}** {% if ability.actions %}![Action](/icons/actions/{{ability.actions}}.png#height=18) {% endif %}{{ability.name|lowercase}} {% if ability.attack %}[{{ability.attack|signed}}](roll "{{ability.name}}/attack"){% endif %} {% if ability.traits %}({% for key, value in ability.traits %}[{{key|map:’Trait’|lowercase}}](trait){% if forloop.last != true %}, {% endif %}{% endfor %}) {% endif %}**{{'Common.Damage'|l|capitalize}}** {{ability.damage}}

views/partials/creature-primary.md

@@ -1,4 +1,4 @@
-{% if data.perception %}
+{% if data.perception or data.senses %}
 **{{'Creature.Perception'|l}}** [{{data.perception|signed}}](roll "{{'Creature.Perception'|l}}"); {{data.senses}}
 {% endif %}
 

views/partials/spell-primary.md

@@ -1,10 +1,12 @@
+{% if data.muse %}**{{'Spell.Muse'|l}}** {{data.muse}}{% endif %}
+
 {% if data.traditions %}
 **{{'Spell.Traditions'|l}}** {{data.traditions|map: 'MagicalTradition'|lowercase}}
 {% endif %}
 
-{% if data.requirements %}**{{'Spell.Requirements'|l}}** {{data.requirements}} {% endif %}
+{% if data.trigger %}**{{'Spell.Trigger'|l}}** {{data.trigger}} {% endif %}{% if data.requirements %}**{{'Spell.Requirements'|l}}** {{data.requirements}} {% endif %}
 
-{% if data.cast %}**{{'Spell.Cast'|l}}** {{data.cast}}; {% endif %}{% if data.cost %}**{{'Spell.Cost'|l}}** {{data.cost}}; {% endif %}{% if data.trigger %}**{{'Spell.Trigger'|l}}** {{data.trigger}}{% endif %}
+{% if data.cast %}**{{'Spell.Cast'|l}}** {{data.cast}}; {% endif %}{% if data.cost %}**{{'Spell.Cost'|l}}** {{data.cost}}; {% endif %}
 
 {% if data.range %}**{{'Spell.Range'|l}}** {{data.range|lowercase}}; {% endif %}{% if data.area %}**{{'Spell.Area'|l}}** {{data.area|lowercase}}; {% endif %}{% if data.targets %}**{{'Spell.Targets'|l}}** {{data.targets}} {% endif %}
 

views/spell.html

@@ -4,7 +4,8 @@
   <section class="stat-block" data-theme="light">
     <div class="header">
       <h1 class="title">{{name}} {% if data.actions %}<img src="icons/actions/{{data.actions}}.png"
-          alt="{{data.actions}}" />{% endif %}</h1>
+          alt="{{data.actions}}" />{% endif %}{% if data.actionsmult %} {{'Common.To'|l}} <img src="icons/actions/{{data.actionsmult}}.png"
+          alt="{{data.actionsmult}}" />{% endif %}</h1>
       <div>
         {{data.type|map: 'SpellType'|uppercase}} {{data.rank|default: '0'}}
       </div>
@@ -47,4 +48,4 @@ <h3>{{'Common.Notes'|l}}</h3>
   {% include "footer.html" %}
 
 </main>
-{% endblock %}
+{% endblock %}