diff --git a/The Fantasy Trip/TFT.css b/The Fantasy Trip/TFT.css index 4ebc31c55f..00a6e69072 100644 --- a/The Fantasy Trip/TFT.css +++ b/The Fantasy Trip/TFT.css @@ -226,6 +226,7 @@ letter-spacing: -.01em; } +.sheet-rolltemplate-attack .sheet-flavor-success, .sheet-rolltemplate-cast-spell .sheet-flavor-success { /*color: rgb(126, 45, 64);*/ diff --git a/The Fantasy Trip/TFT.html b/The Fantasy Trip/TFT.html index 84830bde00..1385f827f4 100644 --- a/The Fantasy Trip/TFT.html +++ b/The Fantasy Trip/TFT.html @@ -211,8 +211,10 @@
- Flavor Text: - + Attack Flavor Text: + + Success Flavor Text: + Description:
@@ -473,12 +475,12 @@

- {{#flavor}} - {{character_name}} {{flavor}} - {{/flavor}} - {{^flavor}} + {{#attackflavor}} + {{character_name}} {{attackflavor}} + {{/attackflavor}} + {{^attackflavor}} {{character_name}} attacks with {{pronoun}} {{weaponname}}! - {{/flavor}} + {{/attackflavor}}

{{#defending}}

Opponent is defending/dodging

@@ -519,21 +521,36 @@
Critical: Automatic miss.
{{/rollTotal() roll1 16}} {{#rollTotal() roll1 3}} -
Hit!
+ {{#successflavor}} +
{{successflavor}}
+ {{/successflavor}} + {{^successflavor}} +
Hit!
+ {{/successflavor}} {{#damage}}
Damage: {{damage}}
{{/damage}}
Critical: Triple Damage!
{{/rollTotal() roll1 3}} {{#rollTotal() roll1 4}} -
Hit!
+ {{#successflavor}} +
{{successflavor}}
+ {{/successflavor}} + {{^successflavor}} +
Hit!
+ {{/successflavor}} {{#damage}}
Damage: {{damage}}
{{/damage}}
Critical: Double Damage!
{{/rollTotal() roll1 4}} {{#rollTotal() roll1 5}} -
Hit!
+ {{#successflavor}} +
{{successflavor}}
+ {{/successflavor}} + {{^successflavor}} +
Hit!
+ {{/successflavor}} {{#damage}}
Damage: {{damage}}
{{/damage}} @@ -541,7 +558,12 @@ {{/rollTotal() roll1 5}} {{#rollBetween() roll1 6 15}} {{#^rollGreater() roll1 tohit}} -
Hit!
+ {{#successflavor}} +
{{successflavor}}
+ {{/successflavor}} + {{^successflavor}} +
Hit!
+ {{/successflavor}} {{#damage}}
Damage: {{damage}}
{{/damage}} @@ -584,7 +606,12 @@
Critical: Triple Damage!
{{/rollTotal() roll1 4}} {{#rollTotal() roll1 5}} -
Hit!
+ {{#successflavor}} +
{{successflavor}}
+ {{/successflavor}} + {{^successflavor}} +
Hit!
+ {{/successflavor}} {{#damage}}
Damage: {{damage}}
{{/damage}} @@ -592,7 +619,12 @@ {{/rollTotal() roll1 5}} {{#rollBetween() roll1 6 19}} {{#^rollGreater() roll1 tohit}} -
Hit!
+ {{#successflavor}} +
{{successflavor}}
+ {{/successflavor}} + {{^successflavor}} +
Hit!
+ {{/successflavor}} {{#damage}}
Damage: {{damage}}
{{/damage}} @@ -1114,10 +1146,11 @@ onSelectedWeaponOrSpell(function(id, selectedIds, type) { if (type == 'weapon') { - let flavorName = repeatingPropertyName('weapons', id, 'flavor'); + let attackFlavorName = repeatingPropertyName('weapons', id, 'attackflavor'); + let successFlavorName = repeatingPropertyName('weapons', id, 'successflavor'); let weaponToHitName = repeatingPropertyName('weapons', id, 'tohit'); let weaponDamageName = repeatingPropertyName('weapons', id, 'weapondamage'); - getAttrs(['gender', flavorName, weaponToHitName, weaponDamageName, 'defending'], function(v) { + getAttrs(['gender', attackFlavorName, successFlavorName, weaponToHitName, weaponDamageName, 'defending'], function(v) { let mstring = `&{template:attack}` + ` {{weaponname=@{${repeatingPropertyName('weapons', id, 'weaponname')}}}}`; @@ -1171,8 +1204,11 @@ mstring += ` {{pronoun=${pronoun}}}`; } - if (v[flavorName] != '') { - mstring += ` {{flavor=@{${flavorName}}}}`; + if (v[attackFlavorName] != '') { + mstring += ` {{attackflavor=@{${attackFlavorName}}}}`; + } + if (v[successFlavorName] != '') { + mstring += ` {{successflavor=@{${successFlavorName}}}}`; } doRollWithDiceString(mstring); });