Skip to content

Commit

Permalink
Merge pull request #13571 from vince-roll20/FBL
Browse files Browse the repository at this point in the history 
Forbidden Lands
  • Loading branch information
@NorWhal
NorWhal authored Dec 5, 2024
2 parents 404a9b4 + e312a9e commit 5197bd5
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 41 deletions.
52 changes: 29 additions & 23 deletions Forbidden_Lands/Forbidden_Lands.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@
}

.charsheet .rotate-45 {
transform: rotate(-45deg);
margin: 0 0 8px 8px;
background-color: #000;
margin: -21px -10px 10px 15px;
transform: rotate(-45deg);
}

/* announcements */
Expand Down Expand Up @@ -645,16 +646,15 @@

/* Hide actual radio */
.charsheet input.skull[type="radio"] {
border-radius: 0;
flex: auto;
height: 15px;
left: 4.75%;
margin: 0 0 0 -10px;
opacity: 0;
position: relative;
top: -1px;
width: 10px;
z-index: 1;
flex: auto;
height: 20px;
left: 11px;
margin: 0 5px 0 -10px;
opacity: 0;
position: relative;
top: -1px;
width: 14px;
z-index: 1;
}

.charsheet input.skull + span {
Expand Down Expand Up @@ -1017,10 +1017,12 @@
font-size: 24px;
height: 15px;
line-height: 14px;
margin: 0 0 0 -20px;
margin: -3px 0 0 -21px;
text-align: center;
vertical-align: middle;
width: 15px;
border-radius: 50%;
outline: 1px solid #000;
}

