diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.css b/Shadowrun5thEdition/Shadowrun5thEdition.css index e2b324f580..efcaf356f8 100644 --- a/Shadowrun5thEdition/Shadowrun5thEdition.css +++ b/Shadowrun5thEdition/Shadowrun5thEdition.css @@ -625,7 +625,9 @@ div.sheet-cyberdeck div.sheet-row-long { left: 2px; margin-right: -43px; position: relative; - top: 6px; } + top: 6px; + z-index: 2; + opacity: 0; } .sheet-squares span { background-color: #9a9a9a; border-radius: 0px; diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.html b/Shadowrun5thEdition/Shadowrun5thEdition.html index d666ae4835..a22651f181 100644 --- a/Shadowrun5thEdition/Shadowrun5thEdition.html +++ b/Shadowrun5thEdition/Shadowrun5thEdition.html @@ -1,4 +1,4 @@ -
Shadowrun black and metallic logo

Character

Player

/w GM

wounds

modifiers

edge

+
Shadowrun black and metallic logo

Character

Player

/w GM

wounds

modifiers

edge

Personal Data

@@ -322,7 +322,7 @@
-

active..

know..

lang..

Skills

Skill

RTG

Attribute

Limit

-
ix

active..

know..

lang..

Skills

Skill

RTG

Attribute

Limit

-
ix
ix
ix
+
ix
ix

Core Combat Info

@@ -559,7 +559,7 @@
-

Qualities

Martial Arts

Quality

Type

ix

notes

Technique

Style

ix

notes

Weapons

Ranged

Melee

Weapon

Dam

ACC

AP

Mode

Recoil

Ammo

ix

Mode Options

range

primary

skill

specialization

modifier

Exotic weapons are not linked to a skill. Use Modifier input to set dicepool.

notes

Weapon

Dam

ACC

AP

Reach

ix

primary

skill

specialization

modifier

Exotic weapons are not linked to a skill. Use Modifier input to set dicepool.

notes

Armor

Armor

Rating

Acid

Cold

Elec

Fire

Radi

ix

primary

modifier

notes

Augmentations

Augmentations

Rating

Essence

ix

notes

gear

Item

Rating

Quantity

ix

notes

Magic

+

modifier

spells

type

range

duration

drain

ix

Category

Combat

Damage

Skill

Specialization

modifier dice

notes

ix

Category

Combat

Damage

Skill

Specialization

modifier dice

notes

ix

notes

ix

skill

specialization

modifier

notes

Adept Powers or Other Abilities

+

modifier

Name

Rating

ix

notes

Matrix

+

Qualities

Martial Arts

Quality

Type

ix

notes

Technique

Style

ix

notes

Weapons

Ranged

Melee

Weapon

Dam

ACC

AP

Mode

Recoil

Ammo

ix

Mode Options

range

primary

skill

specialization

modifier

Exotic weapons are not linked to a skill. Use Modifier input to set dicepool.

notes

Weapon

Dam

ACC

AP

Reach

ix

primary

skill

specialization

modifier

Exotic weapons are not linked to a skill. Use Modifier input to set dicepool.

notes

Armor

Armor

Rating

Acid

Cold

Elec

Fire

Radi

ix

primary

modifier

notes

Augmentations

Augmentations

Rating

Essence

ix

notes

gear

Item

Rating

Quantity

ix

notes

Magic

+

modifier

spells

type

range

duration

drain

ix

Category

Combat

Damage

Skill

Specialization

modifier dice

notes

ix

Category

Combat

Damage

Skill

Specialization

modifier dice

notes

ix

notes

ix

skill

specialization

modifier

notes

Adept Powers or Other Abilities

+

modifier

Name

Rating

ix

notes

Matrix

@@ -675,7 +675,7 @@ -

Programs

Qix

notes

echos

ix

notes

Complex Forms

+

modifier

ix

skill

modifier

notes

Vehicle

ix

notes

+

Programs

Qix

notes

echos

ix

notes

Complex Forms

+

modifier

ix

skill

modifier

notes

ix

name

loyalty

connection

favor

ix

notes

Vehicle

ix

notes

Options

@@ -733,7 +733,7 @@
-
Shadowrun black and metallic logo

/w GM

wounds

modifiers

edge

y

ess

m

f

r

Hand

Hand (Off)

Speed

Speed (Off)

Accel

Body

Sensor

Seat

Professional Rating

Bonuses

+d6=+d6
+d6=+d6
+d6=+d6

Movement

/ / + = / / +
/=/
/=/

val

=

val

=

val

=

/

key

=

key

=

key

=
=

Modifier

=
=

Options

key

key

key

key

key

key

key

key


key


skills

x

Skill

Rating

Rating Modifier

Attribute

Limit

wounds

modifiers

edge

y

ess

m

f

r

Hand

Hand (Off)

Speed

Speed (Off)

Accel

Body

Sensor

Seat

Professional Rating

Bonuses

+d6=+d6
+d6=+d6
+d6=+d6

Movement

/ / + = / / +
/=/
/=/

val

=

val

=

val

=

/

key

=

key

=

key

=
=

Modifier

=
=

Options

key

key

key

key

key

key

key

key


key


skills

x

Skill

Rating

Rating Modifier

Attribute

Limit

specialization

knowledgeskills

x

Skill

Rating

Rating Modifier

Attribute

Limit

specialization

languageskills

x

Skill

Rating

Rating Modifier

Attribute

Limit

specialization

skills

x

Skill

specialization

knowledgeskills

x

Skill

Rating

Rating Modifier

Attribute

Limit

specialization

languageskills

x

Skill

Rating

Rating Modifier

Attribute

Limit

specialization

skills

x

Skill

Powers

x

power

Notes

Weapons

x

Range

Dice

Name

Type

Reach

ACC

Dam

AP

Modes

Recoil

Ammo

(c)

Spells

x

Category

Dice

Name

Type

Range

Duration

Drain

Combat

Dam

Complex Forms

x

Dice

Name

Target

Duration

Fade

Intrusion Countermeasures

x

Name

IC Limit

Defense Attribute

Defense Matrix Attribute

Matrix Device

Programs

xQ

name

notes

{{#header}}

{{header}}

{{/header}} +

Powers

x

power

Notes

Weapons

x

Range

Dice

Name

Type

Reach

ACC

Dam

AP

Modes

Recoil

Ammo

(c)

Spells

x

Category

Dice

Name

Type

Range

Duration

Drain

Combat

Dam

Complex Forms

x

Dice

Name

Target

Duration

Fade

Intrusion Countermeasures

x

Name

IC Limit

Defense Attribute

Defense Matrix Attribute

Matrix Device

Programs

xQ

name

notes

{{#header}}

{{header}}

{{/header}} {{#base}}{{base}}{{/base}} {{#rollLess() wound 0}}{{/rollLess() wound 0}} {{#rollLess() mod 0}}{{/rollLess() mod 0}} diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.pug b/Shadowrun5thEdition/Shadowrun5thEdition.pug index 90e4d668dc..b751dd2f8d 100644 --- a/Shadowrun5thEdition/Shadowrun5thEdition.pug +++ b/Shadowrun5thEdition/Shadowrun5thEdition.pug @@ -1,4 +1,4 @@ -input(name='attr_version' type='hidden' value='4.31') +input(name='attr_version' type='hidden' value='4.32') //- CHARACTER SHEET PAGE input.sheet_type(name='attr_sheet_type' type='hidden' value='pc') diff --git a/Shadowrun5thEdition/src/pug/abstracts/_mixins.pug b/Shadowrun5thEdition/src/pug/abstracts/_mixins.pug index 2045461ab2..9e977d1175 100644 --- a/Shadowrun5thEdition/src/pug/abstracts/_mixins.pug +++ b/Shadowrun5thEdition/src/pug/abstracts/_mixins.pug @@ -5,10 +5,10 @@ mixin rollButton(header, base, rollFormula) //- SKILL BUTTON mixin skillButton(specialization, skillType) - const rollName = specialization ? 'specialization' : 'skill'; - - const specBonus = specialization ? '+ 2 [Specialization Bonus]' : ''; + - const specBonus = specialization ? 2 : 0; - const specDescription = specialization ? 'Spec: @{specialization}, ' : ''; - const display = specialization ? 'attr_specialization' : skillType != 'active' ? 'attr_skill' : 'attr_display_skill'; - button.eclipse(name=`roll_${rollName}` type='roll' value!=rollBeginging+`{{header=@{skill}}}{{base=@{display_attribute}}}{{dice=[[((@{dicepool} [Skill] + @{attribute} [Attribute] ${specBonus} + @{hot_sim} [Hot Sim] - @{running_silent} [Running Silent])${rollEnding}{{desc=${specDescription}@{display_limit} @{limit}}}`) + button.eclipse(name=`roll_${rollName}` type='roll' value!=rollBeginging+`{{header=@{skill}}}{{base=@{display_attribute}}}{{dice=[[((@{dicepool}+@{attribute}+${specBonus})+(@{hot_sim}-@{running_silent})${rollEnding}{{desc=${specDescription}@{display_limit} @{limit}}}`) span(name=display) //- ROLLS diff --git a/Shadowrun5thEdition/src/pug/base/_variables.pug b/Shadowrun5thEdition/src/pug/base/_variables.pug index 79f82f57bf..5323968fb0 100644 --- a/Shadowrun5thEdition/src/pug/base/_variables.pug +++ b/Shadowrun5thEdition/src/pug/base/_variables.pug @@ -62,6 +62,6 @@ //- DIE ROLL VARIABLES - const rollBeginging = '@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}'; -- const rollEnding = ' + @{wounds_toggle} [Wounds] + @{modifiers_toggle} [Modifiers] + @{edge_toggle} [Edge])d6>5@{explode_toggle}]]}}'; +- const rollEnding = ' +@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}'; - const noWoundsRollBegining = '@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{edge=[[@{edge_toggle}]]}}'; - const noWoundsRollEnding = '+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}'; diff --git a/Shadowrun5thEdition/src/scss/components/_conditionmonitor.scss b/Shadowrun5thEdition/src/scss/components/_conditionmonitor.scss index 473be65139..0804428386 100644 --- a/Shadowrun5thEdition/src/scss/components/_conditionmonitor.scss +++ b/Shadowrun5thEdition/src/scss/components/_conditionmonitor.scss @@ -85,6 +85,8 @@ margin-right: -43px; position : relative; top : 6px; + z-index: 2; + opacity: 0; } span {