diff --git a/Exalted2e/README.md b/Exalted2e/README.md index 926cc84cca..100ef6ff0b 100644 --- a/Exalted2e/README.md +++ b/Exalted2e/README.md @@ -24,6 +24,12 @@ If you feel you've contributed to the development of this character sheet, don't ### Changelog + +#### 2020-05-26 +* fixed attribute ArmorLethalSoak so it now saves properly +* point image urls to main repo, some code cleanup + + #### 2019-12-03 * Dragonblooded abilities are now tracked by separate Roll20 attributes, as not to interfere with the default Solar abililtes. The Solars abilities are no longer hidden with the red checkbox by default. diff --git a/Exalted2e/exalted2e.css b/Exalted2e/exalted2e.css index 36ea8ae3a2..6cb94e21a1 100644 --- a/Exalted2e/exalted2e.css +++ b/Exalted2e/exalted2e.css @@ -23,13 +23,13 @@ .sheet-rolltemplate-attack > div, .sheet-rolltemplate-damage > div { - background-image: url(http://i.imgur.com/X0RX9Qu.png); + background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Exalted2e/images/attack.png); background-size: contain; background-position: right center; background-repeat: no-repeat; } -.sheet-rolltemplate-damage > div { background-image: url(http://i.imgur.com/t9YYFMu.png); } +.sheet-rolltemplate-damage > div { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Exalted2e/images/damage.png); } .sheet-rolltemplate-joinbattle > div > h3, .sheet-rolltemplate-joindebate > div > h3, @@ -99,7 +99,7 @@ h4 h1, hr { - background-image: url(http://i.imgur.com/TwZ84rO.jpg); + background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Exalted2e/images/bar.jpg); background-position: left 50%; background-repeat: repeat-x; background-size: auto 10px; diff --git a/Exalted2e/exalted2e.html b/Exalted2e/exalted2e.html index 174ff91a4e..90469b7802 100644 --- a/Exalted2e/exalted2e.html +++ b/Exalted2e/exalted2e.html @@ -1,122 +1,7 @@ - -
- -

Join Battle!

-
Wits ({{wits}}) +
-
Awareness ({{awareness}}) +
-
Bonus Dice ({{bonus dice}}) +
-
Bonus Successess ({{bonus successess}}) =
- {{roll}} Successes -
- - -
- -

Join Debate!

-
Wits ({{wits}}) +
-
Awareness ({{awareness}}) +
-
Bonus Dice ({{bonus dice}}) +
-
Bonus Successess ({{bonus successess}}) =
- {{roll}} Successes -
- - -
- -

Join War!

