diff --git a/GURPS/gurps.css b/GURPS/gurps.css index 31f0c1909c..38c726a810 100644 --- a/GURPS/gurps.css +++ b/GURPS/gurps.css @@ -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; } diff --git a/GURPS/gurps.html b/GURPS/gurps.html index 858a885528..045f328471 100644 --- a/GURPS/gurps.html +++ b/GURPS/gurps.html @@ -4193,7 +4193,7 @@ @@ -8340,9 +8340,14 @@ visualize what it will look like in chat. Defense + + @@ -9862,20 +9867,8 @@ visualize what it will look like in chat. -
+
- -
- -
- Rapid Fire Table -
-
- GURPS Speed/Range Table -
- -
-
@@ -10151,7 +10144,22 @@ visualize what it will look like in chat.
+
+
+ + +
+ +
+ Rapid Fire Table +
+
+ GURPS Speed/Range Table +
+ +
+
@@ -10537,9 +10545,89 @@ visualize what it will look like in chat.
-
- -
+ +
+
+
+
+ Range Calculator for Ranged Attacks only +
+
+
+
+
+ Range +
+
+ + Distance between shooter and target.
+ See B372-373 + +
+
+
+
+ Speed +
+
+ + (2 mph = 1 yard/second).
+ Ignore if human like target moving 10 yards or less.
+ See B372-373 + +
+
+
+ Size Mod +
+
+
+ Elevation +
+
+ 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. +
+
+
+ Speed/Range +
+
+ Hit Mod +
+
+   +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
@@ -10639,7 +10727,7 @@ visualize what it will look like in chat.
Acc
-
+
GRAV
@@ -10647,7 +10735,7 @@ visualize what it will look like in chat. Gravity, affects throwing distance. See B350.
-
+
RNG
@@ -10672,7 +10760,7 @@ visualize what it will look like in chat.
-
+
Shots
@@ -10758,16 +10846,16 @@ visualize what it will look like in chat.
-
+
-
+
-
+
@@ -10809,89 +10897,9 @@ visualize what it will look like in chat.
- -
-
-
-
- Range Calculator for Ranged Attacks only -
-
-
-
-
- Range -
-
- - Distance between shooter and target.
- See B372-373 - -
-
-
-
- Speed -
-
- - (2 mph = 1 yard/second).
- Ignore if human like target moving 10 yards or less.
- See B372-373 - -
-
-
- Size Mod -
-
-
- Elevation -
-
- 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. -
-
-
- Speed/Range -
-
- Hit Mod -
-
-   -
-
- -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- -
-
+
+ +
@@ -12115,7 +12123,7 @@ visualize what it will look like in chat.

Pull Request:

    -
  • Combat tab: Added sub tabs for Defense, Attack, and Tools. Preliminary updates to improving Armor section of defense tab.
    • +
  • Combat tab: Added sub tabs for Defense, Melee, Ranged, and Tools. Preliminary updates to improving Armor section of defense tab.
  • 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.
  • Gravity Field. Added a gravity field that can be applied to jumping distance and total inventory weight. Note: 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.
diff --git a/GURPS/translation.json b/GURPS/translation.json index 7e0e0eccf6..69f8e4c738 100644 --- a/GURPS/translation.json +++ b/GURPS/translation.json @@ -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.
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 block or parry requires Hearing-2. See B549", @@ -557,7 +557,7 @@ "standing-broad-jump-label": "Broad", "standing-broad-jump-tooltip": "Standing Broad Jump Distance. B352
1st column will either show be (2 x Stat to use) – 3 feet or your Jump Skill/2 (rounded down).
2nd column shows you how many feet you may jump.
3rd column shows you how many yards you jump.
Formula = (2 x Stat To use) - 3 feet
Stat to use: ", "running-broad-jump-label": "Run", - "running-broad-jump-tooltip": "Running Broad Jump Distance, under Broad Jump decryption. B352
1st column enter how may yards you ran this turn.
2nd column shows you how many feet you may jump.
3rd column shows you how many yard you jump.
Formula = (2 x Stat To use) - 3 feet
Stat to use:
Max running broad jump distance is twice standing broad jump distance.", + "running-broad-jump-tooltip": "Running Broad Jump Distance, under Broad Jump description. B352
1st column enter how may yards you ran this turn.
2nd column shows you how many feet you may jump.
3rd column shows you how many yard you jump.
Formula = (2 x Stat To use) - 3 feet
Stat to use:
Max running broad jump distance is twice standing broad jump distance.", "high-jump-label": "High", "high-jump-tooltip": "High Jump Distance. B352
1st column will either be (6 x Stat to use) – 10 inches or your Jump Skill/2 (rounded down).
2nd column shows you how many feet you may jump.
3rd column shows you how many yard you jump.
Formula = (6 x Stat To use) - 10 inches
Stat to use: ", "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.
NOTE: Malfunction has priority 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" }