diff --git a/Shadowrun3e/shadowrun3e.css b/Shadowrun3e/shadowrun3e.css
index c4c3c543bd..8bbebee68e 100644
--- a/Shadowrun3e/shadowrun3e.css
+++ b/Shadowrun3e/shadowrun3e.css
@@ -530,7 +530,12 @@ input:checked+.slider:before {
display: grid;
grid-template-columns: auto auto auto auto auto auto auto auto auto;
}
-
+.combat-tabs-combat,
+.combat-tabs-ranged,
+.combat-tabs-melee,
+.combat-tabs-explosives,
+.combat-tabs-armor,
+.combat-tabs-ammo,
.rigger-tabs-skills,
.rigger-tabs-rcdeck,
.rigger-tabs-subscriber,
@@ -558,6 +563,12 @@ input:checked+.slider:before {
border-top-right-radius: 10px;
border-top-left-radius: 10px;
}
+.combat-tabs-switch[value="combat"]~button.combat-tabs-combat,
+.combat-tabs-switch[value="ranged"]~button.combat-tabs-ranged,
+.combat-tabs-switch[value="melee"]~button.combat-tabs-melee,
+.combat-tabs-switch[value="explosives"]~button.combat-tabs-explosives,
+.combat-tabs-switch[value="armor"]~button.combat-tabs-armor,
+.combat-tabs-switch[value="ammo"]~button.combat-tabs-ammo,
.rigger-tabs-switch[value="rigger"]~button.rigger-tabs-skills,
.rigger-tabs-switch[value="rcdeck"]~button.rigger-tabs-rcdeck,
.rigger-tabs-switch[value="subscriber"]~button.rigger-tabs-subscriber,
@@ -584,7 +595,12 @@ input:checked+.slider:before {
border-right: 3px solid black;
border-bottom: unset;
}
-
+.combat-skills,
+.rangedweapons,
+.meleeweapons,
+.explosives,
+.armor,
+.ammo,
.rigger-rcdeck,
.vehicle-skills,
.drones-list,
@@ -606,6 +622,12 @@ input:checked+.slider:before {
display: none;
}
+.combat-tabs-switch[value="combat"]~div.combat-skills,
+.combat-tabs-switch[value="ranged"]~div.rangedweapons,
+.combat-tabs-switch[value="melee"]~div.meleeweapons,
+.combat-tabs-switch[value="explosives"]~div.explosives,
+.combat-tabs-switch[value="armor"]~div.armor,
+.combat-tabs-switch[value="ammo"]~div.ammo,
.rigger-tabs-switch[value="rigger"]~div.vehicle-skills,
.rigger-tabs-switch[value="rcdeck"]~div.rigger-rcdeck,
.rigger-tabs-switch[value="subscriber"]~div.drones-list,
@@ -1575,7 +1597,6 @@ input.foci-switch:checked~div.fetish-foci {
grid-template-columns: auto auto auto auto auto;
border: 2px solid #fff;
border-radius: 10px;
- background-color: rgba(192,192,192,.9);
}
.combat-skills-items {
@@ -1594,7 +1615,6 @@ input.foci-switch:checked~div.fetish-foci {
border-left: 2px solid #fff;
border-right: 2px solid #fff;
border-radius: 10px;
- background-color: rgba(192,192,192,.9);
}
melee-table-row input[type="textarea"],
.combat-unarmed input[type="textarea"] {
@@ -1651,7 +1671,6 @@ melee-table-row input[type="textarea"],
.ranged-table-row {
align-self: center;
display: grid;
- background-color: rgba(192,192,192,.9);
border-left: 2px solid #fff;
border-right: 2px solid #fff;
text-align: center;
@@ -1854,7 +1873,6 @@ melee-table-row input[type="textarea"],
.armor-headers {
display: grid;
- background-color: rgba(192,192,192,.9);
grid-template-columns: auto 35px auto 35px auto 35px auto 35px auto 35px auto 25px;
text-align: right;
align-items: center;
@@ -1871,7 +1889,6 @@ melee-table-row input[type="textarea"],
}
.armorsets-table-row {
display: grid;
- background-color: rgba(192,192,192,.9);
text-align: center;
border-left: 2px solid #fff;
border-right: 2px solid #fff;
@@ -1886,7 +1903,6 @@ melee-table-row input[type="textarea"],
}
.ammo-table-row {
display: grid;
- background-color: rgba(192,192,192,.9);
border-left: 2px solid #fff;
border-right: 2px solid #fff;
grid-template-columns: 230px 70px 70px 1fr;
@@ -1923,7 +1939,6 @@ melee-table-row input[type="textarea"],
display: grid;
font-size: 10px;
border-left: 2px solid #fff;
- background-color: rgba(192,192,192,.9);
border-right: 2px solid #fff;
text-align: center;
grid-template-columns: 50px 100px 100px 50px 45px 45px 50px 60px 60px 40px 1fr;
@@ -1941,7 +1956,6 @@ melee-table-row input[type="textarea"],
text-align: center;
display: grid;
border-left: 2px solid #fff;
- background-color: rgba(192,192,192,.9);
border-right: 2px solid #fff;
font-size: 10px;
grid-template-columns: 100px 100px 55px 40px 40px 50px 50px 50px 45px 55px 35px 40px 40px 40px 45px 45px 1fr
@@ -2575,16 +2589,6 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
.weaponfocus-show[value="false"]~div.show-weaponfocus-melee {
display: none;
}
-.armor-show,
-.armor-hide,
-.ammo-show,
-.ammo-hide,
-.explosives-show,
-.explosives-hide,
-.meleeweapons-show,
-.meleeweapons-hide,
-.rangedweapons-show,
-.rangedweapons-hide,
.vehicle-stats-show,
.vehicle-stats-hide,
.drone-list-show,
@@ -2599,16 +2603,8 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
.manual-gunnery-mods,
.manual-gunnery-show,
.manual-gunnery-hide,
-.deck-utilities-show,
-.deck-utilities-hide,
-.deck-skills-show,
-.deck-skills-hide,
-.deck-cyberdeck-show,
-.deck-cyberdeck-hide,
.securitysheaf-show,
.securitysheaf-hide,
-.combatskills-show,
-.combatskills-hide,
.vehicle-skills-show,
.vehicle-skills-hide,
.rc-deck-show,
diff --git a/Shadowrun3e/shadowrun3e.html b/Shadowrun3e/shadowrun3e.html
index 7f4c1464a8..1b2b9f8784 100644
--- a/Shadowrun3e/shadowrun3e.html
+++ b/Shadowrun3e/shadowrun3e.html
@@ -9,73 +9,74 @@
Sheet Type:
-
-
+
+
+
+
+
+
+
+
+
+
+
Spirit Type:
-
-
Force:
-
+
+
Force:
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -286,62 +306,80 @@
-
B:
-
Q:
-
S:
-
C:
-
I:
-
W:
-
R:
+
B:
+
Q:
+
S:
+
C:
+
I:
+
W:
+
R:
Combat conditions
-
Ranged Modifiers:
-
Melee Modifiers:
-
Rounds Fired:
-
Dodge
-
Ballistic:
-
Impact:
+
Ranged Modifiers:
+
Melee Modifiers:
+
Rounds Fired:
+
Dodge
+
Ballistic:
+
Impact:
-
+
-
+
-
Visibility
-
Vision Enhacement
-
Target Cover
-
Movement
-
Dual Wield
-
Called Shot
-
Aim Actions
-
Melee Foes
-
Melee Friends
-
Targets
-
Position
-
Misc Modifiers
+
Visibility
+
Vision Enhacement
+
Target Cover
+
Movement
+
Dual Wield
+
Called Shot
+
Aim Actions
+
Melee Foes
+
Melee Friends
+
Targets
+
Position
+
Misc Modifiers
-
Attributes
+
Attributes
@@ -680,37 +720,37 @@
- Dice Pools
+ Dice Pools
-
Combat
-
-
-
-
Spell
-
-
-
-
Hacking
-
-
-
-
Control
-
-
-
-
Astral
-
-
-
-
Task
-
-
-
-
+ Combat
+
+
+
+ Spell
+
+
+
+ Hacking
+
+
+
+ Control
+
+
+
+ Astral
+
+
+
+ Task
+
+
+
+
@@ -748,14 +788,14 @@
+
+
+
+
+
+
+
+
@@ -844,55 +884,62 @@
-
Spells Stacked:
-
Spells Sustained:
-
Misc. Modifiers:
-
Dispell:
-
Resist Banish:
+
Spells Stacked:
+
Spells Sustained:
+
Misc. Modifiers:
+
+
Dispell:
+
Resist Banish:
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
Astral State:
-
-
+
@@ -937,10 +987,11 @@
@@ -1116,7 +1167,7 @@
-
+
@@ -1183,7 +1234,8 @@
-
+
@@ -1219,7 +1271,8 @@
-
+
@@ -1251,8 +1304,8 @@
-
-
+
+
@@ -1262,10 +1315,18 @@
-
-
-
-
+
+
+
+
@@ -1275,7 +1336,7 @@
-
+
@@ -1346,7 +1407,7 @@
-
+
@@ -1387,66 +1448,66 @@
title="Melee Attack">
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -1501,8 +1564,8 @@
Cyberdecks and Utilities
-
Smart Frames and Agents
-
+
Smart Frames and Agents
+
@@ -1579,15 +1642,15 @@
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1598,28 +1661,39 @@
-
Initiative
d6 +
-
-
End Turn
-
Sensor
-
Evade
-
Parry
-
Posistion
-
+
Initiative
d6 +
+
+
End Turn
+
Sensor
+
Evade
+
Parry
+
Posistion
+
Combat TN
-
-
Resist
-
-
Medic
-
-
Decking
-
+
+
Resist
+
+
Medic
+
+
Decking
+
-
-
Use Hacking Pool for IC supression
-
+
+
Use Hacking Pool for IC supression
+
-
-
-
-
-
Jack In
-
-
Memory In Use:
-
-
-
-
-
-
Hacking Pool:
-
-
Hacking Pool Used:
-
-
-
-
Penalties:
+
+
+
+
+
Jack In
+
+
Memory In Use:
+
+
+
+
+
Hacking Pool:
+
+
+
Hacking Pool Used:
+
+
+
+
Penalties:
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
specialize
-
+
+
+
+
+
+
Hardware
+
+
Decking
+
+
Programming
+
+
+
+
Hardware
+
+
-
-
-
Hardware
-
-
Decking
-
-
Programming
-
+
Decking
+
+
-
-
Hardware
-
-
-
-
Decking
-
-
-
-
Programming
-
-
-
+
Programming
+
+
+
@@ -1925,7 +2030,8 @@
-
+
@@ -1933,41 +2039,57 @@
-
+
-
-
-
+
+
+
Black Hammer
-
+
-
-
-
+
+
+
Killjoy
-
+
-
-
-
+
+
+
Slow
-
+
+
-
-
-
+
+
+
@@ -1977,11 +2099,15 @@
-
+
+
-
-
-
+
+
+
@@ -2016,9 +2142,12 @@
-
-
-
+
+
+
@@ -2031,32 +2160,32 @@
Karma
-
-
-
-
-
-
+
+
+
+
+
+
- Attribute/Skill/Spell/etc.
-
-
-
+ Attribute/Skill/Spell/etc.
+
+
+
-
+
Notes
-
+
@@ -2065,13 +2194,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
Credsticks ¥
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
¥
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
¥
+
+
+
+
+
+
Vehicles List
-
Vehicle Details and Skill rating go on sepperate Vehicle Character Sheet
+
Vehicle Details and Skill rating go on sepperate
+ Vehicle Character Sheet
@@ -2159,10 +2297,10 @@
@@ -2177,416 +2315,463 @@
Vehicle Initiative:
-
IVIS Master Unit:
+
IVIS Master Unit:
FDDM Master Unit:
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
Intrusion Factor Base:
-
-
Intrusion Factor Mods:
-
-
Intrusion Factor:
-
+
+
+
Intrusion Factor Base:
+
+
Intrusion Factor Mods:
+
+
Intrusion Factor:
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
ECCM:
-
-
-
-
-
-
Electronic Warfare:
-
-
-
-
-
-
Encryption Module:
-
-
-
-
-
-
Decryption Module:
-
-
-
-
-
-
Protocol Emulation Module:
-
-
-
-
-
-
-
-
-
-
-
Update Vehicle Skill Here
-
If specializing in a specif vehicle, add modifiers to the vehicle/drone itself
-
-
-
-
-
-
-
-
-
-
-
-
Bike:
-
-
-
-
-
-
Car:
-
-
-
-
-
-
Hovercraft:
-
-
-
-
-
-
LTA Aircraft:
-
-
-
-
-
-
-
Motorboat:
-
-
-
-
-
-
Rotor Aircraft:
-
-
-
-
-
-
Sailboat:
-
-
-
-
-
Ship:
-
-
-
-
-
-
Submarine:
-
-
-
-
-
Vectored Thrust:
-
-
-
-
-
Winged Aircraft:
-
-
-
-
-
Mechanical Arm:
-
-
-
-
-
Semiballistic:
-
-
-
-
-
Suborbital:
-
-
-
-
-
Tracks:
-
-
-
-
-
-
Walkers:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ECCM:
+
+
+
+
+
+
Electronic Warfare:
+
+
+
+
+
+
Encryption Module:
+
+
+
+
+
+
Decryption Module:
+
+
+
+
+
+
Protocol Emulation Module:
+
+
+
+
+
+
+
+
Update Vehicle Skill Here
+
If specializing in a specif vehicle, add modifiers to
+ the vehicle/drone itself
+
+
+
+
+
+
+
+
+
+
+
+
Bike:
+
+
+
+
+
+
Car:
+
+
+
+
+
+
Hovercraft:
+
+
+
+
+
+
LTA Aircraft:
+
+
+
+
+
+
+
Motorboat:
+
+
+
+
+
+
Rotor Aircraft:
+
+
+
+
+
+
Sailboat:
+
+
+
+
+
Ship:
+
+
+
+
+
+
Submarine:
+
+
+
+
+
Vectored Thrust:
+
+
+
+
+
Winged Aircraft:
+
+
+
+
+
Mechanical Arm:
+
+
+
+
+
Semiballistic:
+
+
+
+
+
Suborbital:
+
+
+
+
+
Tracks:
+
+
+
+
+
+
Walkers:
+
+
+
+
+
+
+
-
-
Combat
-
-
-
-
-
-
-
-
-
-
-
-
-
Combat Skills
-
+
Combat Skills, Weapons, Armor and Ammo
+
+
+
+
+
+
+
+
+
+
+
+
Update Combat Skill Here
+
If specializing in a weapon, add modifiers to
+ the weapon itself
+
-
-
-
-
Update Combat Skill Here
-
If specializing in a weapon, add modifiers to the weapon itself
-
-
-
-
-
Ranged Weapons
-
-
-
-
Ranged Weapons
-
-
-
-
+
-
Pri
-
Sec
-
Name
-
Type
-
Conceal
-
Min
-
S
-
M
-
L
-
Ex
-
SS
-
SA
-
BF
-
FA
-
Power
-
Dmg
-
Max
-
Remain
-
Reload
-
Fire
-
More
+
Pri
+
Sec
+
Name
+
Type
+
Conceal
+
Min
+
S
+
M
+
L
+
Ex
+
SS
+
SA
+
BF
+
FA
+
Power
+
Dmg
+
Max
+
Remain
+
Reload
+
Fire
+
More
@@ -2597,7 +2782,7 @@
-
+
@@ -2647,9 +2832,9 @@
-
-
-
+
+
+
@@ -2659,7 +2844,8 @@
-
+
@@ -2669,14 +2855,23 @@
- Skill
- +Dice
- +TN
-
+ Skill
+
+
+Dice
+
+TN
+
-
-
-
+
+
+
Smart Goggles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
@@ -2763,17 +2949,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -3085,9 +3261,9 @@
-
-
-
+
+
+
-
@@ -3115,29 +3291,37 @@
-
- Detection Roll
- Security Tally
-
- Reset Tally
+
+ Detection Roll
+
+ Security Tally
+
+ Reset Tally
+
Alert Status
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Security Sheaf
-
+
Security Sheaf
-
+
@@ -3157,29 +3341,32 @@
-
+
-
+
Intrusion Countermeasures
-
+
Intrusion Countermeasures
-
+
@@ -3203,7 +3390,8 @@
-
d6 +
+
d6 +
@@ -3213,7 +3401,7 @@
-
+
@@ -3225,34 +3413,43 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -3262,19 +3459,27 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
@@ -3297,7 +3502,7 @@
-
+
Current
@@ -3347,7 +3552,7 @@
-
@@ -3489,35 +3695,38 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
Max
-
Used
+
+
Max
+
Used
Control Pool:
-
-
-
-
-
+
+
+
Vehicle:
-
+
Gunnery:
-
-
Pilot Rating:
+
+
Pilot Rating:
-
+
-
+
-
Vehicle Attributes
-
Drone Attributes
+
Vehicle Attributes
+
Drone Attributes
-
Handling:
+
Handling:
-
Speed:
+
Speed:
-
Acceleration:
+
Acceleration:
-
Body:
+
Body:
-
Armor:
+
Armor:
-
Signature:
+
Signature:
-
Autonav:
+
Autonav:
-
Pilot:
+
Pilot:
-
Firmpoints:
+
Firmpoints:
-
Hardpoints:
+
Hardpoints:
-
Seating:
+
Seating:
-
Entry Points:
+
Entry Points:
-
Fuel:
+
Fuel:
-
Economy:
+
Economy:
-
Cargo:
+
Cargo:
-
Load:
+
Load:
-
Vehicle Skill:
+
Vehicle Skill:
-
Gunnery:
+
Gunnery:
-
Walk:
+
Walk:
-
Run:
+
Run:
-
IVIS Pool;
+
IVIS Pool;
-
Stress:
+
Stress:
-
Setup/Breakdown:
+
Setup/Breakdown:
-
Total Cost:
+
Total Cost:
-
Rapid Attribute Set:
-
-
+
Rapid Attribute Set:
+
-
+
+
+
+
Vehicle Notes
+
Drone Notes
+
+
+
+
+
+
Vehicle Electornics and ECM/ECCM
+
Drone Electornics and ECM/ECCM
+
-
Vehicle Notes
-
Drone Notes
-
+
+
+
Vehicle Flux Rating
+
Drone Flux Rating
+
+
Vehicle Flux Used
+
Drone Flux Used
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Sensors:
+
+
+
+
+
+
+
Sonar:
+
+
+
+
+
+
+
ECM:
+
+
+
+
+
+
+
ECCM:
+
+
+
+
+
+
+
ED:
+
+
+
+
+
+
+
ECD:
+
+
+
+
+
+
+
+
+
+
+
+
Initiative:
+
+
End Turn:
+
+
Hand
+
+
Accel:
+
+
+
+
Body:
+
+
Armor:
+
+
Sig:
+
+
Auto:
+
+
Sensor:
+
-
+
-
Vehicle Electornics and ECM/ECCM
-
Drone Electornics and ECM/ECCM
-
-
-
-
-
Vehicle Flux Rating
-
Drone Flux Rating
-
-
Vehicle Flux Used
-
Drone Flux Used
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Sensors:
-
-
-
-
-
-
-
Sonar:
-
-
-
-
-
-
-
ECM:
-
-
-
-
-
-
-
ECCM:
-
-
-
-
-
-
-
ED:
-
-
-
-
-
-
-
ECD:
-
-
-
-
-
-
-
+
Vehicle Actions
+
Drone Actions
+
+
+
+
+
+
+
-
-
-
Initiative:
-
-
End Turn:
-
-
Hand
-
-
Accel:
-
-
-
Body:
-
-
Armor:
-
-
Sig:
-
-
Auto:
-
-
Sensor:
-
+
+
+
+
Relative Motion
+
Movement
+
Maneuver Score
+
Visibility
+
Sensor Mode
+
Target Type
+
Manual TN
+
Sensor TN
+
Recoil
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Vehicle Weapons
+
+
-
-
-
-
Vehicle Actions
-
Drone Actions
-
-
-
-
-
-
-
+
+
+
+
Name
+
Type
+
Mount
+
Min
+
S
+
M
+
L
+
Ex
+
SS
+
SA
+
BF
+
FA
+
Power
+
Damage
+
Max
+
Remain
+
Manual
+
Sensor
+
More
-
-
-
-
-
Relative Motion
-
Movement
-
Maneuver Score
-
Visibility
-
Sensor Mode
-
Target Type
-
Manual TN
-
Sensor TN
-
Recoil
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- s
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Vehicle Weapons
-
-
-
-
-
-
Name
-
Type
-
Mount
-
Min
-
S
-
M
-
L
-
Ex
-
SS
-
SA
-
BF
-
FA
-
Power
-
Damage
-
Max
-
Remain
-
Manual
-
Sensor
-
More
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Missles/Rockets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
- Skill
- +Dice
- +TN
- Recoil Comp
- Gyro Stabalization
- Targeting Assistance
- Reload Type
- Reloads
- Ammo Type
- Notes:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Missles/Rockets
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
Skill
-
+Dice
-
+TN
-
Recoil Comp
-
Gyro Stabalization
-
Targeting Assistance
-
Range Finder
-
Notes:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
Skill
+
+ +Dice
+
+ +TN
+
Recoil Comp
+
Gyro Stabalization
+
Targeting Assistance
+
Range Finder
+
Notes:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -4179,14 +4427,14 @@
Contacts
-
-
-
-
-
+
+
+
+
+
-
+
@@ -4200,24 +4448,24 @@
@@ -4303,7 +4551,7 @@ magictabs.forEach(magic => {
});
});
-const combattabs = ["combat", "ranged", "melee", "explosives", "armor", "ammunition"];
+const combattabs = ["combat", "ranged", "melee", "explosives", "armor", "ammo"];
combattabs.forEach(tab => {
button=tab + "-tab";
console.log(button)
@@ -8809,17 +9057,33 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
Rolling: {{rolldice}}d6 vs. {{targetnumber}} = {{casttest}}
{{#conjuredice}}
-
-
Total
Summon
Drain
-
{{skill}}
{{computed::skill}}
{{conjuredicedrain}}
-
{{/conjuredice}}
+
+
Total
+
+
Summon
+
+
Drain
+
{{skill}}
+
+
{{computed::skill}}
+
+
{{conjuredicedrain}}
+
{{/conjuredice}}
{{#roll}}
Casting Test: {{computed::cast}} {{computed::roll}}
{{/roll}}
{{#draintest}}
-
-
Drain
Resist Test
Final
-
{{computed::draindamage}}
{{draintest}}
{{computed::finaldrain}}
-
- {{/draintest}}
+
+
Drain
+
+
Resist Test
+
+
Final
+
{{computed::draindamage}}
+
+
{{draintest}}
+
+
{{computed::finaldrain}}
+
+ {{/draintest}}
{{#description}}
{{description}}
{{/description}}
{{#notes}}
{{notes}}
{{/notes}}
{{#notes2}}
{{notes2}}
{{/notes2}}
@@ -8829,33 +9093,60 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
Rolling: {{computed::rolldice}}d6 vs. {{targetnumber}} = {{casttest}}
- {{#spelldamage}}
Force: {{castforce}} Damage: {{computed::spelldamage}}
{{/spelldamage}}
+ {{#spelldamage}}
Force: {{castforce}} Damage: {{computed::spelldamage}}
+ {{/spelldamage}}
{{#sorcerydice}}
-
-
Dice
Sorcery
Pool
-
Used
{{sorcerydice}}
{{#spellpool}}{{spellpool}}{{/spellpool}}
-
{{/sorcerydice}}
+
+
Dice
+
+
Sorcery
+
+
Pool
+
Used
+
+
{{sorcerydice}}
+
+
{{#spellpool}}{{spellpool}}{{/spellpool}}
+
{{/sorcerydice}}
{{#roll}}
Casting Test: {{computed::cast}} {{computed::roll}}
{{/roll}}
{{#draintest}}
-
-
Drain
Resist Test
Final
-
{{computed::draindamage}}
{{draintest}}
{{computed::finaldrain}}
-
- {{/draintest}}
+
+
Drain
+
+
Resist Test
+
+
Final
+
{{computed::draindamage}}
+
+
{{draintest}}
+
+
{{computed::finaldrain}}
+
+ {{/draintest}}
{{#description}}
{{description}}
{{/description}}
{{#notes}}
{{notes}}
{{/notes}}
{{#notes2}}
{{notes2}}
{{/notes2}}
{{#resist}}
{{targetofspell}}: {{resist}}
{{/resist}}
{{#defensetest}}
-
Attack
Defense
Result
-
{{attacks}}
-
{{casttest}}
=
{{computed::defensetest}}
-
{{/defensetest}}
-
{{#spelldefense}}[Spell Defense](~selected|spelldefense||{{computed::senddata}}){{/spelldefense}}
- {{#casttest}}{{targetofspell}}:
- {{#dodge}}[Dodge](~{{targetofspell}}|dodge||{{computed::senddata}}){{/dodge}}
- [Resist](~{{targetofspell}}|{{resisttype}}||{{computed::senddata}})
-
{{/casttest}}
- {{#roll}}
{{targetofspell}}: [AOE](~selected|checkaoe||{{computed::senddata}})
{{/roll}}
+
Attack
+
+
Defense
+
+
Result
+
{{attacks}}
+
-
+
{{casttest}}
+
=
+
{{computed::defensetest}}
+
{{/defensetest}}
+
{{#spelldefense}}[Spell
+ Defense](~selected|spelldefense||{{computed::senddata}}){{/spelldefense}}
+ {{#casttest}}{{targetofspell}}:
+ {{#dodge}}[Dodge](~{{targetofspell}}|dodge||{{computed::senddata}}){{/dodge}}
+ [Resist](~{{targetofspell}}|{{resisttype}}||{{computed::senddata}})
+
{{/casttest}}
+ {{#roll}}
{{targetofspell}}: [AOE](~selected|checkaoe||{{computed::senddata}})
+ {{/roll}}
@@ -8874,23 +9165,29 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
Mode: {{attackmode}}
-
Rolling: {{rolldice}}d6 vs. {{targetnumber}}
+
Rolling: {{rolldice}}d6 vs. {{targetnumber}}
{{#attacktest}}
Attack Test: {{attacktest}}
{{/attacktest}}
- {{#defensetest}}
{{attacker}}: {{attacknumber}} vs. {{defender}}:{{defensetest}}
{{/defensetest}}
+ {{#defensetest}}
{{attacker}}: {{attacknumber}} vs.
+ {{defender}}:{{defensetest}}
{{/defensetest}}
Weapon Damage: {{computed::weaponpower}} {{computed::weapondamage}}
{{#combatpool}}
Combat Pool Used: {{combatpool}}
{{/combatpool}}
{{#pooldice}}
{{pooltype}} Poll Used: {{pooldice}}
{{/pooldice}}
- {{#weaponfocus}}
Weapon Focus: {{weaponfocus}} {{focusforce}}
{{/weaponfocus}}
- {{#attacktest}}
{{target}}: [Defend](~{{target}}|meleedefend||{{computed::senddata}}) [Full Defense](~selected|meleedefendfull||{{computed::senddata}})
{{/attacktest}}
- {{#defensetest}}
Loser: {{computed::finalwinner}} {{#dodge}}[Dodge](~{{computed::finalwinner}}|dodge||{{computed::senddata}}){{/dodge}} [Resist](~{{computed::finalwinner}}|resistroll||{{computed::senddata}})
{{/defensetest}}
+ {{#weaponfocus}}
Weapon Focus: {{weaponfocus}} {{focusforce}}
+ {{/weaponfocus}}
+ {{#attacktest}}
{{target}}:
+ [Defend](~{{target}}|meleedefend||{{computed::senddata}}) [Full
+ Defense](~selected|meleedefendfull||{{computed::senddata}})
{{/attacktest}}
+ {{#defensetest}}
Loser: {{computed::finalwinner}}
+ {{#dodge}}[Dodge](~{{computed::finalwinner}}|dodge||{{computed::senddata}}){{/dodge}}
+ [Resist](~{{computed::finalwinner}}|resistroll||{{computed::senddata}})
{{/defensetest}}
Reach: {{myname}}: {{charreach}} vs. {{target}}: {{targetreach}}
-
Mods:
- {{#reachmod}} Reach:{{computed::reachmod}}{{/reachmod}}
- {{#meleemods}} Melee:{{meleemods}}{{/meleemods}}
- {{#armorpen}} Armor Penalty:{{armorpen}}{{/armorpen}}
- {{#gyropen}} Gyro Penalty:{{gyropen}}{{/gyropen}} {{#movemods}} Move Penalty:{{movemods}}{{/movemods}}
+
Mods:
+ {{#reachmod}} Reach:{{computed::reachmod}}{{/reachmod}}
+ {{#meleemods}} Melee:{{meleemods}}{{/meleemods}}
+ {{#armorpen}} Armor Penalty:{{armorpen}}{{/armorpen}}
+ {{#gyropen}} Gyro Penalty:{{gyropen}}{{/gyropen}} {{#movemods}} Move Penalty:{{movemods}}{{/movemods}}
{{#default}}
{{default}}
{{/default}}
- {{#info}}
{{info}}
{{/info}}
+ {{#info}}
{{info}}
{{/info}}
@@ -8902,19 +9199,21 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
{{#controlpool}}Control Pool Used: {{controlpool}}
{{/controlpool}}
Weapon Damage: {{computed::weaponpower}} {{computed::weapondamage}}
{{#rounds}}{{ammotype}} Rounds: {{computed::rounds}}
{{/rounds}}
- {{#weaponfocus}}Weapon Focus: {{weaponfocus}} {{focusforce}}
{{/weaponfocus}}
+ {{#weaponfocus}}Weapon Focus: {{weaponfocus}} {{focusforce}}
+ {{/weaponfocus}}
{{#charreach}}{{myname}} Reach: {{charreach}}
{{/charreach}}
{{#targetreach}}{{target}} Reach: {{targetreach}}
{{/targetreach}}
{{#default}}{{default}}
{{/default}}
- {{#senddata}}{{target}}: [Dodge](~selected|dodge||{{computed::senddata}}) [Resist](~selected|resistroll||{{computed::senddata}})
{{/senddata}}
- Mods:{{#rangedmods}}Ranged: {{rangedmods}} {{/rangedmods}}
- {{#meleemods}} Melee: {{meleemods}} {{/meleemods}}
- {{#armorpen}} Armor Penalty: {{armorpen}}{{/armorpen}}
- {{#gyropen}} Gyro Penalty: {{gyropen}} {{/gyropen}}
- {{#movemods}} Move Penalty: {{movemods}}{{/movemods}}
- {{#targetmods}} aim assit {{targetmods}}{{/targetmods}}
-
- {{#info}}{{info}}
{{/info}}
+ {{#senddata}}{{target}}: [Dodge](~selected|dodge||{{computed::senddata}})
+ [Resist](~selected|resistroll||{{computed::senddata}})
{{/senddata}}
+ Mods:{{#rangedmods}}Ranged: {{rangedmods}} {{/rangedmods}}
+ {{#meleemods}} Melee: {{meleemods}} {{/meleemods}}
+ {{#armorpen}} Armor Penalty: {{armorpen}}{{/armorpen}}
+ {{#gyropen}} Gyro Penalty: {{gyropen}} {{/gyropen}}
+ {{#movemods}} Move Penalty: {{movemods}}{{/movemods}}
+ {{#targetmods}} aim assit {{targetmods}}{{/targetmods}}
+
+ {{#info}}{{info}}
{{/info}}
@@ -8931,7 +9230,8 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
{{#description}}{{description}}
{{/description}}
{{#notes}} {{notes}}
{{/notes}}
{{#notes2}} {{notes2}}
{{/notes2}}
- {{#senddata}}{{target}}: [Resist Explosive](~selected|resistroll||{{computed::senddata}})
{{/senddata}}
+ {{#senddata}}{{target}}: [Resist
+ Explosive](~selected|resistroll||{{computed::senddata}})
{{/senddata}}
@@ -8989,11 +9289,11 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
Target Number: {{targetnumber}}
Dice: {{dice}}
Result: {{computed::attacktest}}
- {{#senddata}}
{{character}}:
- [Spell Defense](~selected|spelldefense||{{computed::senddata}})
- {{#dodge}} [Dodge](~{{character}}|dodge||{{computed::senddata}}){{/dodge}}
- [Resist](~{{character}}|{{computed::resisttype}}||{{computed::senddata}})
-
{{/senddata}}
+ {{#senddata}}
{{character}}:
+ [Spell Defense](~selected|spelldefense||{{computed::senddata}})
+ {{#dodge}} [Dodge](~{{character}}|dodge||{{computed::senddata}}){{/dodge}}
+ [Resist](~{{character}}|{{computed::resisttype}}||{{computed::senddata}})
+
{{/senddata}}
@@ -9002,22 +9302,44 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
Rolling: {{rolldice}}d6 vs. {{targetnumber}} = {{roll}}
- {{#distance}}
Distance from Explosion: {{distance}}meter(s) Power Reduced by {{blastredux}}
{{/distance}}
+ {{#distance}}
Distance from Explosion: {{distance}}meter(s) Power Reduced by {{blastredux}}
+
{{/distance}}
{{#description}}
{{description}}
{{/description}}
- {{#finaldmg}}
-
-
Attack
Resist
Dodge
Result
-
{{attacktest}}
-
({{roll}}
+
{{dodge}})
=
{{computed::netresult}}
-
-
Final Damage: staged to {{computed::finaldmg}}
{{/finaldmg}}
- {{#spelldmg}}
-
-
Attack
Resist
Result
-
{{attacktest}}
-
{{roll}}
=
{{computed::netresult}}
-
-
Final Damage: staged to {{computed::spelldmg}}
{{/spelldmg}}
+ {{#finaldmg}}
+
+
Attack
+
+
Resist
+
+
Dodge
+
+
Result
+
{{attacktest}}
+
-
+
({{roll}}
+
+
+
{{dodge}})
+
=
+
{{computed::netresult}}
+
+
Final Damage: staged to {{computed::finaldmg}}
{{/finaldmg}}
+ {{#spelldmg}}
+
+
Attack
+
+
Resist
+
+
Result
+
{{attacktest}}
+
-
+
{{roll}}
+
=
+
{{computed::netresult}}
+
+
Final Damage: staged to {{computed::spelldmg}}
{{/spelldmg}}
Combat Pool Used: {{combatpool}}
- {{#senddata}}
{{character}}: [Resist](~selected|resistroll||{{computed::senddata}})
{{/senddata}}
+ {{#senddata}}
{{character}}: [Resist](~selected|resistroll||{{computed::senddata}})
+
{{/senddata}}
{{#notes}}
{{notes}}
{{/notes}}
{{#notes2}}
{{notes2}}
{{/notes2}}
@@ -9030,9 +9352,10 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
{{#hackingpool}}
Hacking Pool Dice: {{hackingpool}}
{{/hackingpool}}
{{#description}}
{{description}}
{{/description}}
{{action}}: {{computed::roll}}
- {{#senddata}}
{{target}}: [Resist](~selected|matrixresist||{{computed::senddata}})
{{/senddata}}
- {{#oppose}}
Utility Test {{oppose}}
{{/oppose}}
- {{#sensor}}
Sensor Test {{sensor}}
{{/sensor}}
+ {{#senddata}}
{{target}}:
+ [Resist](~selected|matrixresist||{{computed::senddata}})
{{/senddata}}
+ {{#oppose}}
Utility Test {{oppose}}
{{/oppose}}
+ {{#sensor}}
Sensor Test {{sensor}}
{{/sensor}}
{{#notes}}
{{notes}}
{{/notes}}
{{#notes2}}
{{notes2}}
{{/notes2}}
{{#detect}}
{{target}}: {{detect}}
{{/detect}}