Skip to content

Commit

Permalink
Merge pull request #12251 from MadCoder253/gurps-2.9.19
Browse files Browse the repository at this point in the history 
[GURPS] 2.9.19
  • Loading branch information
@mperes
mperes authored Oct 23, 2023
2 parents 06a5789 + 99c0757 commit 913aa53
Show file tree
Hide file tree
Showing 3 changed files with 258 additions and 35 deletions.
86 changes: 68 additions & 18 deletions GURPS/gurps.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,22 +788,6 @@ input {
}

/* ===== CUSTOM TABS ===== */
input.sheet-tab1:not(:checked) ~ .sheet-tab1,
input.sheet-tab-misc:not(:checked) ~ .sheet-tab-misc,
input.sheet-tab2:not(:checked) ~ .sheet-tab2,
input.sheet-tab3:not(:checked) ~ .sheet-tab3,
input.sheet-tab4:not(:checked) ~ .sheet-tab4,
input.sheet-tab5:not(:checked) ~ .sheet-tab5,
input.sheet-tab6:not(:checked) ~ .sheet-tab6,
input.sheet-tab7:not(:checked) ~ .sheet-tab7,
input.sheet-tab8:not(:checked) ~ .sheet-tab8,
input.sheet-tab0:not(:checked) ~ .sheet-tab0 {
display: none !important;
}

.sheet-tab7 {
background: var(--row-bg);
}

input.sheet-tab {
position: relative;
Expand All @@ -813,11 +797,13 @@ input.sheet-tab {
opacity: 0;
z-index: 1;
border: none;
display: none;
}


input.sheet-tab + span {
position: relative;
display: inline-block !important;
display: none;
min-width: 70px;
height: 23px;
margin: 0 0 -3px -80px;
Expand All @@ -835,6 +821,47 @@ input.sheet-tab + span {
line-height: 23px;
}

/* show/hide tabs based on sheet type */
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="1"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="2"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="1a"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="3"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="4"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="5"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="6"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="7"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="8"],
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="0"] {
display: inline;
}

input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="1"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="2"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="1a"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="3"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="4"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="5"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="6"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="7"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="8"] + span,
input[name="attr_sheet_type"][value="character"] ~ input.sheet-tab[value="0"] + span {
display: inline-block !important;
}

input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="chase"],
input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="7"],
input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="8"],
input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="0"] {
display: inline;
}

input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="chase"] + span,
input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="7"] + span,
input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="8"] + span,
input[name="attr_sheet_type"][value="chase"] ~ input.sheet-tab[value="0"] + span {
display: inline-block !important;
}

