diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md index 56a6069ab3..0a9a1d1d82 100644 --- a/D6StarWars/CHANGELOG.md +++ b/D6StarWars/CHANGELOG.md @@ -1,13 +1,3 @@ -### Version 2.34 (2021-05-17): -- Enhance Player Core info section's layout -- Reformats Player Secondary Info section -- Enhance Attributes & Skills section's layout -- Enhance Weapons & Armors section's layout -- Enhance Force section's layout -- FIX: cleaning up HTML code -- FIX: removes invalid CSS code -- FIX: Resist Pain effect works as expected - ### Version 2.33 (2021-04-06): - remove duplicated control force power name field - fix force power section width diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css index a2548c1bb9..f4c806b7a7 100644 --- a/D6StarWars/D6StarWars.css +++ b/D6StarWars/D6StarWars.css @@ -9,7 +9,7 @@ } .charsheet .sheet-version::after { - content: '2.34'; + content: '2.32'; } .charsheet label, h1, h2, h3{ @@ -32,7 +32,7 @@ .charsheet .sheet-section{ border-top: 5px dotted white; padding:10px; - width: calc(100% - 20px); + width: 100%; } .charsheet .sheet-shipinfo span { @@ -80,12 +80,12 @@ .charsheet input[type=text].sheet-smalltext{ width:60px; - margin:0; + margin:0px; } .charsheet input[type=text].sheet-mediumtext{ width:80px; - margin:0; + margin:0px; } .charsheet input[type=text].sheet-shorttext{ @@ -126,12 +126,13 @@ .charsheet .sheet-tdborder{ border: 2px solid white; vertical-align:top; + width:330px; padding:5px; margin: 5px; } .charsheet .sheet-rightmargin{ - margin-right:0; + margin-right:0px; } .charsheet select.sheet-smallselect{ @@ -139,7 +140,7 @@ height:25px; padding-top:2px; padding-bottom:2px; - margin:0; + margin:0px; display: inline-block; float:right; } @@ -149,19 +150,19 @@ height:25px; padding-top:2px; padding-bottom:2px; - margin:0; + margin:0px; display: inline-block; float:right; } .charsheet label.sheet-areaLabel{ - margin:0; + margin:0px; } /*-----------------------------------------*/ /*----------Roll Buttons classes-----------*/ .charsheet button[type=roll].sheet-d6-dice::before { /*new die changes die roller to d6*/ - font-family: 'dicefontd6', arial, sans-serif; + font-family: 'dicefontd6',arial; content: 'F '; color: red; } @@ -174,7 +175,7 @@ .charsheet .sheet-redtxt{ font-size: 8px; color: red; - font-family: 'Arial', sans-serif; + font-family: 'Arial'; } @@ -195,7 +196,7 @@ display: inline-block; width: auto; } - + .charsheet .sheet-main-settings .sheet-input-row input { margin-right: 30px; } @@ -308,7 +309,7 @@ input.sheet-options-flag { } input.sheet-options-flag + span { - margin-top: 0; + margin-top: 0px; display: none; white-space: nowrap; line-height: 15px; @@ -355,37 +356,6 @@ input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sh display: block; } -/*-------------------------------------------*/ -/*--------------- PC Section-----------------*/ - -.charsheet .sheet-physical-params { - display: flex; - margin-top: 25px; -} - -.charsheet .sheet-physical-params label { - text-align: center; -} - -.charsheet .sheet-physical-params input { - display: block; - width: 100% !important; -} - -.charsheet input[type=number].sheet-smallshortnumber { - width: 60px; - text-align: right; -} - -.charsheet .sheet-custom-roll-table { - display: table; - width: 100%; -} - -.charsheet .sheet-custom-roll-table button.sheet-d6-dice { - width: 35px; - height: 18px; -} /*-------------------------------------------*/ /*------------- Ship Section-----------------*/ @@ -601,7 +571,7 @@ div.sheet-section.sheet-ship div.sheet-other{ /* alt template colors */ .sheet-rolltemplate-swd6 .sheet-container.sheet-color-green { --header-bg-color: #008000; -} +}rgba(204, 0, 0,1) .sheet-rolltemplate-swd6 .sheet-container.sheet-color-red { --header-bg-color: rgba(204, 0, 0,1); } @@ -773,250 +743,3 @@ div.sheet-section.sheet-ship div.sheet-other{ .sheet-rolltemplate-black tr:nth-child(even) { background-color:#eee; } - -/* Attributes */ -.sheet-attributes { - border: 2px solid white; - margin: 5px; - padding: 10px; -} - -.sheet-attribute { - margin-bottom: 5px; -} - -/* Unified Dice */ -.sheet-unified-dice { - width: 32px; - height: 34px; - line-height: 34px; -} -.sheet-unified-dice-text { - display: inline-flex; - width: calc(100% - 225px); - height: 40px; - margin: 0; - padding: 0 5px; - font-size: x-large; - vertical-align: top; - line-height: 40px; -} - -input.sheet-gmroll:checked ~ .sheet-master-container .sheet-unified-dice-text { - width: calc(100% - 181px); -} - -.sheet-unified-dice-roll { -} - -button[type=roll].sheet-unified-dice-roll { - margin: 0; -} - -input[type="number"].sheet-unified-dice-input { - font-size: large; - font-weight: bold; - text-align: right; - width: 46px; - padding: 2px 4px; -} - -.sheet-unified-dice-middle { - display: inline-flex; - width: 24px; - height: 40px; - line-height: 40px; - font-size: large; - vertical-align: top; -} - -input[type="number"].sheet-unified-dice-pip { - font-size: large; - font-weight: bold; - text-align: right; - width: 46px; - padding: 2px 4px; -} - -/* Skill */ -.sheet-skill { - height: 28px; - margin: 4px 0; -} -.sheet-skill * { - height: 28px; - line-height: 26px; - width: 100%; -} -.sheet-skill label { - padding: 0 1px; -} - -.sheet-skill .sheet-unified-dice-text { - display: inline-flex; - width: calc(100% - 217px); - height: 28px; - font-size: medium; - font-weight: normal; - vertical-align: top; - line-height: 28px; -} - -input.sheet-gmroll:checked ~ .sheet-master-container .sheet-skill .sheet-unified-dice-text { - width: calc(100% - 173px); -} - -.sheet-skill button[type=roll].sheet-unified-dice-roll { - width: 32px; - height: 24px; - padding-top: 0; -} - -.sheet-skill input[type="number"].sheet-unified-dice-input { - width: 46px; - height: 28px; - font-size: inherit; - text-align: right; -} - -.sheet-skill .sheet-unified-dice-middle { - display: inline-flex; - width: 24px; - height: 28px; - font-size: medium; - vertical-align: top; - line-height: 28px; -} - -.repcontrol { - height: 28px; -} - -.sheet-skill input[type="number"].sheet-unified-dice-pip { - display: inline-flex; - width: 46px; - height: 28px; - font-size: inherit; - text-align: right; -} - - -.charsheet .sheet-redtxt { - bottom: -3px; - right: 5px; -} - - -/* Edit Mode */ -.editmode .sheet-skill { - margin: 4px 36px 4px 34px -} - -.editmode .sheet-unified-dice-roll, -.editmode .sheet-unified-dice-input, -.editmode .sheet-unified-dice-middle, -.editmode .sheet-unified-dice-pip { - display: none !important; -} - -.editmode .sheet-unified-dice-text { - width: 100% !important; -} -.editmode .sheet-armor.sheet-row:not(:first-of-type) .sheet-cell:not(:first-of-type), -.editmode .sheet-weapon.sheet-row:not(:first-of-type) .sheet-cell:not(:first-of-type) { - display: none; -} -.editmode .sheet-armor.sheet-row:not(:first-of-type) .sheet-cell:first-of-type, -.editmode .sheet-weapon.sheet-row:not(:first-of-type) .sheet-cell:first-of-type { - width: 100%; -} -.sheet-force .editmode .sheet-skill input[type=checkbox] { - display: none; -} - - -/* Weapons & Armors */ -.sheet-armor.sheet-row:first-of-type .sheet-cell, -.sheet-weapon.sheet-row:first-of-type .sheet-cell { - height: 36px; - border-bottom: 5px solid white; -} -.sheet-armor.sheet-row:first-of-type .sheet-cell-4, -.sheet-weapon.sheet-row:first-of-type .sheet-cell-4 { - vertical-align: bottom; -} -.sheet-cell { - display: inline-block; - margin: 0 4px; - text-align: center; -} -.sheet-cell:first-of-type { - margin-left: 0; -} -.sheet-cell:last-of-type { - margin-right: 0; -} -.sheet-armor.sheet-row:first-of-type .sheet-cell, -.sheet-weapon.sheet-row:first-of-type .sheet-cell { - vertical-align: top; - line-height: 36px; - font-weight: bold; -} -.sheet-weapon.sheet-row:first-of-type .sheet-cell.sheet-cell-4 { - line-height: inherit; -} -.sheet-cell-name { - min-width: 50px; - width: calc(100% - 743px); -} -.sheet-cell-name .sheet-unified-dice-text { - width: 100%; -} -.sheet-cell-dice { - width: 197px; -} -.sheet-cell-1 { - width: 46px; -} -.sheet-cell-2 { - width: 84px; -} -.sheet-cell-4 { - width: 198px; -} -.sheet-armor .sheet-cell-4 { - width: 218px; -} -.sheet-cell-4 .sheet-part { - display: inline-block; - width: 20%; -} -.sheet-cell-5 { - width: 219px; -} - -/* Force */ -.sheet-force .sheet-skill .sheet-unified-dice-text { - width: calc(100% - 139px); -} - -.sheet-force .sheet-skill input[type=checkbox], -.sheet-powers input[type=checkbox] { - display: inline-block; - height: 28px; - width: 44px; -} -.sheet-force-powers-description { - width: 100%; - height: 14em; - resize: vertical; -} -table.sheet-powers { - width: 100%; -} -table.sheet-powers td { - text-align: end; -} -.sheet-force-hide .sheet-weapon .sheet-cell.sheet-cell-name { - width: calc(100% - 418px); -} diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html index fe5cfe6705..f38844916a 100644 --- a/D6StarWars/D6StarWars.html +++ b/D6StarWars/D6StarWars.html @@ -6,1083 +6,936 @@ - - + +
- - y + + y - -

