slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update gurps

Browse Source 
split combat into melee and ranged tabs.
This commit is contained in:
Ken
2020-10-11 15:51:39 -07:00
parent ed0002d1dd
commit c7914a563b
3 changed files with 129 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GURPS/gurps.css
+7 -6
View File
@@ -2639,15 +2639,15 @@ input[name="attr_toggle_melee_mod_tool"][value="1"] ~ .sheet-attack-modifiers-no
/* -- Ranged Attacks -- */
.sheet-ranged-attacks { width: calc(100% - 140px - 0.8em); }
.sheet-ranged-attacks .sheet-col0 { width: calc(100% - 473px); }
.sheet-ranged-attacks .sheet-col0 { width: calc(100% - 460px); }
.sheet-ranged-attacks .sheet-col0-st { width: calc(100% - 598px); }
.sheet-ranged-attacks .sheet-col0 input { text-align:left; }
.sheet-ranged-attacks .sheet-col1 { width: 60px; }
.sheet-ranged-attacks .sheet-col2 { width: 30px; }
.sheet-ranged-attacks .sheet-col3 { width: 55px; }
.sheet-ranged-attacks .sheet-col4 { width: 30px; }
.sheet-ranged-attacks .sheet-col5 { width: 40px; }
.sheet-ranged-attacks .sheet-col5 input { text-align:left; }
.sheet-ranged-attacks .sheet-col5 { width: 65px; }
.sheet-ranged-attacks .sheet-col5-thrown { width: 50px; }
.sheet-ranged-attacks .sheet-col5.sheet-thrown-object-input input { text-align: center;}
.sheet-ranged-attacks .sheet-col6 { width: 30px; }
.sheet-ranged-attacks .sheet-col7 { width: 60px; }
@@ -2658,7 +2658,7 @@ input[name="attr_toggle_melee_mod_tool"][value="1"] ~ .sheet-attack-modifiers-no
.sheet-ranged-attacks .sheet-col-verify { width: 45px; }
.sheet-ranged-attacks .sheet-col-verifycheck { width: 25px; }
.sheet-ranged-attacks .sheet-header .sheet-col10 { width: 52px; }
.sheet-ranged-attacks .sheet-row-stats .sheet-col0 { margin-left: 48px; width: calc(100% - 523px); }
.sheet-ranged-attacks .sheet-row-stats .sheet-col0 { margin-left: 48px; width: calc(100% - 510px); }
.sheet-ranged-attacks .sheet-row-stats .sheet-col0-st { margin-left: 20px; width: calc(100% - 620px); }
.sheet-ranged-attacks .sheet-row-stats.sheet-row-thrown-object { height: 28px; }
@@ -4034,8 +4034,9 @@ input[type="hidden"][name="attr_show_roll_modifiers"][value="1"] ~ .sheet-modal
}
input[name="attr_combat_tabs"][value="defense"] ~ .sheet-tabs > div:nth-of-type(2),
input[name="attr_combat_tabs"][value="attack"] ~ .sheet-tabs > div:nth-of-type(3),
input[name="attr_combat_tabs"][value="tools"] ~ .sheet-tabs > div:nth-of-type(4) {
input[name="attr_combat_tabs"][value="melee"] ~ .sheet-tabs > div:nth-of-type(3),
input[name="attr_combat_tabs"][value="ranged"] ~ .sheet-tabs > div:nth-of-type(4),
input[name="attr_combat_tabs"][value="tools"] ~ .sheet-tabs > div:nth-of-type(5) {
display: block;
}
GURPS/gurps.html
+118 -110
View File
@@ -4193,7 +4193,7 @@
</h4>
<ul>
<li>Combat tab: Added sub tabs for Defense, Attack, and Tools. Preliminary updates to improving Armor section of defense tab.</li>
<li>Combat tab: Added sub tabs for Defense, Melee, Ranged, and Tools. Preliminary updates to improving Armor section of defense tab.</li>
<li>Combat tab -> Combat Tools: Remove redundant elevation direction, replaced by simple elevation field, if you're above the target, enter a positive number. If below the target, enter a negative number.</li>
<li>Gravity Field. Added a gravity field that can be applied to jumping distance and total inventory weight. <b>Note:</b> Gravity value can be updated in three places; Combat Tab -> Tools, Thrown Weapon. Inventory Tab on the totals line. General tab under the Jumping feat.</li>
</ul>
@@ -8340,9 +8340,14 @@ visualize what it will look like in chat.
<span data-i18n="defense-label">Defense</span>
</label>
<label>
<input type="radio" name="attr_combat_tabs" value="attack" class="tab-control" />
<span data-i18n="attack-label">Attack</span>
</label><label>
<input type="radio" name="attr_combat_tabs" value="melee" class="tab-control" />
<span data-i18n="melee-label">Melee</span>
</label>
<label>
<input type="radio" name="attr_combat_tabs" value="ranged" class="tab-control" />
<span data-i18n="ranged-label">Ranged</span>
</label>
<label>
<input type="radio" name="attr_combat_tabs" value="tools" class="tab-control" />
<span data-i18n="tools-label">tools</span>
</label>
@@ -9862,20 +9867,8 @@ visualize what it will look like in chat.
</div>
<div class="attack">
<div class="melee">
<!-- tables -->
<div class="box damage-reduction">
<div class="rapid-fire-table">
<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/GURPS/Images/Rapid_Fire_Table.png" title="Rapid Fire Table: B373. Additional Rules B408." alt="Rapid Fire Table" />
</div>
<div class="speed-range-table"> <!-- .speed-range-table image-->
<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/GURPS/Images/Speed_Range_Table.PNG" title="Speed/Range Table: B550" alt="GURPS Speed/Range Table" />
</div> <!-- .speed-range-table image-->
</div>
<!-- _____ _____ MELEE ATTACKS BOX _____ _____ -->
<div class="box melee-attacks">
<div class="table">
@@ -10151,7 +10144,22 @@ visualize what it will look like in chat.
</div> <!-- .table -->
</div> <!-- .box .melee-attacks -->
</div>
<div class="ranged">
<!-- tables -->
<div class="box damage-reduction">
<div class="rapid-fire-table">
<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/GURPS/Images/Rapid_Fire_Table.png" title="Rapid Fire Table: B373. Additional Rules B408." alt="Rapid Fire Table" />
</div>
<div class="speed-range-table"> <!-- .speed-range-table image-->
<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/GURPS/Images/Speed_Range_Table.PNG" title="Speed/Range Table: B550" alt="GURPS Speed/Range Table" />
</div> <!-- .speed-range-table image-->
</div>
<!-- _____ _____ RANGED ATTACKS BOX _____ _____ -->
<div class="box ranged-attacks">
<div class="table">
@@ -10537,9 +10545,89 @@ visualize what it will look like in chat.
</div> <!-- .table -->
</div> <!-- .box .ranged-attacks -->
</div>
<div class="tools">
<!-- _____ _____ Firing Up or Down _____ _____ -->
<div class="box firing-up-down">
<div class="table">
<div class="row title">
<div class="cell">
<span data-i18n="range-calculator-label">Range Calculator for Ranged Attacks only</span>
</div>
</div>
<div class="header">
<div class="cell linear-range">
<div class="popup">
<span data-i18n="range-label">Range</span>
</div>
<div class="tooltip">
<span data-i18n="firing-up-down-range-tooltip">
Distance between shooter and target.<br />
See B372-373
</span>
</div>
</div>
<div class="cell speed">
<div class="popup">
<span data-i18n="speed-label">Speed</span>
</div>
<div class="tooltip">
<span data-i18n="firing-up-down-speed-tooltip">
(2 mph = 1 yard/second).<br />
Ignore if human like target moving 10 yards or less.<br />
See B372-373
</span>
</div>
</div>
<div class="cell size">
<span data-i18n="abbreviation-size-modifier-label">Size Mod</span>
</div>
<div class="cell fire-up-dwn-distance">
<div class="popup">
<span data-i18n="elevation-label">Elevation</span>
</div>
<div class="tooltip">
<span data-i18n="ranged-elevation-label">If you're above the target, enter a positive number of hexes. If you're below the target, enter a negative number of hexes. See B407.</span>
</div>
</div>
<div class="cell new-range">
<span data-i18n="speed-range-label">Speed/Range</span>
</div>
<div class="cell hit-mod">
<span data-i18n="abbreviation-hit-modifier-label">Hit Mod</span>
</div>
<div class="cell reset">
&nbsp;
</div>
</div> <!-- .header -->
<div class="container">
<div class="row">
<div class="cell linear-range">
<input type="number" step="1" value="0" min="0" name="attr_firing_distance" title="Macro name: firing_distance" />
</div>
<div class="cell speed">
<input type="number" step="1" value="0" min="0" name="attr_firing_speed_difference" title="Macro name: firing_speed_difference" />
</div>
<div class="cell size">
<input type="number" step="1" value="0" name="attr_firing_size_mod" title="Macro name: firing_size_mod" />
</div>
<div class="cell fire-up-dwn-distance">
<input type="number" step="1" value="0" min="0" name="attr_firing_elevation" title="Macro name: firing_elevation" />
</div>
<div class="cell new-range">
<input type="number" step="1" value="0" min="0" name="attr_firing_new_range" readonly="readonly" title="Macro name: firing_new_range" />
</div>
<div class="cell new-range">
<input type="number" step="1" value="0" name="attr_firing_hit_mod" readonly="readonly" title="Macro name: firing_hit_mod" />
</div>
<div class="cell reset">
<button type="action" name="act_range_calc_reset" class="reset"><span data-i18n="reset-label">Reset</span></button>
</div>
</div>
</div> <!-- .container -->
</div> <!-- .table -->
</div> <!-- .box .ranged-attacks firing-up-or-down -->
<!-- _____ _____ THROWING _____ _____ -->
<div class="box ranged-attacks thrown-object">
@@ -10639,7 +10727,7 @@ visualize what it will look like in chat.
<div class="cell col4">
<span data-i18n="abbreviation-accuracy-label">Acc</span>
</div>
<div class="cell col5">
<div class="cell col5-thrown">
<div class="popup">
<span data-i18n="abbreviation-gravity-label">GRAV</span>
</div>
@@ -10647,7 +10735,7 @@ visualize what it will look like in chat.
<span data-i18n="gravity-thrown-tooltip">Gravity, affects throwing distance. See B350.<br /></span>
</span>
</div>
<div class="cell col5">
<div class="cell col5-thrown">
<div class="popup">
<span data-i18n="abbreviation-range-label">RNG</span>
</div>
@@ -10672,7 +10760,7 @@ visualize what it will look like in chat.
</span>
</span>
</div>
<div class="cell col7">
<div class="cell col5-thrown">
<div class="popup">
<span data-i18n="shots-label">Shots</span>
</div>
@@ -10758,16 +10846,16 @@ visualize what it will look like in chat.
<div class="cell col4">
<input type="number" step="1" name="attr_thrown_object_acc" value="0" title="Macro name: thrown_object_acc" />
</div>
<div class="cell col5 thrown-object-input">
<div class="cell col5-thrown thrown-object-input">
<input type="number" name="attr_gravity" value="1" min="0" step=".01" title="Macro: @{gravity}" />
</div>
<div class="cell col5 thrown-object-input">
<div class="cell col5-thrown thrown-object-input">
<input type="text" name="attr_thrown_object_range" readonly="readonly" value="10" title="Macro name: thrown_object_range" />
</div>
<div class="cell col6">
<input type="text" name="attr_thrown_object_rof" value="1" title="Macro name: thrown_object_rof" />
</div>
<div class="cell col7">
<div class="cell col5-thrown">
<input type="text" name="attr_thrown_object_shots" value="1" title="Macro name: thrown_object_shots" />
</div>
<div class="cell col9">
@@ -10809,89 +10897,9 @@ visualize what it will look like in chat.
</div> <!-- .table -->
</div> <!-- .box .ranged-attacks -->
<!-- _____ _____ Firing Up or Down _____ _____ -->
<div class="box firing-up-down">
<div class="table">
<div class="row title">
<div class="cell">
<span data-i18n="range-calculator-label">Range Calculator for Ranged Attacks only</span>
</div>
</div>
<div class="header">
<div class="cell linear-range">
<div class="popup">
<span data-i18n="range-label">Range</span>
</div>
<div class="tooltip">
<span data-i18n="firing-up-down-range-tooltip">
Distance between shooter and target.<br />
See B372-373
</span>
</div>
</div>
<div class="cell speed">
<div class="popup">
<span data-i18n="speed-label">Speed</span>
</div>
<div class="tooltip">
<span data-i18n="firing-up-down-speed-tooltip">
(2 mph = 1 yard/second).<br />
Ignore if human like target moving 10 yards or less.<br />
See B372-373
</span>
</div>
</div>
<div class="cell size">
<span data-i18n="abbreviation-size-modifier-label">Size Mod</span>
</div>
<div class="cell fire-up-dwn-distance">
<div class="popup">
<span data-i18n="elevation-label">Elevation</span>
</div>
<div class="tooltip">
<span data-i18n="ranged-elevation-label">If you're above the target, enter a positive number of hexes. If you're below the target, enter a negative number of hexes. See B407.</span>
</div>
</div>
<div class="cell new-range">
<span data-i18n="speed-range-label">Speed/Range</span>
</div>
<div class="cell hit-mod">
<span data-i18n="abbreviation-hit-modifier-label">Hit Mod</span>
</div>
<div class="cell reset">
&nbsp;
</div>
</div> <!-- .header -->
<div class="container">
<div class="row">
<div class="cell linear-range">
<input type="number" step="1" value="0" min="0" name="attr_firing_distance" title="Macro name: firing_distance" />
</div>
<div class="cell speed">
<input type="number" step="1" value="0" min="0" name="attr_firing_speed_difference" title="Macro name: firing_speed_difference" />
</div>
<div class="cell size">
<input type="number" step="1" value="0" name="attr_firing_size_mod" title="Macro name: firing_size_mod" />
</div>
<div class="cell fire-up-dwn-distance">
<input type="number" step="1" value="0" min="0" name="attr_firing_elevation" title="Macro name: firing_elevation" />
</div>
<div class="cell new-range">
<input type="number" step="1" value="0" min="0" name="attr_firing_new_range" readonly="readonly" title="Macro name: firing_new_range" />
</div>
<div class="cell new-range">
<input type="number" step="1" value="0" name="attr_firing_hit_mod" readonly="readonly" title="Macro name: firing_hit_mod" />
</div>
<div class="cell reset">
<button type="action" name="act_range_calc_reset" class="reset"><span data-i18n="reset-label">Reset</span></button>
</div>
</div>
</div> <!-- .container -->
</div> <!-- .table -->
</div> <!-- .box .ranged-attacks firing-up-or-down -->
</div>
<div class="tools">
<!-- _____ _____ Falling and Collision _____ _____ -->
<div class="box falling-collision">
@@ -12115,7 +12123,7 @@ visualize what it will look like in chat.
<p>Pull Request: <span name="attr_latest_changes"></span></p>
<ul>
<li>Combat tab: Added sub tabs for Defense, Attack, and Tools. Preliminary updates to improving Armor section of defense tab.</li>
<li>Combat tab: Added sub tabs for Defense, Melee, Ranged, and Tools. Preliminary updates to improving Armor section of defense tab.</li>
<li>Combat tab -> Combat Tools: Remove redundant elevation direction, replaced by simple elevation field, if you're above the target, enter a positive number. If below the target, enter a negative number.</li>
<li>Gravity Field. Added a gravity field that can be applied to jumping distance and total inventory weight. <b>Note:</b> Gravity value can be updated in three places; Combat Tab -> Tools, Thrown Weapon. Inventory Tab on the totals line. General tab under the Jumping feat.</li>
</ul>
GURPS/translation.json
+4 -2
View File
@@ -237,7 +237,7 @@
"stunned-label": "Stunned: -4",
"stunned-tooltip": "If you're stunned, defend at -4. See B420",
"encumbered-label": "Encumbered",
"encumbered-tooltip": "Penalty equal to your encumbrance is applied to Dodge, Judo, Karate, ar any fencing Parry. See B549",
"encumbered-tooltip": "Penalty equal to your encumbrance is applied to Dodge, Judo, Karate, or any fencing Parry. See B549",
"skill-encumbered-tooltip": "Penalty equal to your encumbrance is applied to your skill.<br />Example: Climbing, Judo, Karate, Fencing Weapons, Stealth.",
"cant-see-attacker-label": "Can't See Attacker: -4",
"cant-see-attacker-tooltip": "If you can't see the attacker you're at -4 to defend. A <b>block</b> or <b>parry</b> requires Hearing-2. See B549",
@@ -557,7 +557,7 @@
"standing-broad-jump-label": "Broad",
"standing-broad-jump-tooltip": "Standing Broad Jump Distance. B352<br><strong>1st column</strong> will either show be (2 x Stat to use) – 3 feet or your Jump Skill/2 (rounded down). <br><strong>2nd column</strong> shows you how many feet you may jump. <br><strong>3rd column</strong> shows you how many yards you jump. <br>Formula = (2 x Stat To use) - 3 feet<br>Stat to use: <input type=\"text\" name=\"attr_standing_broad_jump_stat_to_use\" value=\"\" readonly=\"readonly\" class=\"sheet-textInline sheet-width-wide\">",
"running-broad-jump-label": "Run",
"running-broad-jump-tooltip": "Running Broad Jump Distance, under Broad Jump decryption. B352 <br><strong>1st column</strong> enter how may yards you ran this turn. <br><strong>2nd column</strong> shows you how many feet you may jump. <br><strong>3rd column</strong> shows you how many yard you jump. <br>Formula = (2 x Stat To use) - 3 feet<br>Stat to use: <input type=\"text\" name=\"attr_running_broad_jump_stat_to_use\" value=\"\" readonly=\"readonly\" class=\"sheet-textInline sheet-width-wide\"><br>Max running broad jump distance is twice standing broad jump distance.",
"running-broad-jump-tooltip": "Running Broad Jump Distance, under Broad Jump description. B352 <br><strong>1st column</strong> enter how may yards you ran this turn. <br><strong>2nd column</strong> shows you how many feet you may jump. <br><strong>3rd column</strong> shows you how many yard you jump. <br>Formula = (2 x Stat To use) - 3 feet<br>Stat to use: <input type=\"text\" name=\"attr_running_broad_jump_stat_to_use\" value=\"\" readonly=\"readonly\" class=\"sheet-textInline sheet-width-wide\"><br>Max running broad jump distance is twice standing broad jump distance.",
"high-jump-label": "High",
"high-jump-tooltip": "High Jump Distance. B352<br><strong>1st column</strong> will either be (6 x Stat to use) – 10 inches or your Jump Skill/2 (rounded down). <br><strong>2nd column</strong> shows you how many feet you may jump. <br><strong>3rd column</strong> shows you how many yard you jump. <br>Formula = (6 x Stat To use) - 10 inches<br>Stat to use: <input type=\"text\" name=\"attr_standing_high_jump_stat_to_use\" value=\"\" readonly=\"readonly\" class=\"sheet-textInline sheet-width-wide\">",
"run-high-jump-label": "Run",
@@ -990,5 +990,7 @@
"rolltemplate-malfunction-description": "For effect, Roll 3d6 and see table on B407 or use custom table.<br /><b style=\"color:red;\">NOTE:</b> Malfunction has <i>priority</i> over a critical miss: if both would occur, only the malfunction takes place. Critical Misses, Basic Set, page 382.",
"defense-label": "Defense",
"attack-label": "Attack",
"melee-label": "Melee",
"ranged-label": "Ranged",
"tools-label": "Tools"
}