input.sheet-tab:checked + span {
color: #555;
border: 1px solid #a8a8a8;
Expand All @@ -851,6 +878,27 @@ input.sheet-tab0 + span {
margin-bottom: 5px;
}

.sheet-tab7 {
background: var(--row-bg);
}

/* show/hide selected tabs */

input.sheet-tab1:not(:checked) ~ .sheet-tab1,
input.sheet-tab-misc:not(:checked) ~ .sheet-tab-misc,
input.sheet-tab2:not(:checked) ~ .sheet-tab2,
input.sheet-tab3:not(:checked) ~ .sheet-tab3,
input.sheet-tab4:not(:checked) ~ .sheet-tab4,
input.sheet-tab5:not(:checked) ~ .sheet-tab5,
input.sheet-tab6:not(:checked) ~ .sheet-tab6,
input.sheet-tab7:not(:checked) ~ .sheet-tab7,
input.sheet-tab8:not(:checked) ~ .sheet-tab8,
input.sheet-tab-chase:not(:checked) ~ .sheet-tab-chase,
input.sheet-tab0:not(:checked) ~ .sheet-tab0 {
display: none !important;
}



/* ===== SUB ROWS ===== */
.sheet-sub-row {
Expand Down Expand Up @@ -5835,4 +5883,6 @@ input[name="attr_import_confirm_delete_tables"][value="0"] ~ button[name="act_im

input[name="attr_import_confirm_delete_tables"][value="1"] ~ button[name="act_import_delete_tables"] {
background-color: var(--highlight-text);
}
}

/* --- CHASE CONTROL SHEET --- */
179 changes: 163 additions & 16 deletions GURPS/gurps.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4325,21 +4325,16 @@ <h4>
<input type="text" name="attr_announcement_version" readonly="readonly" value="0" title="GURPS Character Sheet Version" />
</h4>

<!-- current version notes: 2.9.18 -->
<!-- current version notes: 2.9.19 -->
<ul>
<li>
<b>ENHANCEMENT:</b> Tweaks to several tooltips.
<b>BUGFIX:</b> Languages were not totaling correctly during a load of a new version of the character sheet. This is has been fixed, reported by Lloyd J.
</li>
<li>
<b>ENHANCEMENT:</b> Subdivided the <b>Bio\Misc</b> into sub-tabs for Bio, Reactions, Training, and Campaign, which is a placeholder for future fields.
<b>BUGFIX:</b> Possible issue with Spell Rolls. There's a field named `spell_roll_max_nine` that is no longer needed. This field was completely removed now, so if you had issues with Spells rolls, it should be fixed now. Reported by user on Discord channel.
</li>
<li>
<b>ENHANCEMENT:</b> Grimoire tab, repeating spells table. Added a new option named <b>Rule of 16</b>, checked by default,
found by clicking the Gear icon on the nav menu, then the Sheet Options sub-tab. It is under the section labeled <b>Spell Options.</b>
If checked, the effective skill of a spell that requires a resistance will use the Rule of 16. B349.
</li>
<li>
<b>BUGFIX:</b> Death check roll was using the Unconscious level, fixed to use the Death Check level. Noticed by Ctelin Ajira.
<b>NEW:</b> Initial development of selecting a customized sheet, such as a vehicle sheet.
</li>
</ul>

Expand All @@ -4351,19 +4346,20 @@ <h4>


<!-- ===== ===== ===== ===== TABS ===== ===== ===== ===== -->
<input type="hidden" name="attr_sheet_type" value="character" />
<input type="radio" name="attr_tab" value="1" class="tab tab1" checked="checked" /><span data-i18n="tab-general">General</span>
<input type="radio" name="attr_tab" value="2" class="tab tab2" title="Languages, Advantages, Disadvantages, and Cultural Familiarities" /><span data-i18n="tab-traits">Traits</span>
<input type="radio" name="attr_tab" value="1a" class="tab tab-misc" title="Miscellaneous box, Bio Notes, General Notes" /><span data-i18n="tab-bio-misc">Bio\Misc</span>
<input type="radio" name="attr_tab" value="3" class="tab tab3" title="Skills and Techniques" /><span data-i18n="tab-skills">Skills</span>
<input type="radio" name="attr_tab" value="4" class="tab tab4" /><span data-i18n="tab-combat">Combat</span>
<input type="radio" name="attr_tab" value="5" class="tab tab5" /><span data-i18n="tab-inventory">Inventory</span>
<input type="radio" name="attr_tab" value="6" class="tab tab6" /><span data-i18n="tab-grimoire">Grimoire</span>
<input type="radio" name="attr_tab" value="chase" class="tab tab-chase" /><span data-i18n="tab-chase">Chases</span>
<input type="radio" name="attr_tab" value="7" class="tab tab7" /><span data-i18n="tab-updates">Updates</span>
<input type="radio" name="attr_tab" value="8" class="tab tab8" title="Help" /><span data-i18n="tab-help">Help</span>
<input type="radio" name="attr_tab" value="0" class="tab tab0" title="Sheet Options" /><span>y</span>
<div class="tab-br"></div>


<!-- ===== ===== ===== ===== GENERAL TAB ===== ===== ===== ===== -->
<div class="tab1">

Expand Down Expand Up @@ -7834,6 +7830,9 @@ <h4>
</div>
</div> <!-- .header -->
<div class="row row-native-language">
<div class="cell col-button">

</div>
<div class="cell col0 label">
<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
<input type="hidden" name="attr_native_language_idkey" />
Expand Down Expand Up @@ -15527,7 +15526,7 @@ <h4 class="spacer">&nbsp;</h4>
</div>
<div class="cell col1">
<input type="hidden" name="attr_rule_of_16_value" value="100" />
<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Spell Skill Roll}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{spell_roll_modifier}, @{rule_of_16_value} }kl1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{spell_roll_max_nine}]]}} {{rollModifier=[[@{spell_roll_modifier}]]}} {{rollModifierSummary=@{spell_roll_modifier_summary}}} {{rollTraitSummary=@{spell_roll_trait_summary}}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{castingTime=@{casttime}}} {{castingDuration=@{duration}}} {{castingCost=@{cost}}} {{castingMaintain=@{maintain}}} {{castingResist=@{spell_resisted_by}}} {{rule16Value=[[@{rule_of_16_value}]]}}} {{castingClass=@{spell_class}}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{spell_success_note}}} {{customCriticalSuccessNote=@{spell_critical_success_note}}} {{customFailNote=@{spell_fail_note}}} {{customCriticalFailNote=@{spell_critical_fail_note}}} {{spellRoll=true}} {{spellCriticalSuccessNote=@{spell_critical_success_notes}}} {{spellFailNote=@{spell_fail_notes}}} {{spellCriticalFailureNote=@{spell_critical_failure_notes}}} {{showCastingDetails=[[@{show_casting_details}]]}} {{showSpellNotes=[[@{show_spell_notes}]]}} {{spellNotes=@{spell_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{spell_custom_macro}}}" name="roll_vsSL" />
<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Spell Skill Roll}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{spell_roll_modifier}, @{rule_of_16_value} }kl1]]}} {{useModTool=[[1]]}} {{rollModifier=[[@{spell_roll_modifier}]]}} {{rollModifierSummary=@{spell_roll_modifier_summary}}} {{rollTraitSummary=@{spell_roll_trait_summary}}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{castingTime=@{casttime}}} {{castingDuration=@{duration}}} {{castingCost=@{cost}}} {{castingMaintain=@{maintain}}} {{castingResist=@{spell_resisted_by}}} {{rule16Value=[[@{rule_of_16_value}]]}}} {{castingClass=@{spell_class}}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{spell_success_note}}} {{customCriticalSuccessNote=@{spell_critical_success_note}}} {{customFailNote=@{spell_fail_note}}} {{customCriticalFailNote=@{spell_critical_fail_note}}} {{spellRoll=true}} {{spellCriticalSuccessNote=@{spell_critical_success_notes}}} {{spellFailNote=@{spell_fail_notes}}} {{spellCriticalFailureNote=@{spell_critical_failure_notes}}} {{showCastingDetails=[[@{show_casting_details}]]}} {{showSpellNotes=[[@{show_spell_notes}]]}} {{spellNotes=@{spell_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{spell_custom_macro}}}" name="roll_vsSL" />
</div>
<div class="cell col2">
<input type="text" name="attr_level" title="Macro: @{NAME|repeating_spells_$[row #]_level}" readonly="readonly" value="10"/>
Expand Down Expand Up @@ -15718,6 +15717,111 @@ <h4 class="spacer">&nbsp;</h4>
</div> <!-- .box .spells -->
</div> <!-- .tab6 -->

<!-- ===== ===== ===== ===== CHASE CONTROL SHEET TAB ===== ===== ===== ===== -->
<div class="tab-chase">

<div>
Under construction.
</div>

<div class="chase-grid" style="display: none;">

<div class="chase-row" data-i18n="chase-control-sheet-description">Use this sheet to help run chase scenes from GURPS Action 2 Exploits, please refer to pages 31-34.</div>

<div class="chase-row">
<div class="form-flex-grid-4-column">
<div class="item">
<label>
<span data-i18n="round-label">Round</span>:
<input type="number" name="attr_chase_round" min="1" step="1" value="1" />
</label>
</div>
<div class="item">
<label>
<span data-i18n="current-sequence-label">Current Sequence</span>
<select name="attr_chase_sequence">
<option value="quarry_chooses" selected><span data-i18n="chase-sequence-option-quarry-chooses">Quarry chooses maneuver</span></option>
<option value="pursuer_chooses"><span data-i18n="chase-sequence-option-pursuer-chooses">Pursuer chooses maneuver</span></option>
<option value="pursuer_rolls"><span data-i18n="chase-sequence-option-pursuer-rolls">Pursuer resolves all rolls</span></option>
<option value="quarry_rolls"><span data-i18n="chase-sequence-option-quarry-rolls">Quarry resolves all rolls</span></option>
<option value="quick_content"><span data-i18n="chase-sequence-option-quick-content">Quick Contest of Chase Rolls</span></option>
<option value="adjust_band"><span data-i18n="chase-sequence-option-range-band">Adjust range band</span></option>
<option value="next_round"><span data-i18n="chase-sequence-option-next-round">Proceed to next round</span></option>
</select>
</label>
</div>
</div>
</div>

<div class="chase-row">
<button type="action" name="act_chase_get_result" class="btn">
<span data-i18n="get-results-label">Get Quick Contest Results</span>
</button>
</div>

<div class="chase-row">
<input type="hidden" name="attr_chase_content_result" />
<div>Place the results of quick content here using input value @{chase_content_result}</div>
</div>

<div class="chase-row">
<div class="form-flex-grid-4-column">
<div class="item">
<label>
<span data-i18n="range-band-label">Range Band</span>:
<select name="attr_chase_range_band">
<option value="close"><span data-i18n="chase-range-band-option-close">Close (0 to 5 hexes)</span></option>
<option value="short"><span data-i18n="chase-range-band-option-short">Short (6 to 20 hexes)</span></option>
<option value="medium" selected><span data-i18n="chase-range-band-option-medium">Medium (21 to 100 hexes)</span></option>
<option value="long"><span data-i18n="chase-range-band-option-long">Long (101 to 500 hexes)</span></option>
<option value="extreme"><span data-i18n="chase-range-band-option-extreme">Extreme (501+ hexes)</span></option>
</select>
</label>
</div>
<div class="item">
<div>
Range Penalty: -3 to -6 (Default is -3 or GM discretion for attack rolls)<br />
CAn talk to enemey, or toss things at them.
</div>
</div>
</div>
</div>

<div class="chase-row">
<div>
<h2><span data-i18n="quarry-label">Quarry</span></h2>
</div>
</div>

<div class="chase-row">
<div class="form-flex-grid-4-column">
<div class="item">
<label>
<span data-i18n="maneuver-label">Maneuver</span>:
<select name="attr_chase_quarry_maneuver">
<option value="attack"><span data-i18n="chase-maneuver-attack">Attack</span></option>
<option value="short"><span data-i18n="chase_range_band_option_short">Short (6 to 20 hexes)</span></option>
</select>
</label>
</div>
<div class="item">
<label>
<span data-i18n="chase-modifier-label">Chase Modifier</span>:
<input type="number" name="attr_chase_modifier" step="1" value="0" ?>
</label>
</div>
<div class="item">
<label>
<span data-i18n="chase-made-by-label">Chase Roll made by</span>:
<input type="number" name="attr_chase_quarry_made_by" step="1" value="0" ?>
</label>
</div>
</div>
</div>

</div>
</div>

<!-- ===== ===== ===== ===== Revision History TAB ===== ===== ===== ===== -->
<div class="tab7">

Expand Down Expand Up @@ -15749,7 +15853,22 @@ <h4>Version: <span name="attr_announcement_version"></span></h4>

<p>Pull Request: <span name="attr_latest_changes"></span></p>

<!-- current version notes: 2.9.18 -->
<!-- current version notes: 2.9.19 -->
<ul>
<li>
<b>BUGFIX:</b> Languages were not totaling correctly during a load of a new version of the character sheet. This is has been fixed, reported by Lloyd J.
</li>
<li>
<b>BUGFIX:</b> Possible issue with Spell Rolls. There's a field named `spell_roll_max_nine` that is no longer needed. This field was completely removed now, so if you had issues with Spells rolls, it should be fixed now. Reported by user on Discord channel.
</li>
<li>
<b>NEW:</b> Initial development of selecting a customized sheet, such as a vehicle sheet.
</li>
</ul>


<h4>Version: 2.9.18</h4>
<p>Pull Request: 10/16/2023</p>
<ul>
<li>
<b>ENHANCEMENT:</b> Tweaks to several tooltips.
Expand Down Expand Up @@ -17180,6 +17299,34 @@ <h4>Roll Template for Skill Rolls</h4>

<div class="option-column">

<div class="option-container">

<h4>
<span data-i18n="sheet-type-label">Sheet Type</span>
</h4>

<div>
<input type="radio" name="attr_sheet_type" value="character" checked="checked" />
<span class="popup">
<span data-i18n="standard-character-sheet-label">Standard Character Sheet</span>
</span>
<span class="tooltip">
<span data-i18n="standard-character-sheet-tooltip">The standard character sheet will display the following tabs: General, Traits, Bio\\Misc, Skills, Combat, Inventory, Grimoire, Updates, Help, and Options Icon.</span>
</span>
</div>

<div>
<input type="radio" name="attr_sheet_type" value="chase" />
<span class="popup">
<span data-i18n="chase-sheet-label">Chase Sheet</span>
</span>
<span class="tooltip">
<span data-i18n="chase-sheet-tooltip">A custom control sheet for managing chases scenes using the Rules from GURPS Action 2 Exploits, pages 31-39.</span>
</span>
</div>

</div><!-- end critical roll options -->

<div class="option-container">

<h4>
Expand Down Expand Up @@ -17392,7 +17539,7 @@ <h4>
</span>
</div>
<div>
<input type="radio" name="attr_point_summary_layout" value="1" checked="checked" />
<input type="radio" name="attr_point_summary_layout" value="1" />
<span class="popup">
<span data-i18n="abbreviation-gurps-character-assistant-label">GCA4</span>
</span>
Expand Down Expand Up @@ -20269,9 +20416,9 @@ <h3> Your feedback is most welcomed! See link below.</h3>

const noop = function () { }; // do nothing callback function.

const version = "2.9.18";
const version = "2.9.19";

const latestChangesDate = "10/16/2023";
const latestChangesDate = "10/23/2023";

let modCascade = true;

Expand Down Expand Up @@ -22411,7 +22558,7 @@ <h3> Your feedback is most welcomed! See link below.</h3>

items[`repeating_languages_${id}_spoken_points`] = spokenPoints;

items[`repeating_languages_${id}_written_points`] = spokenPoints;
items[`repeating_languages_${id}_written_points`] = writtenPoints;

setAttrs(items);

Expand Down
Loading

0 comments on commit 913aa53

Please sign in to comment.