Settings

-

Player Sheet

-

NPC Sheet

-

Ship

-

Shop/Container

-

+ - -
- logo -
+

Settings

+

Player Sheet

+

NPC Sheet

+

Ship

+

Shop/Container

- -
-
+

- -
- Sheet type: - -
+ - -
- Hide GM Rolls? - -
+
+ +
- -
- Disable roll modification query when rolling? - -
+ - -
- Use Wild Die in rolls? - -
+
+
- -
- Hide/Show Sections: -
-
- Hide Force Section? -
-
- Hide Equipment Section? - -
-
- Hide Background Section? - -
-
- Hide Character Point Summary Section? - -
-
- Hide Credit Summary Section? - -
-
-
+ +
+ Sheet type: + +
- + +
+ Hide GM Rolls? + +
-
+ +
+ Disable roll modification query when rolling? + +
- + +
+ Use Wild Die in rolls? + +
-
-
-
- - - + +
+ Hide/Show Sections: +
+
+ Hide Force Section? +
+
+ Hide Equipment Section? + +
+
+ Hide Background Section? + +
+
+ Hide Character Point Summary Section? + +
+
+ Hide Credit Summary Section? + +
+
+
-
- - - - -
+ + +
+ + + +
+
+
+ + + + + + + +
+ + + + + + + +
+
+
+ + + +
+
+
+ + + +
+
+
+ + +
+
+ + + + + + + + +
+
+ + + + + + + +
+
+
+ + + + +
+
+
+ + + + + + + + +
+
+ + +
+
+
+ +
+ +
+ + + +
+
+
+ + + +
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+ D+ +
+
+
+ + + +
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+ D+ +
+
+
+ + + +
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+ D+ +
+
+
+
+ + +
+ + + +
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+ D+ +
+
+
+ + + +
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+ D+ +
+
+
+ + + +
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+ D+ +
+
+
+
+
+
+ + + +
+ + + + + + + + + + + + +
Skill RollDamageShortMedLongROFAmmo
+
+ + D+ + D+ + + + + + + + + + + + + + + + +
+ + + + + + + + +
PhysicalEnergyOtherDamage Soak Rolls
+
+ + D+ + D+ + + + + + + + + + + + + + + + + +
+
+ + + +
+ +
+
+ + + + + + + + + + +
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+
+
+ + + + + +
+ D+ +
+
+
+ + + + + + +
+
+
+
+ + + + +
+ Force Emptiness active + +
+ Resist Pain active + + +
+ # of other powers active + + +
+
+
+ + +
+
+
+
+
+ Lightsaber Combat + + D+ + + + D+ + + + +
+
+ + + +
+ + + + + + + +
+ + + + + + + + +
+
+ + + +
+ + +
+ + + + +
+ + + + + + + + + + + + +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+ + + +
+ + Character Point Balance: + +
+
+ + +
+
+
+ + + +
+ + Credit Balance: + +
+
+ + +
+
+
+ + + + +
+ Starship: + Scale: + Length:
-
- - -
-
-
- -
-
-
- - -
-
- - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Initiative bonus - D+ -
Initiative - - -
Custom Roll - - - -
Extra Dice - - - -
Character points roll - - - -
-
-
-
- - - -
-
-
- - - - - - - - -
-
- - -
-
-
- -
- -
- - - -
- -
-
- -
-
- - - - - - - -
D+
- +
+
+ + +
+
+ Era + +
+
+ New + +
+
+ Used + +
+
+ +
+
+ Era + +
+
+ Reproduction + +
+
+ New-Old-Stock + +
+
+ Restored + +
+
+ Used + +
+
-
-
- - - - - - -
D+
- -
-
-
- -
-
- - - - - - - -
D+
- +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
-
-
- - - - - - -
D+
- -
-
-
+
+ +
+
+ + +
+
+
+ Search + Scan + Passive + Focus -
-
- - + Range + + + + - - - - -
D+
- + Sensitivity + + + + +
+
+
+ +
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + +
+
+ +
+ +
+
+ + +
+ +
+ + +
-
-
- - - - - - -
D+
- -
-
-
-
- -
- -
-
- - - - - - - -
D+
- +
+ + + +
+ +
+
+ +
+
+ +
+
-
-
- - - - - - -
D+
- -
-
-
+ -
-
- - +
+ +
+ +
+ Scale: + Fire Arc: + Crew: +
- - - - -
D+
- +
+ Skill: + Fire Control: D + Space Range: + Atmosphere Range: +
+ +
+ Damage:D+ +
+ +
+
+ + +
+ +
+ Craft: + Type: + Crew:
- -
-
- - - - - - -
D+
- -
-
-
- -
-
- - - - - - - -
D+
- +
+ Skill: + Passangers: + Cargo Capacity:
- -
-
- - - - - - -
D+
- -
-
-
- -
-
-
- - - -
- -
-
-
Weapon
-
Attack
-
Damage
-
-
Range
-
PB
-
S
/
M
/
L
-
-
ROF
-
Ammo
-
- -
-
-
- +
+ Hyperdrive Multipiler: + Hyperdrive Backup: + Nav Computer:
-
- D+ - - - - -
-
- D+ - - - - -
-
-//
-
-
-
-
-
- -
-
-
Armor
-
Physical t
-
Energy e
-
Str
-
Other
+ -
-
-
- -
-
- D+ - - - - -
-
- D+ - - - - -
-
- - - - -
-
- -
-
-
-
+ -
+
+
+
+ + + +
+
+ + + +
+
+
- + -
- - -
-
- -
-
- - - - - - - -
D+
- -
- -
-
- - - - - - -
-
-
- -
-
- - - - - - - -
D+
- -
- -
-
- - - - - - -
-
-
- -
-
- - - - - - - -
D+
- -
- -
-
- - - - - - -
-
-
-
- -
- - - - - - - - - - - - - - -
Force Emptiness details - -
Resist Pain details - -
Number of active powers details - -
- -

