From fea28dc183dbc4957978c9fbdf3697785f8fb4f9 Mon Sep 17 00:00:00 2001 From: Ken Date: Wed, 2 Aug 2023 23:34:46 -0700 Subject: [PATCH 1/6] Update gurps update shotgun damage tool, streamline spell roll chat log summary. --- GURPS/gurps.css | 12 ++++- GURPS/gurps.html | 110 +++++++++++++++++------------------------ GURPS/translation.json | 7 ++- 3 files changed, 61 insertions(+), 68 deletions(-) diff --git a/GURPS/gurps.css b/GURPS/gurps.css index 16cdd0eb6e..facd16e4eb 100644 --- a/GURPS/gurps.css +++ b/GURPS/gurps.css @@ -3886,8 +3886,6 @@ input[name="attr_carried"][value="1"] ~ span.sheet-item-weight-total { } - - /* -- Roll Templates -- */ .sheet-rolltemplate-addToTracker .sheet-container table.sheet-result, .sheet-rolltemplate-rollStats .sheet-container table.sheet-result { @@ -4157,6 +4155,16 @@ input[name="attr_carried"][value="1"] ~ span.sheet-item-weight-total { padding: 0; } +/* -- spell grid -- */ +.sheet-rolltemplate-spell-grid { + display: grid; + grid-template-columns: 40px 75px 40px auto; +} + +.sheet-rolltemplate-spell-grid .sheet-label { + font-weight: bold; +} + /**********************************/ /* Custom rolltemplate for macros */ diff --git a/GURPS/gurps.html b/GURPS/gurps.html index 31c0f2a680..445d3d7588 100644 --- a/GURPS/gurps.html +++ b/GURPS/gurps.html @@ -4359,30 +4359,13 @@ - + @@ -13027,7 +13010,11 @@ visualize what it will look like in chat.
- Close Range Shotgun Damage Tool +
+ Close Range Shotgun & Multiple Projectile Damage Tool
+
+ Used for extremely close combat at a range of 10% of the ½D Range or less. See Shotguns and Multiple Projectiles for more details. +
@@ -13054,7 +13041,7 @@ visualize what it will look like in chat. Close
- Close range. + This value is 10% of the ½D Range of the weapon. This is the maximum range this tool is used for.
@@ -13138,7 +13125,7 @@ visualize what it will look like in chat. Damage x1 Vitals Damage x3 Skull Damage x4" /> -
@@ -14764,7 +14751,18 @@ Select the indent level of the inventory item. This is handy to help show the it

Pull Request:

- + + + +

Version: 2.9.10

+

Pull Requst: 7/31/2023

@@ -14759,6 +14762,9 @@ Select the indent level of the inventory item. This is handy to help show the it
  • Spell Roll Chat Log. Streamlined some of the content so spells take up a little less space.
    • +
  • + List of minor changes: roll results notes font size changed from 13px to 12px. +

    • Version: 2.9.10

    From 437168312955de1ff44f88fa05f8dedd72849670 Mon Sep 17 00:00:00 2001 From: Ken Date: Sun, 13 Aug 2023 22:37:23 -0700 Subject: [PATCH 4/6] update gurps fixed repeating languages point totals bug moved spell custom success/messages in chat log --- GURPS/gurps.html | 542 ++++++++++++++++++++++++++++------------------- 1 file changed, 320 insertions(+), 222 deletions(-) diff --git a/GURPS/gurps.html b/GURPS/gurps.html index 66e150f5f6..268a34c2a5 100644 --- a/GURPS/gurps.html +++ b/GURPS/gurps.html @@ -4368,7 +4368,9 @@ Spell Roll Chat Log. Streamlined some of the content so spells take up a little less space.
  • - List of minor changes: roll results notes font size changed from 13px to 12px. + List of minor changes: roll results notes font size changed from 13px to 12px.
    + Moved the custom success/fail messages for spells just below the roll result in chat dialog.
    + Fixed bug where repeating languages were not calculating correctly.
    • @@ -7357,7 +7359,7 @@ PC in Character Points (spent and unspent combined).
    - +
    @@ -14763,7 +14765,9 @@ Select the indent level of the inventory item. This is handy to help show the it Spell Roll Chat Log. Streamlined some of the content so spells take up a little less space.
  • - List of minor changes: roll results notes font size changed from 13px to 12px. + List of minor changes: roll results notes font size changed from 13px to 12px.
    + Moved the custom success/fail messages for spells just below the roll result in chat dialog.
    + Fixed bug where repeating languages were not calculating correctly.
    • @@ -18369,6 +18373,306 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm + {{/rollResult}} + + + {{#rollResult}} + {{#spellRoll}} + + + + + + + + {{#rollTotal() rollResult 18}} + + + {{spellCriticalFailureNote}} + + + {{/rollTotal() rollResult 18}} + + + {{#rollTotal() rollResult 17}} + + + {{#rollLess() effectiveSkill 16}} + + + {{spellCriticalFailureNote}} + + + {{/rollLess() effectiveSkill 16}} + + + {{#rollGreater() effectiveSkill 15}} + + + {{spellFailNote}} + + + {{/rollGreater() effectiveSkill 15}} + + {{/rollTotal() rollResult 17}} + + + {{#rollBetween() rollResult 3 4}} + + + {{#rollLess() useCriticalPlusTen 2}} + + + {{spellCriticalSuccessNote}} + + + {{/rollLess() useCriticalPlusTen 2}} + + + {{#rollTotal() useCriticalPlusTen 2}} + + {{/rollTotal() useCriticalPlusTen 2}} + + {{/rollBetween() rollResult 3 4}} + + + + {{#rollBetween() rollResult 5 16}} + + + {{#rollGreater() rollResult effectiveSkill}} + + + {{#rollLess() effectiveSkill 4}} + {{#rollGreater() rollResult 12}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 12}} + {{/rollLess() effectiveSkill 4}} + + + {{#rollTotal() effectiveSkill 4}} + {{#rollGreater() rollResult 13}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 13}} + {{/rollTotal() effectiveSkill 4}} + + + {{#rollTotal() effectiveSkill 5}} + {{#rollGreater() rollResult 14}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 14}} + {{/rollTotal() effectiveSkill 5}} + + + {{#rollTotal() effectiveSkill 6}} + {{#rollGreater() rollResult 15}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 15}} + {{/rollTotal() effectiveSkill 6}} + + + {{#rollBetween() effectiveSkill 7 15}} + {{#rollGreater() rollResult 16}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 16}} + {{/rollBetween() effectiveSkill 7 15}} + + + + + + {{#rollLess() effectiveSkill 4}} + + + {{#rollLess() rollResult 13}} + + + {{spellFailNote}} + + + {{/rollLess() rollResult 13}} + + + {{#rollGreater() rollResult 12}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 12}} + + {{/rollLess() effectiveSkill 4}} + + + {{#rollTotal() effectiveSkill 4}} + + + {{#rollLess() rollResult 15}} + + + {{spellFailNote}} + + + {{/rollLess() rollResult 15}} + + + {{#rollGreater() rollResult 13}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 13}} + + {{/rollTotal() effectiveSkill 4}} + + + {{#rollTotal() effectiveSkill 5}} + + + {{#rollLess() rollResult 15}} + + + {{spellFailNote}} + + + {{/rollLess() rollResult 15}} + + + {{#rollGreater() rollResult 14}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 14}} + + {{/rollTotal() effectiveSkill 5}} + + + {{#rollTotal() effectiveSkill 6}} + + + {{#rollLess() rollResult 16}} + + + {{spellFailNote}} + + + {{/rollLess() rollResult 16}} + + + {{#rollGreater() rollResult 15}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 15}} + + {{/rollTotal() effectiveSkill 6}} + + + {{#rollBetween() effectiveSkill 7 15}} + + + {{#rollLess() rollResult 17}} + + + {{spellFailNote}} + + + {{/rollLess() rollResult 17}} + + + {{#rollGreater() rollResult 16}} + + + {{spellCriticalFailureNote}} + + + {{/rollGreater() rollResult 16}} + + {{/rollBetween() effectiveSkill 7 15}} + + {{/rollGreater() rollResult effectiveSkill}} + + + + {{#rollBetween() rollResult 5 effectiveSkill}} + + + + + {{#rollLess() useCriticalPlusTen 2}} + + + {{#rollTotal() useCriticalPlusTen 1}} + + + {{#rollGreater() rollResult 6}} + + {{/rollGreater() rollResult 6}} + + + {{#rollGreater() effectiveSkill 15}} + {{#rollBetween() rollResult 5 6}} + + + {{spellCriticalSuccessNote}} + + + {{/rollBetween() rollResult 5 6}} + {{/rollGreater() effectiveSkill 15}} + + + {{#rollTotal() effectiveSkill 15}} + {{#rollTotal() rollResult 5}} + + + {{spellCriticalSuccessNote}} + + + {{/rollTotal() rollResult 5}} + {{/rollTotal() effectiveSkill 15}} + + {{/rollTotal() useCriticalPlusTen 1}} + + {{/rollLess() useCriticalPlusTen 2}} + + + + {{#rollTotal() useCriticalPlusTen 2}} + + {{/rollTotal() useCriticalPlusTen 2}} + + {{/rollBetween() rollResult 5 effectiveSkill}} + + {{/rollBetween() rollResult 5 16}} + + + + {{/spellRoll}} {{/rollResult}} {{#effectiveSkill}} @@ -18526,223 +18830,6 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm {{/rollTotal() useModTool 1}} - - {{#rollResult}} - {{#spellRoll}} - - - - - - - - - {{#rollTotal() rollResult 18}} - {{spellCriticalFailureNote}} - {{/rollTotal() rollResult 18}} - - - {{#rollTotal() rollResult 17}} - - - {{#rollLess() effectiveSkill 16}} - {{spellCriticalFailureNote}} - {{/rollLess() effectiveSkill 16}} - - - {{#rollGreater() effectiveSkill 15}} - {{spellFailNote}} - {{/rollGreater() effectiveSkill 15}} - - {{/rollTotal() rollResult 17}} - - - {{#rollBetween() rollResult 3 4}} - - - {{#rollLess() useCriticalPlusTen 2}} - {{spellCriticalSuccessNote}} - {{/rollLess() useCriticalPlusTen 2}} - - - {{#rollTotal() useCriticalPlusTen 2}} - - {{/rollTotal() useCriticalPlusTen 2}} - - {{/rollBetween() rollResult 3 4}} - - - - {{#rollBetween() rollResult 5 16}} - - - {{#rollGreater() rollResult effectiveSkill}} - - - {{#rollLess() effectiveSkill 4}} - {{#rollGreater() rollResult 12}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 12}} - {{/rollLess() effectiveSkill 4}} - - - {{#rollTotal() effectiveSkill 4}} - {{#rollGreater() rollResult 13}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 13}} - {{/rollTotal() effectiveSkill 4}} - - - {{#rollTotal() effectiveSkill 5}} - {{#rollGreater() rollResult 14}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 14}} - {{/rollTotal() effectiveSkill 5}} - - - {{#rollTotal() effectiveSkill 6}} - {{#rollGreater() rollResult 15}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 15}} - {{/rollTotal() effectiveSkill 6}} - - - {{#rollBetween() effectiveSkill 7 15}} - {{#rollGreater() rollResult 16}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 16}} - {{/rollBetween() effectiveSkill 7 15}} - - - - - - {{#rollLess() effectiveSkill 4}} - - - {{#rollLess() rollResult 13}} - {{spellFailNote}} - {{/rollLess() rollResult 13}} - - - {{#rollGreater() rollResult 12}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 12}} - - {{/rollLess() effectiveSkill 4}} - - - {{#rollTotal() effectiveSkill 4}} - - - {{#rollLess() rollResult 15}} - {{spellFailNote}} - {{/rollLess() rollResult 15}} - - - {{#rollGreater() rollResult 13}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 13}} - - {{/rollTotal() effectiveSkill 4}} - - - {{#rollTotal() effectiveSkill 5}} - - - {{#rollLess() rollResult 15}} - {{spellFailNote}} - {{/rollLess() rollResult 15}} - - - {{#rollGreater() rollResult 14}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 14}} - - {{/rollTotal() effectiveSkill 5}} - - - {{#rollTotal() effectiveSkill 6}} - - - {{#rollLess() rollResult 16}} - {{spellFailNote}} - {{/rollLess() rollResult 16}} - - - {{#rollGreater() rollResult 15}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 15}} - - {{/rollTotal() effectiveSkill 6}} - - - {{#rollBetween() effectiveSkill 7 15}} - - - {{#rollLess() rollResult 17}} - {{spellFailNote}} - {{/rollLess() rollResult 17}} - - - {{#rollGreater() rollResult 16}} - {{spellCriticalFailureNote}} - {{/rollGreater() rollResult 16}} - - {{/rollBetween() effectiveSkill 7 15}} - - {{/rollGreater() rollResult effectiveSkill}} - - - - {{#rollBetween() rollResult 5 effectiveSkill}} - - - - - {{#rollLess() useCriticalPlusTen 2}} - - - {{#rollTotal() useCriticalPlusTen 1}} - - - {{#rollGreater() rollResult 6}} - - {{/rollGreater() rollResult 6}} - - - {{#rollGreater() effectiveSkill 15}} - {{#rollBetween() rollResult 5 6}} - {{spellCriticalSuccessNote}} - {{/rollBetween() rollResult 5 6}} - {{/rollGreater() effectiveSkill 15}} - - - {{#rollTotal() effectiveSkill 15}} - {{#rollTotal() rollResult 5}} - {{spellCriticalSuccessNote}} - {{/rollTotal() rollResult 5}} - {{/rollTotal() effectiveSkill 15}} - - {{/rollTotal() useCriticalPlusTen 1}} - - {{/rollLess() useCriticalPlusTen 2}} - - - - {{#rollTotal() useCriticalPlusTen 2}} - - {{/rollTotal() useCriticalPlusTen 2}} - - {{/rollBetween() rollResult 5 effectiveSkill}} - - {{/rollBetween() rollResult 5 16}} - - - - {{/spellRoll}} - {{/rollResult}} - {{#rollTotal() useMalfunction 1}} {{#malfunction}} {{#rollGreater() malfunction 0}} @@ -21107,14 +21194,16 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm }); // check for changes to repeating language drop-downs - on("change:repeating_languages:spoken change:repeating_languages:spoken_talent change:repeating_languages:written change:repeating_languages:written_talent", (event) => { + on("change:repeating_languages:spoken change:repeating_languages:spoken_talent change:repeating_languages:spoken_mod_points change:repeating_languages:written change:repeating_languages:written_talent change:repeating_languages:written_mod_points", (event) => { const fields = [ "has_language_talent", "repeating_languages_spoken", "repeating_languages_spoken_talent", + "repeating_languages_spoken_mod_points", "repeating_languages_written", - "repeating_languages_written_talent" + "repeating_languages_written_talent", + "repeating_languages_written_mod_points", ]; getAttrs(fields, values => { @@ -21123,8 +21212,12 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm let spokenPoints = Number(values.repeating_languages_spoken); + let spokenModPoints = Number(values.repeating_languages_spoken_mod_points); + let writtenPoints = Number(values.repeating_languages_written); + let writtenModPoints = Number(values.repeating_languages_written_mod_points); + let totalPoints = 0; if (hasLanguageTalent) { @@ -21134,6 +21227,11 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm writtenPoints = Number(values.repeating_languages_written_talent); } + // factor in modifiers + spokenPoints = spokenPoints + spokenModPoints; + + writtenPoints = writtenPoints + writtenModPoints; + totalPoints = spokenPoints + writtenPoints; setAttrs({ From a9f6b2e4bdcbd47704a58dd90d754d58ed5ed6f3 Mon Sep 17 00:00:00 2001 From: Ken Date: Sun, 13 Aug 2023 22:40:35 -0700 Subject: [PATCH 5/6] update fixed fixed spelling errors --- GURPS/gurps.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GURPS/gurps.html b/GURPS/gurps.html index 268a34c2a5..f79dcab9a0 100644 --- a/GURPS/gurps.html +++ b/GURPS/gurps.html @@ -4362,7 +4362,7 @@