- Weapons
+ Weapons
+
+ Attack and Damage separate roll
+ Attack and Damage single roll
+
@@ -606,29 +610,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -684,29 +690,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -762,29 +770,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -841,29 +851,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -919,29 +931,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -997,29 +1011,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -1075,29 +1091,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -1153,29 +1171,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -1231,29 +1251,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -1310,29 +1332,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -1389,29 +1413,31 @@
- Single attack:
-
+ Single attack
+
+
+ Single Attack and Damage
+
- Full Attack:
-
+ Full Attack
+
+
- Damage Roll:
-
-
- Single Attack and Damage:
-
+ Damage Roll
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
@@ -6654,386 +6680,399 @@ var callRollTemplate = function(rollTemplateStringPart){
/
- Attack1
-
-
-
-
Attack
-
Type
-
Attack Enh
-
Attack Focus
-
Attack Specialize
-
Critical
-
Range
-
Ammunition
-
Attack Ability
-
Damage Ability
-
Damage
-
Var. Damage
-
-
-
-
-
-
-
-
-20/x
-
-
-
-
-
-
-
-
-
-
-
- Single attack:
-
-
- Full Attack:
-
-
- Damage Roll:
-
-
- Single Attack and Damage:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Attack2
-
-
-
-
Attack
-
Type
-
Attack Enh
-
Attack Focus
-
Attack Specialize
-
Critical
-
Range
-
Ammunition
-
Attack Ability
-
Damage Ability
-
Damage
-
Var. Damage
-
-
-
-
-
-
-
-
-20/x
-
-
-
-
-
-
-
-
-
-
-
- Single attack:
-
-
- Full Attack:
-
-
- Damage Roll:
-
-
- Single Attack and Damage:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Attack3
-
-
-
-
Attack
-
Type
-
Attack Enh
-
Attack Focus
-
Attack Specialize
-
Critical
-
Range
-
Ammunition
-
Attack Ability
-
Damage Ability
-
Damage
-
Var. Damage
-
-
-
-
-
-
-
-
-20/x
-
-
-
-
-
-
-
-
-
-
-
- Single attack:
-
-
- Full Attack:
-
-
- Damage Roll:
-
-
- Single Attack and Damage:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Attack4
-
-
-
-
Attack
-
Type
-
Attack Enh
-
Attack Focus
-
Attack Specialize
-
Critical
-
Range
-
Ammunition
-
Attack Ability
-
Damage Ability
-
Damage
-
Var. Damage
-
-
-
-
-
-
-
-
-20/x
-
-
-
-
-
-
-
-
-
-
-
- Single attack:
-
-
- Full Attack:
-
-
- Damage Roll:
-
-
- Single Attack and Damage:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Attack5
-
-
-
-
Attack
-
Type
-
Attack Enh
-
Attack Focus
-
Attack Specialize
-
Critical
-
Range
-
Ammunition
-
Attack Ability
-
Damage Ability
-
Damage
-
Var. Damage
-
-
-
-
-
-
-
-
-20/x
-
-
-
-
-
-
-
-
-
-
-
- Single attack:
-
-
- Full Attack:
-
-
- Damage Roll:
-
-
- Single Attack and Damage:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Attack and Damage separate roll
+ Attack and Damage single roll
+
+ Attack1
+
+
+
+
Attack
+
Type
+
Attack Enh
+
Attack Focus
+
Attack Specialize
+
Critical
+
Range
+
Ammunition
+
Attack Ability
+
Damage Ability
+
Damage
+
Var. Damage
+
+
+
+
+
+
+
+
-20/x
+
+
+
+
+
+
+
+
+
+
+
+ Single attack
+
+
+ Single Attack and Damage:
+
+
+ Full Attack:
+
+
+
+ Damage Roll:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Attack2
+
+
+
+
Attack
+
Type
+
Attack Enh
+
Attack Focus
+
Attack Specialize
+
Critical
+
Range
+
Ammunition
+
Attack Ability
+
Damage Ability
+
Damage
+
Var. Damage
+
+
+
+
+
+
+
+
-20/x
+
+
+
+
+
+
+
+
+
+
+
+ Single attack
+
+
+ Single Attack and Damage:
+
+
+ Full Attack:
+
+
+
+ Damage Roll:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Attack3
+
+
+
+
Attack
+
Type
+
Attack Enh
+
Attack Focus
+
Attack Specialize
+
Critical
+
Range
+
Ammunition
+
Attack Ability
+
Damage Ability
+
Damage
+
Var. Damage
+
+
+
+
+
+
+
+
-20/x
+
+
+
+
+
+
+
+
+
+
+
+ Single attack
+
+
+ Single Attack and Damage:
+
+
+ Full Attack:
+
+
+
+ Damage Roll:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Attack4
+
+
+
+
Attack
+
Type
+
Attack Enh
+
Attack Focus
+
Attack Specialize
+
Critical
+
Range
+
Ammunition
+
Attack Ability
+
Damage Ability
+
Damage
+
Var. Damage
+
+
+
+
+
+
+
+
-20/x
+
+
+
+
+
+
+
+
+
+
+
+ Single attack
+
+
+ Single Attack and Damage:
+
+
+ Full Attack:
+
+
+
+ Damage Roll:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Attack5
+
+
+
+
Attack
+
Type
+
Attack Enh
+
Attack Focus
+
Attack Specialize
+
Critical
+
Range
+
Ammunition
+
Attack Ability
+
Damage Ability
+
Damage
+
Var. Damage
+
+
+
+
+
+
+
+
-20/x
+
+
+
+
+
+
+
+
+
+
+
+ Single attack
+
+
+ Single Attack and Damage:
+
+
+ Full Attack:
+
+
+
+ Damage Roll:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Attack:
diff --git a/D&D_3-5/sheet.json b/D&D_3-5/sheet.json
index 0aeae2be2b..9f18115f6e 100644
--- a/D&D_3-5/sheet.json
+++ b/D&D_3-5/sheet.json
@@ -15,36 +15,65 @@
"Base mode|1",
"Full mode|2"
],
- "default": "",
- "description": "Spell mode This option can be be later changed on individual sheets from the 'Settings-page.'"
+ "default": "2"
+ },
+ {
+ "attribute": "attackmode",
+ "displayname": "Attack mode for PC? ",
+ "type": "select",
+ "options": [
+ "Attack and damage separated mode|1",
+ "Single attack and damage roll mode|2"
+ ],
+ "default": "1"
+ },
+ {
+ "attribute": "summonsAttackmode",
+ "displayname": "Attack mode in summons section? ",
+ "type": "select",
+ "options": [
+ "Attack and damage separated mode|1",
+ "Single attack and damage roll mode|2"
+ ],
+ "default": "1"
+ },
+ {
+ "attribute": "npcAttackmode",
+ "displayname": "Attack mode for NPC? ",
+ "type": "select",
+ "options": [
+ "Attack and damage separated mode|1",
+ "Single attack and damage roll mode|2"
+ ],
+ "default": "1"
},
{
"attribute": "weightscale",
"displayname": "Weight unit setup for weight calculations:",
"displaytranslationkey": "weight-setup-info1",
"type": "text",
- "value": "1",
+ "value": "1"
},
{
"attribute": "weightunit",
"displayname": "Unit should be an abbreviation of 2 or 3 characters:",
"displaytranslationkey": "weight-setup-info2",
"type": "text",
- "value": "lbs",
+ "value": "lbs"
},
{
"attribute": "lengthscale",
"displayname": "Length unit setup for speed calculations:",
"displaytranslationkey": "length-setup-info1",
"type": "text",
- "value": "1",
+ "value": "1"
},
{
"attribute": "lengthunit",
"displayname": "Unit should be an abbreviation of 2 or 3 characters:",
"displaytranslationkey": "length-setup-info2",
"type": "text",
- "value": "ft",
+ "value": "ft"
}
]
}
diff --git a/D&D_3-5/translation.json b/D&D_3-5/translation.json
index d635ddeea6..5cfd7f0cdc 100644
--- a/D&D_3-5/translation.json
+++ b/D&D_3-5/translation.json
@@ -143,6 +143,8 @@
"available": "Available",
"used": "Used",
"weapon": "Weapon",
+ "attack-damage-separate-roll": "Attack and Damage separate roll",
+ "attack-damage-single-roll": "Attack and Damage single roll",
"single-attack": "Single Attack",
"full-attack": "Full Attack",
"damage-roll": "Damage Roll",