-
Wits ({{wits}}) +
-
War ({{war}}) +
-
Bonus Dice ({{bonus dice}}) +
-
Bonus Successess ({{bonus successess}}) =
- {{roll}} Successes -
- - -
- {{#name}} -

{{name}} (Attack!)

- {{/name}} - {{^name}} -

Attack!

- {{/name}} -
- {{#attribute name}} - {{attribute name}} - {{/attribute name}} - {{^attribute name}} - Attribute - {{/attribute name}} - ({{attribute}}) + -
-
- {{#ability name}} - {{ability name}} - {{/ability name}} - {{^ability name}} - Ability - {{/ability name}} - ({{ability}}) + -
-
- {{#specialty name}} - {{specialty name}} - {{/specialty name}} - {{^specialty name}} - Specialty - {{/specialty name}} - ({{specialty}}) + -
-
Accuracy ({{accuracy}}) +
-
Bonus Dice ({{bonus dice}}) +
-
Bonus Successes ({{bonus successes}}) =
- {{roll}} Successes -
- - -
- {{#name}} -

{{name}} (Hit!)

- {{/name}} - {{^name}} -

Hit!

- {{/name}} -
{{damage type}} Damage ({{damage}}) +
- {{#attribute}} -
- {{#attribute name}} - {{attribute name}} - {{/attribute name}} - {{^attribute name}} - Attribute - {{/attribute name}} - ({{attribute}}) + -
- {{/attribute}} - {{#ability}} -
- {{#ability name}} - {{ability name}} - {{/ability name}} - {{^ability name}} - Ability - {{/ability name}} - ({{ability}}) + -
- {{/ability}} -
Bonus Dice ({{bonus dice}}) +
-
Bonus Successes ({{bonus successes}}) –
-
Target Soak ({{target soak}}) =
- {{#rollTotal() pool 0}} - {{minimum roll}} Successes - {{/rollTotal() pool 0}} - {{roll}} Successes -
- -
- +
@@ -925,7 +810,7 @@
- +
@@ -2131,3 +2016,118 @@
+ + +
+ +

Join Battle!

+
Wits ({{wits}}) +
+
Awareness ({{awareness}}) +
+
Bonus Dice ({{bonus dice}}) +
+
Bonus Successess ({{bonus successess}}) =
+ {{roll}} Successes +
+ + +
+ +

Join Debate!

+
Wits ({{wits}}) +
+
Awareness ({{awareness}}) +
+
Bonus Dice ({{bonus dice}}) +
+
Bonus Successess ({{bonus successess}}) =
+ {{roll}} Successes +
+ + +
+ +

Join War!

+
Wits ({{wits}}) +
+
War ({{war}}) +
+
Bonus Dice ({{bonus dice}}) +
+
Bonus Successess ({{bonus successess}}) =
+ {{roll}} Successes +
+ + +
+ {{#name}} +

{{name}} (Attack!)

+ {{/name}} + {{^name}} +

Attack!

+ {{/name}} +
+ {{#attribute name}} + {{attribute name}} + {{/attribute name}} + {{^attribute name}} + Attribute + {{/attribute name}} + ({{attribute}}) + +
+
+ {{#ability name}} + {{ability name}} + {{/ability name}} + {{^ability name}} + Ability + {{/ability name}} + ({{ability}}) + +
+
+ {{#specialty name}} + {{specialty name}} + {{/specialty name}} + {{^specialty name}} + Specialty + {{/specialty name}} + ({{specialty}}) + +
+
Accuracy ({{accuracy}}) +
+
Bonus Dice ({{bonus dice}}) +
+
Bonus Successes ({{bonus successes}}) =
+ {{roll}} Successes +
+ + +
+ {{#name}} +

{{name}} (Hit!)

+ {{/name}} + {{^name}} +

Hit!

+ {{/name}} +
{{damage type}} Damage ({{damage}}) +
+ {{#attribute}} +
+ {{#attribute name}} + {{attribute name}} + {{/attribute name}} + {{^attribute name}} + Attribute + {{/attribute name}} + ({{attribute}}) + +
+ {{/attribute}} + {{#ability}} +
+ {{#ability name}} + {{ability name}} + {{/ability name}} + {{^ability name}} + Ability + {{/ability name}} + ({{ability}}) + +
+ {{/ability}} +
Bonus Dice ({{bonus dice}}) +
+
Bonus Successes ({{bonus successes}}) –
+
Target Soak ({{target soak}}) =
+ {{#rollTotal() pool 0}} + {{minimum roll}} Successes + {{/rollTotal() pool 0}} + {{roll}} Successes +
+ \ No newline at end of file diff --git a/Exalted2e/sheet.json b/Exalted2e/sheet.json index d670c46497..9d08107d8c 100644 --- a/Exalted2e/sheet.json +++ b/Exalted2e/sheet.json @@ -4,5 +4,5 @@ "authors": "Brian Shields, Benjamin Bandelow", "preview": "exalted2e.jpg", "roll20userid": "235259,442", - "instructions": "###Rollable Tables\nThe roll buttons assume you have two rollable tables, one named `exalted` and one named `exalted-damage`.\n\nThe table `exalted` should have the following table items:\n\n* \"botch\" (weight 1)\n* \"0\" (weight 5)\n* \"1\" (weight 3)\n* \"2\" (weight 1)\n\nThe table `exalted-damage` should have the following table items:\n\n* \"0\" (weight 6)\n* \"1\" (weight 4)\n\nIf your campaign includes Sidereals throwing around Ascending and/or Descending Destinies, you will either need the API (a mentor feature) or alternate rollable tables, and the roll buttons on the sheet will not be correct.\n\n**When creating your own macros,** be sure to multiply any Ability by `1-Ability|max`, to account for abilities which have been reset to 0. For example, `/r (@{Dexterity}+@{Melee})t[exalted]` will roll your Dexterity and Melee together, however if the checkbox to reset Melee to 0 is ticked, the roll will be incorrect. Instead, use `/r (@{Dexterity+@{Melee}*(1-@{Melee|max}))t[exalted]`.\n\n###Roll Templates\nThis sheet includes five roll templates: `joinbattle`, `joindebate`, `joinwar`, `attack`, and `damage`.\n\n`joinbattle` and `joindebate` both accept the properties `wits`, `awareness`, `bonus dice`, `bonus successes`, and `roll`. `joinwar` is the same, except `war` is used instead of `awareness`. If you create your own macros using these templates, each of the properties should be an inline roll and the `roll` property should roll an appropriate number of times on the `exalted` table.\n\n`attack` **requires** the properties `attribute`, `ability`, `specialty`, `accuracy`, `bonus dice`, `bonus successes`, and `roll`. As with the previous templates, if you create your own attack macros, these properties should all be inline rolls, and `roll` should roll on the `exalted` table. `attack` can *optionally* include the properties `name`, `attribute name`, `ability name`, and `specialty name`. The attack roll button in the repeating section on the **Combat** tab uses the weapon name for `name`, while the other name properties are unused. If supplied in a custom macro, they will be used in place of \"Attribute\", \"Ability\", and \"Specialty\".\n\n`damage` **requires** the properties `damage type`, `damage`, `bonus dice`, `bonus successes`, `target soak`, `pool`, `minimum roll`, and `roll`. `damage` can *optionally* include `name`, `attribute name`, `attribute`, `ability name`, and `ability`.\n\nThe properties `damage`, `attribute`, `ability`, `bonus dice`, `bonus successes`, `target soak`, `pool`, `minimum roll`, and `roll` should all be inline rolls. `minimum roll` should roll on the `exalted-damage` table a number of times equal to your minimum damage for the attack (generally 1, except for overwhelming weapons). `roll` should roll on the `exalted-damage` table the appropriate number of times. The two damage rolls are distinguised by the `pool` property. **In a custom macro, `pool` should be set to roll a number of zero-sided dice equal to your damage dice pool minus your minimum damage. This roll should generate successes on results of 1 or greater, and failures on results of 1 or less.** Such an inline roll looks something along the lines of `[[(Damage + Attribute + Ability + Bonus Dice - Target Soak - Minimum Damage)d0>1f<1]]`. This computation results in either 0 (for a die pool of 0 or less) or the size of the pool expressed as a negative value. This lets the template know whether to use your minimum damage or your regular damage." + "instructions": "###Rollable Tables\nThe roll buttons assume you have two rollable tables, one named `exalted` and one named `exalted-damage`.\n\nThe table `exalted` should have the following table items:\n\n* \"botch\" (weight 1)\n* \"0\" (weight 5)\n* \"1\" (weight 3)\n* \"2\" (weight 1)\n\nThe table `exalted-damage` should have the following table items:\n\n* \"0\" (weight 6)\n* \"1\" (weight 4)\n\nIf your campaign includes Sidereals throwing around Ascending and/or Descending Destinies, you will either need the API (a mentor feature) or alternate rollable tables, and the roll buttons on the sheet will not be correct.\n\n**When creating your own macros,** be sure to multiply any Ability by `1-Ability|max`, to account for abilities which have been reset to 0. For example, `/r (@{Dexterity}+@{Melee})t[exalted]` will roll your Dexterity and Melee together, however if the checkbox to reset Melee to 0 is ticked, the roll will be incorrect. Instead, use `/r (@{Dexterity+@{Melee}*(1-@{Melee|max}))t[exalted]`.\n\n###Roll Templates\nThis sheet includes five roll templates: `joinbattle`, `joindebate`, `joinwar`, `attack`, and `damage`.\n\n`joinbattle` and `joindebate` both accept the properties `wits`, `awareness`, `bonus dice`, `bonus successes`, and `roll`. `joinwar` is the same, except `war` is used instead of `awareness`. If you create your own macros using these templates, each of the properties should be an inline roll and the `roll` property should roll an appropriate number of times on the `exalted` table.\n\n`attack` **requires** the properties `attribute`, `ability`, `specialty`, `accuracy`, `bonus dice`, `bonus successes`, and `roll`. As with the previous templates, if you create your own attack macros, these properties should all be inline rolls, and `roll` should roll on the `exalted` table. `attack` can *optionally* include the properties `name`, `attribute name`, `ability name`, and `specialty name`. The attack roll button in the repeating section on the **Combat** tab uses the weapon name for `name`, while the other name properties are unused. If supplied in a custom macro, they will be used in place of \"Attribute\", \"Ability\", and \"Specialty\".\n\n`damage` **requires** the properties `damage type`, `damage`, `bonus dice`, `bonus successes`, `target soak`, `pool`, `minimum roll`, and `roll`. `damage` can *optionally* include `name`, `attribute name`, `attribute`, `ability name`, and `ability`.\n\nThe properties `damage`, `attribute`, `ability`, `bonus dice`, `bonus successes`, `target soak`, `pool`, `minimum roll`, and `roll` should all be inline rolls. `minimum roll` should roll on the `exalted-damage` table a number of times equal to your minimum damage for the attack (generally 1, except for overwhelming weapons). `roll` should roll on the `exalted-damage` table the appropriate number of times. The two damage rolls are distinguised by the `pool` property. **In a custom macro, `pool` should be set to roll a number of zero-sided dice equal to your damage dice pool minus your minimum damage. This roll should generate successes on results of 1 or greater, and failures on results of 1 or less.** Such an inline roll looks something along the lines of `[[(Damage + Attribute + Ability + Bonus Dice - Target Soak - Minimum Damage)d0>1f<1]]`. This computation results in either 0 (for a die pool of 0 or less) or the size of the pool expressed as a negative value. This lets the template know whether to use your minimum damage or your regular damage.\n See [Readme](https://github.com/Roll20/roll20-character-sheets/tree/master/Exalted2e) for more details and Changelog." } \ No newline at end of file