Force Powers

- - -
-
- -
-
-
Lightsaber combat
-
Attack
-
Damage
-
- -
-
- -
-
- D+ - - - - -
-
- D+ - - - - -
-
-
-
- - - -
- - - - - - - -
- - - - - - - - -
-
- - - -
- - -
- - - -
- - - - - - - - - - - - -
-
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
-
- - - -
- - Character Point Balance: - -
-
- - -
-
-
- - - -
- - Credit Balance: - -
-
- - -
-
-
- - - -
- Starship: - Scale: - Length: -
- -
-
- - -
-
- Era - -
-
- New - -
-
- Used - -
-
- -
-
- Era - -
-
- Reproduction - -
-
- New-Old-Stock - -
-
- Restored - -
-
- Used - -
-
-
- -
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- -
- -
-
- - -
-
-
- Search - Scan - Passive - Focus - - Range - - - - - - Sensitivity - - - - -
-
-
- -
- -
-
- - -
-
- - - - - - - - - - - - - - - -
-
- -
- -
-
- - -
- -
- - -
-
- -
- - - -
- -
-
- -
-
- -
-
-
- - - -
- -
- -
- Scale: - Fire Arc: - Crew: -
- -
- Skill: - Fire Control: D - Space Range: - Atmosphere Range: -
- -
- Damage:D+ -
- -
-
- - - -
- -
- Craft: - Type: - Crew: -
-
- Skill: - Passangers: - Cargo Capacity: -
-
- Hyperdrive Multipiler: - Hyperdrive Backup: - Nav Computer: -
-
- - - -
-
-
- - - -
-
- - - -
-
-
- - - -
-

