From 6feed0c04045a2bd454168fd77dfc9a08a9c01fc Mon Sep 17 00:00:00 2001 From: Andreas Johansson Date: Mon, 2 Nov 2020 10:18:54 +0200 Subject: [PATCH] [Star Wars D6] v.2.31 ship update, see changelog --- D6StarWars/CHANGELOG.md | 5 + D6StarWars/D6StarWars.css | 409 +++++++++++++++++++++++++++++++------ D6StarWars/D6StarWars.html | 263 +++++++++++++++++++----- D6StarWars/sheet.json | 2 +- 4 files changed, 564 insertions(+), 115 deletions(-) diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md index 29aa376fb9..ca280780e9 100644 --- a/D6StarWars/CHANGELOG.md +++ b/D6StarWars/CHANGELOG.md @@ -1,3 +1,8 @@ +### Version 2.31 (2020-10-03): +- removed broken logo at top +- revamp of starship section +- add new roll templates, used in ship weapon damage rolls + ### Version 2.16 (2020-05-13): - add roll button names to attrs/skills diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css index 0f30aacb99..b6fc7343fc 100644 --- a/D6StarWars/D6StarWars.css +++ b/D6StarWars/D6StarWars.css @@ -2,14 +2,14 @@ /*------------- SWD6 Main CSS----------------*/ /*-------------------------------------------*/ .charsheet { - background-image: url(https://cdn.pixabay.com/photo/2015/09/29/15/12/stars-964022_960_720.png); /*black space with tiny white stars*/ + background-image: url(https://cdn.pixabay.com/photo/2015/09/29/15/12/stars-964022_960_720.png); /*black space with tiny white stars*/ background-color: black; background-repeat: repeat; color:white; } .charsheet .sheet-version::after { - content: '2.16'; + content: '2.31'; } .charsheet label, h1, h2, h3{ @@ -32,7 +32,7 @@ .charsheet .sheet-section{ border-top: 5px dotted white; padding:10px; - width: 100%; + width: 100%; } .charsheet .sheet-shipinfo span { @@ -41,7 +41,7 @@ } .charsheet .sheet-flex-box{ - display: flex; + display: flex; } .charsheet .sheet-flex-col{ flex: 1; @@ -161,10 +161,10 @@ /*-----------------------------------------*/ /*----------Roll Buttons classes-----------*/ -.charsheet button[type=roll].sheet-d6-dice::before { /*new die changes die roller to d6*/ - font-family: 'dicefontd6',arial; - content: 'F '; - color: red; +.charsheet button[type=roll].sheet-d6-dice::before { /*new die changes die roller to d6*/ + font-family: 'dicefontd6',arial; + content: 'F '; + color: red; } .charsheet .sheet-forcebutton{ @@ -173,7 +173,7 @@ } .charsheet .sheet-redtxt{ - font-size: 8px; + font-size: 8px; color: red; font-family: 'Arial'; } @@ -193,40 +193,40 @@ /*-----------(from GUMSHOE Official)---------*/ .charsheet .sheet-main-settings .sheet-input-row label { - display: inline-block; - width: auto; + display: inline-block; + width: auto; }  .charsheet .sheet-main-settings .sheet-input-row input { - margin-right: 30px; + margin-right: 30px; } .charsheet .sheet-main-settings .sheet-input-row select { - width: 45%; - margin-right: 15px; + width: 45%; + margin-right: 15px; } input.sheet-main-options.sheet-options-flag + span,/*displays the cog icon*/ input[type=radio]:checked ~ .sheet-master-container input.sheet-options-flag + span { - font-family: pictos; - font-style: normal; + font-family: pictos; + font-style: normal; } div.sheet-main-settings { - display: none; - position: relative; - margin-left: 0; + display: none; + position: relative; + margin-left: 0; } input.sheet-options-flag:checked ~ div.sheet-main-settings { - display: inline-block; - width: 600px; - height: 500px; + display: inline-block; + width: 600px; + height: 500px; } input.sheet-selector-switch , input.sheet-options-flag:checked ~ div.sheet-main-container { - display: none; + display: none; } /* all hide options using option menu checkboxes*/ @@ -245,6 +245,13 @@ input.sheet-toggle[value="3"] ~ .sheet-master-container .sheet-shop-inventory { display: block; } +input.sheet-toggle[value="2"] ~ .sheet-master-container .sheet-ship.sheet-shipblock{ + display: grid; +} +input.sheet-toggle[value="2"] ~ .sheet-master-container .sheet-ship.sheet-shipheader{ + display: flex; +} + input.sheet-background:checked ~ .sheet-master-container .sheet-background-hide, input.sheet-force:checked ~ .sheet-master-container .sheet-force-hide, input.sheet-equipment:checked ~ .sheet-master-container .sheet-equipment-hide, @@ -253,7 +260,7 @@ input.sheet-rollmod:checked ~ .sheet-master-container .sheet-rollmod, input.sheet-rollmod:not(:checked) ~ .sheet-master-container .sheet-rollmod-no, input.sheet-cptracker:checked ~ .sheet-master-container .sheet-cptracker-hide, input.sheet-credittracker:checked ~ .sheet-master-container .sheet-credittracker-hide { - display: none; + display: none; } /*-------------------------------------------*/ @@ -263,24 +270,24 @@ input.sheet-credittracker:checked ~ .sheet-master-container .sheet-credittracker input[type=number]::-webkit-inner-spin-button {} .sheet-master-container { - position: relative; - padding: 0; - display: inline-block; - background-image: url(https://cdn.pixabay.com/photo/2015/09/29/15/12/stars-964022_960_720.png); /*black space with tiny stars*/ + position: relative; + padding: 0; + display: inline-block; + background-image: url(https://cdn.pixabay.com/photo/2015/09/29/15/12/stars-964022_960_720.png); /*black space with tiny stars*/ background-color: black; background-repeat: repeat; } .sheet-container { - padding: 5px; - margin-left: -25px; - position: relative; + padding: 5px; + margin-left: -25px; + position: relative; } .sheet-main-container { - display: inline-block; - padding-top: 75px; - margin-left: 0; + display: inline-block; + padding-top: 75px; + margin-left: 0; } /*-------------------------------------------*/ @@ -289,69 +296,337 @@ input[type=number]::-webkit-inner-spin-button {} input.sheet-options-flag, input.sheet-options-flag + span { - position: absolute; - top: 2px; - right: 2px; - width: 15px; - height: 15px; + position: absolute; + top: 2px; + right: 2px; + width: 15px; + height: 15px; } input.sheet-options-flag { - z-index: 99; - opacity: 0; + z-index: 99; + opacity: 0; } input.sheet-options-flag + span { - margin-top: 0px; - display: none; - white-space: nowrap; - line-height: 15px; - font-size: 17px; - color: white; - cursor: pointer; + margin-top: 0px; + display: none; + white-space: nowrap; + line-height: 15px; + font-size: 17px; + color: white; + cursor: pointer; } input.sheet-options-flag.sheet-main-options { - width: 30px; - height: 30px; - top: 20px; - left: 20px; - z-index: 3; + width: 30px; + height: 30px; + top: 20px; + left: 20px; + z-index: 3; } input.sheet-options-flag.sheet-main-options + span { - width: 30px; - height: 30px; - top: 20px; - left: 20px; - font-size: 34px; - z-index: 2; - line-height: 30px; - opacity: .5; - display: block; + width: 30px; + height: 30px; + top: 20px; + left: 20px; + font-size: 34px; + z-index: 2; + line-height: 30px; + opacity: .5; + display: block; } input.sheet-options-flag.sheet-main-options:hover + span { - opacity: 1; + opacity: 1; } input.sheet-options-flag:checked + span { - color: white; - display: block; + color: white; + display: block; } input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sheet-options, input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sheet-options-flag:checked ~ .sheet-display { - display: none; + display: none; } input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sheet-options-flag:checked ~ .sheet-options { - display: block; + display: block; } + +/*-------------------------------------------*/ +/*------------- Ship Section-----------------*/ + +div.sheet-ship .sheet-wborder{ + border: 2px solid white; + padding: 5px; +} + +div.sheet-shipheader{ + display: flex; + justify-content: center; + flex-flow: row nowrap; +} + +div.sheet-shipheader span:nth-child(1) input[type="text"]{ + width: 300px; +} +div.sheet-shipheader span:nth-child(2) input[type="text"]{ + width: 150px; +} +div.sheet-shipheader span:nth-child(3) input[type="text"]{ + width: 150px; +} + +div.sheet-shipblock{ + padding: 5px; + display: grid; + grid-template-columns: 3fr 7fr; + grid-template-rows: 4fr 2fr 4fr 4fr 2fr 1fr; + grid-template-areas: "price perf " + "price sensor " + "price sensor " + "price hyperdrive" + "consume hyperdrive" + "consume dura "; + height: 550px; +} + +div.sheet-shipblock div.sheet-price{ + grid-area: price; + flex-flow: column nowrap; + justify-content: space-between; +} + +div.sheet-shipblock div.sheet-price span{ + width: 100px; +} + +div.sheet-shipblock div.sheet-price div{ + display: flex; + flex-flow: column nowrap; + justify-content: space-between; +} + +div.sheet-shipblock div.sheet-priceblock div.sheet-flex-row{ + flex-flow: row nowrap; + justify-content: space-around; + margin: 3px; +} + + +/* Performance */ +div.sheet-shipblock div.sheet-perf{ + grid-area: perf; + padding: 5px; +} + +div.sheet-shipblock div.sheet-perf .sheet-medium, +div.sheet-shipblock div.sheet-sensor .sheet-medium, +div.sheet-shipblock div.sheet-hyperdrive input[type="text"], +div.sheet-shipblock div.sheet-price input[type="text"]{ + width: 80px; +} + +div.sheet-shipblock div.sheet-perf label:not(.sheet-title){ + font-size: 0.8em; +} + +div.sheet-shipblock div.sheet-perf div.sheet-perf, +div.sheet-shipblock div.sheet-perf-block div.sheet-flex-col{ + display: flex; + flex-flow: column nowrap; +} +div.sheet-shipblock div.sheet-perf div.sheet-perf-block{ + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + padding: 5px; +} + +/* Sensors */ +div.sheet-shipblock div.sheet-sensor{ + grid-area: sensor; + border: 2px solid white; +} + +div.sheet-shipblock div.sheet-sensor div.sheet-flex-row{ + display: flex; + flex-flow: row nowrap; +} + + +div.sheet-shipblock div.sheet-sensor div.sheet-grid{ + display: grid; + grid-template-columns: repeat(5, 1fr); + grid-template-rows: repeat(3, 1fr); + border: 2px solid white; + padding: 5px; + width: 400px; +} + +/* Hyperdrive */ +div.sheet-shipblock div.sheet-hyperdrive{ + grid-area: hyperdrive; + display: flex; + flex-flow: column nowrap; +} + +div.sheet-shipblock div.sheet-hyperdrive div{ + display: flex; + flex-flow: row nowrap; + font-size: 0.8em; +} + +div.sheet-shipblock div.sheet-hyperdrive .sheet-crew{ + display: flex; + flex-flow: column nowrap; +} + +div.sheet-shipblock div.sheet-hyperdrive .sheet-hyper-grid{ + display: grid; + grid-template-columns: repeat(3, 1fr); + grid-template-rows: repeat(4, 1fr); + border: 2px solid white; + padding: 5px; + width: 440px; +} + +div.sheet-shipblock div.sheet-hyper-grid label{ + width: 110px; +} + +div.sheet-shipblock div.sheet-hyperdrive input[type="text"]{ + height: 22px; +} + + +div.sheet-shipblock div.sheet-consume{ + grid-area: consume; +} + +div.sheet-shipblock div.sheet-dura{ + grid-area: dura; + display: grid; + grid-template-rows: 1fr 1fr; + grid-template-columns: 1fr 1fr 1fr; +} + +div.sheet-shipblock div.sheet-dura label{ + width:80px; +} + +div.sheet-section.sheet-ship div.sheet-other{ + margin-bottom: 10px; +} + + /*-------------------------------------------*/ /*------------- Roll Templates---------------*/ + +/* new */ + +/* Smaller margins - remove these if you want the huge default left margin */ +.sheet-rolltemplate-swd6 { + margin-left: -37px; +} +.withoutavatars .sheet-rolltemplate-swd6 { + margin-left: -7px; +} + +.sheet-rolltemplate-swd6 .sheet-container { + border: 3px solid black; + border-radius: 3px; +} + +/* Header formatting - title and subtitle */ +.sheet-rolltemplate-swd6 .sheet-header { + background-color: var(--header-bg-color); + color: var(--header-text-color); + text-align: left; + text-transform: capitalize; + padding: 5px; + border-bottom: 2px solid black; +} +.sheet-rolltemplate-swd6 .sheet-name { + font-size:1.2em; + font-weight: bold; +} + +.sheet-rolltemplate-swd6 .sheet-subtitle { + font-size:.9em; +} + +/* example colors */ +.sheet-rolltemplate-swd6 .sheet-container { + /* this is the default color */ + --header-bg-color: #a83521; + --header-text-color: #FFF; +} + +/* 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); +} +.sheet-rolltemplate-swd6 .sheet-container.sheet-color-black { + --header-bg-color: #000; +} +.sheet-rolltemplate-swd6 .sheet-container.sheet-color-purple { + --header-bg-color: rgba(112,32,130,1); +} +.sheet-rolltemplate-swd6 .sheet-container.sheet-color-white { + --header-bg-color: #FFF; + --header-text-color: #000; +} + +/* Allprops part */ +.sheet-rolltemplate-swd6 .sheet-content { + display: grid; + background: #FFF; + /* Header formatting - modify the column layout below */ + grid-template-columns: auto auto; + /* Line height to match default roll template */ + line-height:1.4em; +} +.sheet-rolltemplate-swd6 .sheet-content > div { + padding: 5px; +} + +/* Left column */ +.sheet-rolltemplate-swd6 .sheet-content .sheet-key { + font-weight: bold; + padding-right: 10px; + text-align: right; +} + +/* Empty rule, use this if you want to change the right column +.sheet-rolltemplate-swd6 .sheet-value { +} +*/ + +/* Make even-numbered rows grey */ +.sheet-rolltemplate-swd6 .sheet-content :nth-child(4n+3), +.sheet-rolltemplate-swd6 .sheet-content :nth-child(4n) { + background:#EEE; +} + +/* Description field */ +.sheet-rolltemplate-swd6 .sheet-desc { + grid-column: span 2; + padding: 5px; + text-align: center; +} + + +/* old */ + /* ----------- BLUE -----------*/ .sheet-rolltemplate-blue table { width:100%; diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html index 42951c6209..c64577f2a0 100644 --- a/D6StarWars/D6StarWars.html +++ b/D6StarWars/D6StarWars.html @@ -30,7 +30,7 @@
- +
@@ -681,43 +681,166 @@ -
- Starship: -
- Craft: - Type: -
- Scale: - Length: -
- Crew: - Skill: -
- Passangers: - Cargo Capacity: - Consumables: -
- Hyperdrive Multipiler: - Hyperdrive Backup: - Nav Computer: -
- Maneuverability: -
- Space: - Athmosphere: -
- Hull: - Shields: -
- +
+ Starship: + Scale: + Length: +
-
- - Passive:/ - Scan:/ - Search:/ - Focus:/ + +
+
+ + +
+
+ Era + +
+
+ New + +
+
+ Used + +
+
+ +
+
+ Era + +
+
+ Reproduction + +
+
+ New-Old-Stock + +
+
+ Restored + +
+
+ Used + +
+
+
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ +
+
+ + +
+
+
+ Search + Scan + Passive + Focus + + Range + + + + + + Sensitivity + + + + +
+
+
+ +
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + +
+
+ +
+ +
+
+ + +
+ +
+ + +
+
+ +
+ + + +
+ +
+
+ +
+
+ +
+
@@ -726,20 +849,47 @@
- Scale: - Fire Arc: - Crew: -
- Skill: - Fire Control: D -
- Space Range: - Atmosphere Range: -
- Damage:D+ +
+ 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: +
+
+ +
@@ -772,6 +922,25 @@ + + + +
+
+ {{#name}}
{{name}}
{{/name}} + {{#subtitle}}
{{subtitle}}
{{/subtitle}} +
+
+ {{#allprops() title subtitle desc color}} +
{{key}}
+
{{value}}
+ {{/allprops() title subtitle desc color}} + {{#desc}}
{{desc}}
{{/desc}} +
+
+ + + diff --git a/D6StarWars/sheet.json b/D6StarWars/sheet.json index e922ba5251..0d7b19d231 100644 --- a/D6StarWars/sheet.json +++ b/D6StarWars/sheet.json @@ -4,7 +4,7 @@ "authors": "Timothy O'Driscoll, Andreas J.", "roll20userid": "555352, 1223200", "preview": "d6starwarspreview.png", - "instructions": "\n This sheet is for Star Wars: The Roleplaying Game by West End Games(WEG) that uses the d6 pool system(**Sheet Version 2.15**).\n* Can be used for 1E, 2E, 2E R&E and REUP games, Wild Die can be disabled if wanted \n* NPC sheet available \n* Customization options include: hiding some sections, show/hide GM rolls, and disable/enable rolls to ask for modifiers before rolling \n* For more info, check out the sheet's [wiki page](https://wiki.roll20.net/Star_Wars_WEG_D6_character_sheet) \n\n Issues, Ideas & Questions can be sent to the [active editor](https://app.roll20.net/users/1223200)", + "instructions": "\n This sheet is for Star Wars: The Roleplaying Game by West End Games(WEG) that uses the d6 pool system(**Sheet Version 2.31**).\n* Can be used for 1E, 2E, 2E R&E and REUP games, Wild Die can be disabled if wanted \n* NPC & Starship sheets available \n* Customization options include: hiding some sections, show/hide GM rolls, and disable/enable rolls to ask for modifiers before rolling \n* For more info, check out the sheet's [wiki page](https://wiki.roll20.net/Star_Wars_WEG_D6_character_sheet) \n\n Issues, Ideas & Questions can be sent to the [active editor](https://app.roll20.net/users/1223200)", "useroptions": [ { "attribute": "sheettype",