.charsheet .conditions-grid input.xbox {
Expand Down Expand Up @@ -2888,12 +2890,12 @@ button.torches:hover::after {
background-color: transparent !important;
background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/FBL_skull.png");
background-repeat: no-repeat;
height: 8em;
margin: 6.5em 0 0 -1.5em;
height: 11em;
margin: 8.5em 0 0 -2.5em;
pointer-events: none;
position: absolute;
transform: rotate(-37deg);
width: 10em;
width: 12.5em;
background-size: contain;
}

Expand Down Expand Up @@ -2962,12 +2964,15 @@ button.torches:hover::after {
grid-row-start: 6;
}

.charsheet input.conditions-hungry:checked ~ div > span.conditions-hungry,
.charsheet input.conditions-sleepy:checked ~ div > span.conditions-sleepy,
.charsheet input.conditions-thirsty:checked ~ div > span.conditions-thirsty,
.charsheet input.conditions-cold:checked ~ div > span.conditions-cold {
.charsheet div:has(input.conditions-hungry:hover) ~ div > span.conditions-hungry,
.charsheet div:has(input.conditions-sleepy:hover) ~ div > span.conditions-sleepy,
.charsheet div:has(input.conditions-thirsty:hover) ~ div > span.conditions-thirsty,
.charsheet div:has(input.conditions-cold:hover) ~ div > span.conditions-cold,
.charsheet div:has(input.conditions-hungry:checked) ~ div > span.conditions-hungry,
.charsheet div:has(input.conditions-sleepy:checked) ~ div > span.conditions-sleepy,
.charsheet div:has(input.conditions-thirsty:checked) ~ div > span.conditions-thirsty,
.charsheet div:has(input.conditions-cold:checked) ~ div > span.conditions-cold {
color: #a60100;
font-weight: bold;
}

/* ---------------------------------- Critical Injuries */
Expand Down Expand Up @@ -6130,7 +6135,6 @@ span.willpower-box3 {
font-size: 0.85em;
}

/* add drop shadow to dice */
.sheet-rolltemplate-forbiddenlands .sheet-template-white-dice,
.sheet-rolltemplate-forbiddenlands .sheet-template-maroon-dice,
.sheet-rolltemplate-forbiddenlands .sheet-template-black-dice,
Expand All @@ -6144,7 +6148,9 @@ span.willpower-box3 {
font-size: 1.1em;
margin: 2px;
padding: 3px;
width: 28px;
width: 30px;
height: 30px;
align-self: center;
z-index: 1;
}

Expand Down
33 changes: 15 additions & 18 deletions Forbidden_Lands/Forbidden_Lands.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
<input type="checkbox" class="announcements-show" name="attr_show_announcements" value="1" data-i18n-title="close-announcements" title="Close Announcements" />
<span class="announcements-exit" data-i18n-title="close">*</span><br>
<h3 data-i18n="latest-announcements">Latest Announcements</h3>
<span class="footer">12/2/24</span>
<span class="footer">12/4/24</span>
<ol>
<strong>v1.9</strong>
<li>Minor adjustments for translations.</li>
<li>Fixed a bug introduced in the last update (major appologies!) that could cause Strength to keep reseting to 0 unless set on the monster tab first. Collaterally, the other abilities were capped according to strength. The sheet logic should now be fixed to properly handle PC strength and Monster strength when switching tabs.</li>
<li>Small cosmetic change to the Willpower checkboxes and Ability background image.</li>
<li>Fixed a bug where PC Strength could get switched to '7' when moving between the PC and Monster tab.</li>
Expand Down Expand Up @@ -614,19 +615,15 @@ <h1 data-i18n="condition-u">CONDITIONS</h1>
<div class="skull-image"></div>
</div>
<div class="conditions-box3"><input class="input xbox conditions-hungry" type="checkbox" name="attr_hungry" value="1" data-i18n-title="condition-hungry" title="You must eat a ration of food at least once every day. After a day without food, you become HUNGRY. @{hungry}"><span></span></div>
<input class="hidden conditions-hungry" type="checkbox" name="attr_hungry" value="1">
<div class="conditions-box4"><span class="header-h1 conditions-hungry" data-i18n="hungry">Hungry</span></div>
<span class="conditions-box5"><input type="text" class="input" name="attr_hungry_note" placeholder="notes" data-i18n-placeholder="notes" title="@{hungry_note}"/></span>
<div class="conditions-box6"><input class="input xbox conditions-sleepy" type="checkbox" name="attr_sleepy" value="1" data-i18n-title="condition-sleepy" title="You need to sleep for at least one Quarter Day of each day. After one day without sleep, you become SLEEPY. @{sleepy}"><span></span></div>
<input class="hidden conditions-sleepy" type="checkbox" name="attr_sleepy" value="1">
<div class="conditions-box7"><span class="header-h1 conditions-sleepy" data-i18n="sleepy">Sleepy</span></div>
<span class="conditions-box8"><input type="text" class="input" name="attr_sleepy_note" placeholder="notes" data-i18n-placeholder="notes" title="@{sleepy_note}"/></span>
<div class="conditions-box9"><input class="input xbox conditions-thirsty" type="checkbox" name="attr_thirsty" value="1" data-i18n-title="condition-thirsty" title="You must drink a ration of water at least once per day. After a day without water, you become THIRSTY. @{thirsty}"><span></span></div>
<input class="hidden conditions-thirsty" type="checkbox" name="attr_thirsty" value="1">
<div class="conditions-box10"><span class="header-h1 conditions-thirsty" data-i18n="thirsty">Thirsty</span></div>
<span class="conditions-box11"><input type="text" class="input" name="attr_thirsty_note" placeholder="notes" data-i18n-placeholder="notes" title="@{thirsty_note}"/></span>
<div class="conditions-box12"><input class="input xbox conditions-cold" type="checkbox" name="attr_cold" value="1" data-i18n-title="condition-cold" title="When the cold is bitter and you don't have enough shelter, you have to roll ENDURANCE regularly. @{cold}"><span></span></div>
<input class="hidden conditions-cold" type="checkbox" name="attr_cold" value="1">
<div class="conditions-box13"><span class="header-h1 conditions-cold" data-i18n="cold">Cold</span></div>
<span class="conditions-box14"><input type="text" class="input" name="attr_cold_note" placeholder="notes" data-i18n-placeholder="notes" title="@{cold_note}"/></span>
</div>
Expand Down Expand Up @@ -2233,7 +2230,7 @@ <h1 data-i18n="dice-pool-u">DICE POOL</h1>
<h1 data-i18n="talent-u">TALENTS</h1>
</div>
<div class="talents-box2 column-header-bottom">
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_talents" value="1" title="more/less" data-i18n="show-more-or-less" checked />
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_talents" value="1" title="more/less" data-i18n-title="show-more-or-less" checked />
<span class="expand-section-nav"></span>
<span data-i18n="rank">Rank</span>
</div>
Expand Down Expand Up @@ -2368,7 +2365,7 @@ <h1 data-i18n="gea-u">GEAR</h1>
<span data-i18n="carried-abbr">Carr</span>
</div>
<div class="gear-box4 column-header-bottom">
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_gear" value="1" title="more/less" data-i18n="show-more-or-less" checked />
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_gear" value="1" title="more/less" data-i18n-title="show-more-or-less" checked />
<span class="expand-section-nav"></span>
<span data-i18n="weight-abbr">Wt</span>
</div>
Expand Down Expand Up @@ -2436,7 +2433,7 @@ <h1 data-i18n="gea-u">GEAR</h1>
<input type="checkbox" class="hidden section-toggle-checkbox" name="attr_toggle_mount_gear" value="1" checked />
<div class="mount-box1 header-top"><h1 data-i18n="moun-u">MOUNT</h1></div>
<div class="mount_gear-box4 column-header-bottom">
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_mount_gear" value="1" title="more/less" data-i18n="show-more-or-less" checked />
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_mount_gear" value="1" title="more/less" data-i18n-title="show-more-or-less" checked />
<span class="expand-section-nav"></span>
</div>
<input class="expand" type="checkbox" name="attr_expand_mount1" value="1" data-i18n-title="show-hide" title="show/hide" /><span></span>
Expand Down Expand Up @@ -2520,7 +2517,7 @@ <h1 data-i18n="cart-wagon-other">Cart/Wagon/Other</h1>
<span data-i18n="carried-abbr">Carr</span>
</div>
<div class="cart_gear-box4 column-header-bottom">
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_cart_gear" value="1" title="more/less" data-i18n="show-more-or-less" checked />
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_cart_gear" value="1" title="more/less" data-i18n-title="show-more-or-less" checked />
<span class="expand-section-nav"></span>
<span data-i18n="weight-abbr">Wt</span>
</div>
Expand Down Expand Up @@ -4075,7 +4072,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
{{#rollGreater() computed::push 0}}
<div class="template-grid">
<div class="template-grid-item template-span-six push-option">
[<span data-i18n:"push-the-roll">Push the Roll</span>](~{{character_name}}|push||{{computed::pushroll}})
[<span data-i18n="push-the-roll">Push the Roll</span>](~{{character_name}}|push||{{computed::pushroll}})
</div>
</div>
{{/rollGreater() computed::push 0}}
Expand Down Expand Up @@ -5426,7 +5423,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
artifact_die_ocho: 0,
artifact_die_ten: 0,
artifact_die_twelve: 0,
current_preset: getTranslationByKey(`custom-roll`),
current_preset: `${getTranslationByKey(`custom-roll`)}`,
subtitle2: '',
include_with_roll: '',
pushable: 1,
Expand Down Expand Up @@ -5839,7 +5836,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
artifact_die_eight: 0,
artifact_die_ten: 0,
artifact_die_twelve: 0,
current_preset: getTranslationByKey(`reputation-roll`),
current_preset: `${getTranslationByKey(`reputation-roll`)}`,
subtitle2: '',
// include_with_roll: '{{attribute-die-one}}', // hides the dice column footer
include_with_roll: '{{dice-label-flag=1}}',
Expand Down Expand Up @@ -6250,7 +6247,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
artifact_die_eight: Math.max(armor_artifact_die_eight, armor1_artifact_die_eight, armor2_artifact_die_eight, armor3_artifact_die_eight, armor4_artifact_die_eight),
artifact_die_ten: Math.max(armor_artifact_die_ten, armor1_artifact_die_ten, armor2_artifact_die_ten, armor3_artifact_die_ten, armor4_artifact_die_ten),
artifact_die_twelve: Math.max(armor_artifact_die_twelve, armor1_artifact_die_twelve, armor2_artifact_die_twelve, armor3_artifact_die_twelve, armor4_artifact_die_twelve),
current_preset: getTranslationByKey(`armor-roll`),
current_preset: `${getTranslationByKey(`armor-roll`)}`,
subtitle2: '',
include_with_roll: `{{armor1-equipped=[[ ${armor1_equipped} ]]}} {{armor1-name=${armor1_name}}} {{armor1-rating=${armor1_bonus}}} {{armor1-rating-max=${armor1_bonus_max}}} {{armor1-rating-misc=${armor1_damage}}} {{armor1-rating-total=${armor1_ar}}} {{armor2-equipped=[[ ${armor2_equipped} ]]}} {{armor2-name=${armor2_name}}} {{armor2-rating=${armor2_bonus}}} {{armor2-rating-max=${armor2_bonus_max}}} {{armor2-rating-misc=${armor2_damage}}} {{armor2-rating-total=${armor2_ar}}} {{armor3-equipped=[[ ${armor3_equipped} ]]}} {{armor3-name=${armor3_name}}} {{armor3-rating=${armor3_bonus}}} {{armor3-rating-max=${armor3_bonus_max}}} {{armor3-rating-misc=${armor3_damage}}} {{armor3-rating-total=${armor3_ar}}} {{armor4-equipped=[[ ${armor4_equipped} ]]}} {{armor4-name=${armor4_name}}} {{armor4-rating=${armor4_bonus}}} {{armor4-rating-max=${armor4_bonus_max}}} {{armor4-rating-misc=${armor4_damage}}} {{armor4-rating-total=${armor4_ar}}}`,
});
Expand Down Expand Up @@ -6385,7 +6382,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
on('sheet:opened', function () {
// clog('Translation of query text complete.');
setAttrs({
translation_push_query: getTranslationByKey('push-query'),
translation_push_query: `${getTranslationByKey('push-query')}`,
translation_whisper_macro_query: `?{${getTranslationByKey('whisper-macro')}|${getTranslationByKey('no')},|${getTranslationByKey('yes')},/w gm |}`,
translation_whisper_api_macro_query: `?{${getTranslationByKey('whisper-macro')}|${getTranslationByKey('no')},!forl |${getTranslationByKey('yes')},!wforl |}`,
});
Expand Down Expand Up @@ -6488,7 +6485,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
artifact_die_ocho: 0,
artifact_die_ten: 0,
artifact_die_twelve: 0,
current_preset: getTranslationByKey(`roll-strength`),
current_preset: `${getTranslationByKey(`roll-strength`)}`,
subtitle2: '',
include_with_roll: '',
});
Expand All @@ -6508,7 +6505,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
artifact_die_ocho: 0,
artifact_die_ten: 0,
artifact_die_twelve: 0,
current_preset: getTranslationByKey(`roll-agility`),
current_preset: `${getTranslationByKey(`roll-agility`)}`,
subtitle2: '',
include_with_roll: '',
});
Expand All @@ -6528,7 +6525,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
artifact_die_ocho: 0,
artifact_die_ten: 0,
artifact_die_twelve: 0,
current_preset: getTranslationByKey(`roll-wits`),
current_preset: `${getTranslationByKey(`roll-wits`)}`,
subtitle2: '',
include_with_roll: '',
});
Expand All @@ -6548,7 +6545,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
artifact_die_ocho: 0,
artifact_die_ten: 0,
artifact_die_twelve: 0,
current_preset: getTranslationByKey(`roll-empathy`),
current_preset: `${getTranslationByKey(`roll-empathy`)}`,
subtitle2: '',
include_with_roll: '',
});
Expand Down

0 comments on commit 5197bd5

Please sign in to comment.