Original Author: Timothy O'Driscoll | Main Editor: Andreas - J. (Roll20user: 1223200) |

-
- -
+
+

Original Author: Timothy O'Driscoll | Main Editor: Andreas J. (Roll20user: 1223200) |

+
+
- - - + + + - + +
- {{#name}} -
{{name}}
- {{/name}} - {{#subtitle}} -
{{subtitle}}
- {{/subtitle}} + {{#name}}
{{name}}
{{/name}} + {{#subtitle}}
{{subtitle}}
{{/subtitle}}
{{#allprops() title subtitle desc color}}
{{key}}
{{value}}
{{/allprops() title subtitle desc color}} - {{#desc}} -
{{desc}}
- {{/desc}} + {{#desc}}
{{desc}}
{{/desc}}
@@ -1090,50 +943,43 @@ - +
{{#allprops() }} - - - - {{/allprops() }} -
{{name}}
{{key}}{{value}}
+ {{key}}{{value}} + {{/allprops() }} +
- +
{{#allprops() }} - - - - {{/allprops() }} -
{{name}}
{{key}}{{value}}
+ {{key}}{{value}} + {{/allprops() }} +
- +
{{#allprops() }} - - - - {{/allprops() }} -
{{name}}
{{key}}{{value}}
+ {{key}}{{value}} + {{/allprops() }} +
- +
{{#allprops() }} - - - - {{/allprops() }} -
{{name}}
{{key}}{{value}}
+ {{key}}{{value}} + {{/allprops() }} +
- + + diff --git a/D6StarWars/d6starwarspreview.png b/D6StarWars/d6starwarspreview.png index 79c70c2e3b..8fb011b44a 100644 Binary files a/D6StarWars/d6starwarspreview.png and b/D6StarWars/d6starwarspreview.png differ