diff --git a/Only-War-Enhanced/OnlyWarEnhanced.html b/Only-War-Enhanced/OnlyWarEnhanced.html index 378ecb79cd..4fd634d74f 100644 --- a/Only-War-Enhanced/OnlyWarEnhanced.html +++ b/Only-War-Enhanced/OnlyWarEnhanced.html @@ -1838,8 +1838,8 @@

Auto Roll Hit Locations


@@ -1860,7 +1860,7 @@

Vehicle Sheet


- + @@ -2940,7 +2940,7 @@ * @param {string} source row id of the weapon */ const calcDmg = function (sources, fields) { - var redice = /^(\d+)?(d\d+)\s?((?:kh?\d+)?(?:kl\d+)?(?:dl?\d+)?(?:dh\d+)?\s?(?:[\+|-]\d+)?)?/; + var redice = /^(\d+)?(d\d+)(.*)?/; getAttrs(fields, v => { let attr = {}; @@ -3879,20 +3879,429 @@ {{#loc}} {{^attack}}
{{/attack}} {{#attack}}
{{/attack}} -
Hit Location {{loc}}
-
- {{#rollBetween() loc 1 10}} HEAD {{/rollBetween() loc 1 10}} - {{#rollBetween() loc 11 20}} RIGHT ARM {{/rollBetween() loc 11 20}} - {{#rollBetween() loc 21 30}} LEFT ARM {{/rollBetween() loc 21 30}} - {{#rollBetween() loc 31 70}} BODY {{/rollBetween() loc 31 70}} - {{#rollBetween() loc 71 85}} RIGHT LEG {{/rollBetween() loc 71 85}} - {{#rollBetween() loc 86 100}} LEFT LEG {{/rollBetween() loc 86 100}} - - {{#rollBetween() loc 1 20}} / MOTIVE SYSTEM {{/rollBetween() loc 1 20}} - {{#rollBetween() loc 21 60}} / HULL {{/rollBetween() loc 21 60}} - {{#rollBetween() loc 61 80}} / WEAPON {{/rollBetween() loc 61 80}} - {{#rollBetween() loc 81 100}} / TURRET {{/rollBetween() loc 81 100}} -
+ + {{#rollTotal() roll 10}} +
Hit Location: 01
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 10}} + {{#rollTotal() roll 20}} +
Hit Location: 02
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 20}} + {{#rollTotal() roll 30}} +
Hit Location: 03
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 30}} + {{#rollTotal() roll 40}} +
Hit Location: 04
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 40}} + {{#rollTotal() roll 50}} +
Hit Location: 05
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 50}} + {{#rollTotal() roll 60}} +
Hit Location: 06
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 60}} + {{#rollTotal() roll 70}} +
Hit Location: 07
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 70}} + {{#rollTotal() roll 80}} +
Hit Location: 08
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 80}} + {{#rollTotal() roll 90}} +
Hit Location: 09
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 90}} + {{#rollTotal() roll 1}} +
Hit Location: 10
+
HEAD / MOTIVE SYSTEM
+ {{/rollTotal() roll 1}} + + {{#rollTotal() roll 11}} +
Hit Location: 11
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 11}} + {{#rollTotal() roll 21}} +
Hit Location: 12
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 21}} + {{#rollTotal() roll 31}} +
Hit Location: 13
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 31}} + {{#rollTotal() roll 41}} +
Hit Location: 14
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 41}} + {{#rollTotal() roll 51}} +
Hit Location: 15
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 51}} + {{#rollTotal() roll 61}} +
Hit Location: 16
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 61}} + {{#rollTotal() roll 71}} +
Hit Location: 17
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 71}} + {{#rollTotal() roll 81}} +
Hit Location: 18
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 81}} + {{#rollTotal() roll 91}} +
Hit Location: 19
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 91}} + {{#rollTotal() roll 2}} +
Hit Location: 20
+
RIGHT ARM / MOTIVE SYSTEM
+ {{/rollTotal() roll 2}} + + {{#rollTotal() roll 12}} +
Hit Location: 21
+
LEFT ARM / HULL
+ {{/rollTotal() roll 12}} + {{#rollTotal() roll 22}} +
Hit Location: 22
+
LEFT ARM / HULL
+ {{/rollTotal() roll 22}} + {{#rollTotal() roll 32}} +
Hit Location: 23
+
LEFT ARM / HULL
+ {{/rollTotal() roll 32}} + {{#rollTotal() roll 42}} +
Hit Location: 24
+
LEFT ARM / HULL
+ {{/rollTotal() roll 42}} + {{#rollTotal() roll 52}} +
Hit Location: 25
+
LEFT ARM / HULL
+ {{/rollTotal() roll 52}} + {{#rollTotal() roll 62}} +
Hit Location: 26
+
LEFT ARM / HULL
+ {{/rollTotal() roll 62}} + {{#rollTotal() roll 72}} +
Hit Location: 27
+
LEFT ARM / HULL
+ {{/rollTotal() roll 72}} + {{#rollTotal() roll 82}} +
Hit Location: 28
+
LEFT ARM / HULL
+ {{/rollTotal() roll 82}} + {{#rollTotal() roll 92}} +
Hit Location: 29
+
LEFT ARM / HULL
+ {{/rollTotal() roll 92}} + {{#rollTotal() roll 3}} +
Hit Location: 30
+
LEFT ARM / HULL
+ {{/rollTotal() roll 3}} + + {{#rollTotal() roll 13}} +
Hit Location: 31
+
BODY / HULL
+ {{/rollTotal() roll 13}} + {{#rollTotal() roll 23}} +
Hit Location: 32
+
BODY / HULL
+ {{/rollTotal() roll 23}} + {{#rollTotal() roll 33}} +
Hit Location: 33
+
BODY / HULL
+ {{/rollTotal() roll 33}} + {{#rollTotal() roll 43}} +
Hit Location: 34
+
BODY / HULL
+ {{/rollTotal() roll 43}} + {{#rollTotal() roll 53}} +
Hit Location: 35
+
BODY / HULL
+ {{/rollTotal() roll 53}} + {{#rollTotal() roll 63}} +
Hit Location: 36
+
BODY / HULL
+ {{/rollTotal() roll 63}} + {{#rollTotal() roll 73}} +
Hit Location: 37
+
BODY / HULL
+ {{/rollTotal() roll 73}} + {{#rollTotal() roll 83}} +
Hit Location: 38
+
BODY / HULL
+ {{/rollTotal() roll 83}} + {{#rollTotal() roll 93}} +
Hit Location: 39
+
BODY / HULL
+ {{/rollTotal() roll 93}} + {{#rollTotal() roll 4}} +
Hit Location: 40
+
BODY / HULL
+ {{/rollTotal() roll 4}} + {{#rollTotal() roll 14}} +
Hit Location: 41
+
BODY / HULL
+ {{/rollTotal() roll 14}} + {{#rollTotal() roll 24}} +
Hit Location: 42
+
BODY / HULL
+ {{/rollTotal() roll 24}} + {{#rollTotal() roll 34}} +
Hit Location: 43
+
BODY / HULL
+ {{/rollTotal() roll 34}} + {{#rollTotal() roll 44}} +
Hit Location: 44
+
BODY / HULL
+ {{/rollTotal() roll 44}} + {{#rollTotal() roll 54}} +
Hit Location: 45
+
BODY / HULL
+ {{/rollTotal() roll 54}} + {{#rollTotal() roll 64}} +
Hit Location: 46
+
BODY / HULL
+ {{/rollTotal() roll 64}} + {{#rollTotal() roll 74}} +
Hit Location: 47
+
BODY / HULL
+ {{/rollTotal() roll 74}} + {{#rollTotal() roll 84}} +
Hit Location: 48
+
BODY / HULL
+ {{/rollTotal() roll 84}} + {{#rollTotal() roll 94}} +
Hit Location: 49
+
BODY / HULL
+ {{/rollTotal() roll 94}} + {{#rollTotal() roll 5}} +
Hit Location: 50
+
BODY / HULL
+ {{/rollTotal() roll 5}} + {{#rollTotal() roll 15}} +
Hit Location: 51
+
BODY / HULL
+ {{/rollTotal() roll 15}} + {{#rollTotal() roll 25}} +
Hit Location: 52
+
BODY / HULL
+ {{/rollTotal() roll 25}} + {{#rollTotal() roll 35}} +
Hit Location: 53
+
BODY / HULL
+ {{/rollTotal() roll 35}} + {{#rollTotal() roll 45}} +
Hit Location: 54
+
BODY / HULL
+ {{/rollTotal() roll 45}} + {{#rollTotal() roll 55}} +
Hit Location: 55
+
BODY / HULL
+ {{/rollTotal() roll 55}} + {{#rollTotal() roll 65}} +
Hit Location: 56
+
BODY / HULL
+ {{/rollTotal() roll 65}} + {{#rollTotal() roll 75}} +
Hit Location: 57
+
BODY / HULL
+ {{/rollTotal() roll 75}} + {{#rollTotal() roll 85}} +
Hit Location: 58
+
BODY / HULL
+ {{/rollTotal() roll 85}} + {{#rollTotal() roll 95}} +
Hit Location: 59
+
BODY / HULL
+ {{/rollTotal() roll 95}} + {{#rollTotal() roll 6}} +
Hit Location: 60
+
BODY / HULL
+ {{/rollTotal() roll 6}} + {{#rollTotal() roll 16}} +
Hit Location: 61
+
BODY / WEAPON
+ {{/rollTotal() roll 16}} + {{#rollTotal() roll 26}} +
Hit Location: 62
+
BODY / WEAPON
+ {{/rollTotal() roll 26}} + {{#rollTotal() roll 36}} +
Hit Location: 63
+
BODY / WEAPON
+ {{/rollTotal() roll 36}} + {{#rollTotal() roll 46}} +
Hit Location: 64
+
BODY / WEAPON
+ {{/rollTotal() roll 46}} + {{#rollTotal() roll 56}} +
Hit Location: 65
+
BODY / WEAPON
+ {{/rollTotal() roll 56}} + {{#rollTotal() roll 66}} +
Hit Location: 66
+
BODY / WEAPON
+ {{/rollTotal() roll 66}} + {{#rollTotal() roll 76}} +
Hit Location: 67
+
BODY / WEAPON
+ {{/rollTotal() roll 76}} + {{#rollTotal() roll 86}} +
Hit Location: 68
+
BODY / WEAPON
+ {{/rollTotal() roll 86}} + {{#rollTotal() roll 96}} +
Hit Location: 69
+
BODY / WEAPON
+ {{/rollTotal() roll 96}} + {{#rollTotal() roll 7}} +
Hit Location: 70
+
BODY / WEAPON
+ {{/rollTotal() roll 7}} + + {{#rollTotal() roll 17}} +
Hit Location: 71
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 17}} + {{#rollTotal() roll 27}} +
Hit Location: 72
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 27}} + {{#rollTotal() roll 37}} +
Hit Location: 73
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 37}} + {{#rollTotal() roll 47}} +
Hit Location: 74
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 47}} + {{#rollTotal() roll 57}} +
Hit Location: 75
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 57}} + {{#rollTotal() roll 67}} +
Hit Location: 76
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 67}} + {{#rollTotal() roll 77}} +
Hit Location: 77
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 77}} + {{#rollTotal() roll 87}} +
Hit Location: 78
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 87}} + {{#rollTotal() roll 97}} +
Hit Location: 79
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 97}} + {{#rollTotal() roll 8}} +
Hit Location: 80
+
RIGHT LEG / WEAPON
+ {{/rollTotal() roll 8}} + {{#rollTotal() roll 18}} +
Hit Location: 81
+
RIGHT LEG / TURRET
+ {{/rollTotal() roll 18}} + {{#rollTotal() roll 28}} +
Hit Location: 82
+
RIGHT LEG / TURRET
+ {{/rollTotal() roll 28}} + {{#rollTotal() roll 38}} +
Hit Location: 83
+
RIGHT LEG / TURRET
+ {{/rollTotal() roll 38}} + {{#rollTotal() roll 48}} +
Hit Location: 84
+
RIGHT LEG / TURRET
+ {{/rollTotal() roll 48}} + {{#rollTotal() roll 58}} +
Hit Location: 85
+
RIGHT LEG / TURRET
+ {{/rollTotal() roll 58}} + + {{#rollTotal() roll 68}} +
Hit Location: 86
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 68}} + {{#rollTotal() roll 78}} +
Hit Location: 87
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 78}} + {{#rollTotal() roll 88}} +
Hit Location: 88
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 88}} + {{#rollTotal() roll 98}} +
Hit Location: 89
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 98}} + {{#rollTotal() roll 9}} +
Hit Location: 90
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 9}} + {{#rollTotal() roll 19}} +
Hit Location: 91
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 19}} + {{#rollTotal() roll 29}} +
Hit Location: 92
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 29}} + {{#rollTotal() roll 39}} +
Hit Location: 93
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 39}} + {{#rollTotal() roll 49}} +
Hit Location: 94
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 49}} + {{#rollTotal() roll 59}} +
Hit Location: 95
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 59}} + {{#rollTotal() roll 69}} +
Hit Location: 96
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 69}} + {{#rollTotal() roll 79}} +
Hit Location: 97
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 79}} + {{#rollTotal() roll 89}} +
Hit Location: 98
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 89}} + {{#rollTotal() roll 99}} +
Hit Location: 99
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 99}} + {{#rollTotal() roll 100}} +
Hit Location: 00
+
LEFT LEG / TURRET
+ {{/rollTotal() roll 100}} + +
{{/loc}} diff --git a/Only-War-Enhanced/sheet.json b/Only-War-Enhanced/sheet.json index f29860ffa3..06af0cb32a 100644 --- a/Only-War-Enhanced/sheet.json +++ b/Only-War-Enhanced/sheet.json @@ -23,11 +23,11 @@ "displayname": "Auto Roll Hit Locations", "type": "select", "options": [ - "Automatically roll hit locations from an independent d100|{{loc=[[1d100]]}}", + "Automatically roll hit locations from an independent d100|{{loc=}}", "Don't automatically roll hit locations| " ], - "default": " ", - "description": "If active, automatically rolls Hit Location from a 1d100, independent of the attack roll. Scanning and reversing the attack roll to automatically get the proper number isn't possible at present." + "default": "{{loc=}}", + "description": "If active, automatically rolls Hit Location by reversing the attack roll." }, { "attribute": "settings_crunchsummary",