Skip to content

Commit 5197bd5

Browse files
NorWhalNorWhal
authored
Merge pull request #13571 from vince-roll20/FBL
Forbidden Lands
2 parents 404a9b4 + e312a9e commit 5197bd5

File tree

2 files changed

+44
-41
lines changed

2 files changed

+44
-41
lines changed

‎Forbidden_Lands/Forbidden_Lands.css

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@
9494
}
9595

9696
.charsheet .rotate-45 {
97-
transform: rotate(-45deg);
98-
margin: 0 0 8px 8px;
97+
background-color: #000;
98+
margin: -21px -10px 10px 15px;
99+
transform: rotate(-45deg);
99100
}
100101

101102
/* announcements */
@@ -645,16 +646,15 @@
645646

646647
/* Hide actual radio */
647648
.charsheet input.skull[type="radio"] {
648-
border-radius: 0;
649-
flex: auto;
650-
height: 15px;
651-
left: 4.75%;
652-
margin: 0 0 0 -10px;
653-
opacity: 0;
654-
position: relative;
655-
top: -1px;
656-
width: 10px;
657-
z-index: 1;
649+
flex: auto;
650+
height: 20px;
651+
left: 11px;
652+
margin: 0 5px 0 -10px;
653+
opacity: 0;
654+
position: relative;
655+
top: -1px;
656+
width: 14px;
657+
z-index: 1;
658658
}
659659

660660
.charsheet input.skull + span {
@@ -1017,10 +1017,12 @@
10171017
font-size: 24px;
10181018
height: 15px;
10191019
line-height: 14px;
1020-
margin: 0 0 0 -20px;
1020+
margin: -3px 0 0 -21px;
10211021
text-align: center;
10221022
vertical-align: middle;
10231023
width: 15px;
1024+
border-radius: 50%;
1025+
outline: 1px solid #000;
10241026
}
10251027

10261028
.charsheet .conditions-grid input.xbox {
@@ -2888,12 +2890,12 @@ button.torches:hover::after {
28882890
background-color: transparent !important;
28892891
background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/FBL_skull.png");
28902892
background-repeat: no-repeat;
2891-
height: 8em;
2892-
margin: 6.5em 0 0 -1.5em;
2893+
height: 11em;
2894+
margin: 8.5em 0 0 -2.5em;
28932895
pointer-events: none;
28942896
position: absolute;
28952897
transform: rotate(-37deg);
2896-
width: 10em;
2898+
width: 12.5em;
28972899
background-size: contain;
28982900
}
28992901

@@ -2962,12 +2964,15 @@ button.torches:hover::after {
29622964
grid-row-start: 6;
29632965
}
29642966

2965-
.charsheet input.conditions-hungry:checked ~ div > span.conditions-hungry,
2966-
.charsheet input.conditions-sleepy:checked ~ div > span.conditions-sleepy,
2967-
.charsheet input.conditions-thirsty:checked ~ div > span.conditions-thirsty,
2968-
.charsheet input.conditions-cold:checked ~ div > span.conditions-cold {
2967+
.charsheet div:has(input.conditions-hungry:hover) ~ div > span.conditions-hungry,
2968+
.charsheet div:has(input.conditions-sleepy:hover) ~ div > span.conditions-sleepy,
2969+
.charsheet div:has(input.conditions-thirsty:hover) ~ div > span.conditions-thirsty,
2970+
.charsheet div:has(input.conditions-cold:hover) ~ div > span.conditions-cold,
2971+
.charsheet div:has(input.conditions-hungry:checked) ~ div > span.conditions-hungry,
2972+
.charsheet div:has(input.conditions-sleepy:checked) ~ div > span.conditions-sleepy,
2973+
.charsheet div:has(input.conditions-thirsty:checked) ~ div > span.conditions-thirsty,
2974+
.charsheet div:has(input.conditions-cold:checked) ~ div > span.conditions-cold {
29692975
color: #a60100;
2970-
font-weight: bold;
29712976
}
29722977

29732978
/* ---------------------------------- Critical Injuries */
@@ -6130,7 +6135,6 @@ span.willpower-box3 {
61306135
font-size: 0.85em;
61316136
}
61326137

6133-
/* add drop shadow to dice */
61346138
.sheet-rolltemplate-forbiddenlands .sheet-template-white-dice,
61356139
.sheet-rolltemplate-forbiddenlands .sheet-template-maroon-dice,
61366140
.sheet-rolltemplate-forbiddenlands .sheet-template-black-dice,
@@ -6144,7 +6148,9 @@ span.willpower-box3 {
61446148
font-size: 1.1em;
61456149
margin: 2px;
61466150
padding: 3px;
6147-
width: 28px;
6151+
width: 30px;
6152+
height: 30px;
6153+
align-self: center;
61486154
z-index: 1;
61496155
}
61506156

‎Forbidden_Lands/Forbidden_Lands.html

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
<input type="checkbox" class="announcements-show" name="attr_show_announcements" value="1" data-i18n-title="close-announcements" title="Close Announcements" />
3939
<span class="announcements-exit" data-i18n-title="close">*</span><br>
4040
<h3 data-i18n="latest-announcements">Latest Announcements</h3>
41-
<span class="footer">12/2/24</span>
41+
<span class="footer">12/4/24</span>
4242
<ol>
4343
<strong>v1.9</strong>
44+
<li>Minor adjustments for translations.</li>
4445
<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>
4546
<li>Small cosmetic change to the Willpower checkboxes and Ability background image.</li>
4647
<li>Fixed a bug where PC Strength could get switched to '7' when moving between the PC and Monster tab.</li>
@@ -614,19 +615,15 @@ <h1 data-i18n="condition-u">CONDITIONS</h1>
614615
<div class="skull-image"></div>
615616
</div>
616617
<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>
617-
<input class="hidden conditions-hungry" type="checkbox" name="attr_hungry" value="1">
618618
<div class="conditions-box4"><span class="header-h1 conditions-hungry" data-i18n="hungry">Hungry</span></div>
619619
<span class="conditions-box5"><input type="text" class="input" name="attr_hungry_note" placeholder="notes" data-i18n-placeholder="notes" title="@{hungry_note}"/></span>
620620
<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>
621-
<input class="hidden conditions-sleepy" type="checkbox" name="attr_sleepy" value="1">
622621
<div class="conditions-box7"><span class="header-h1 conditions-sleepy" data-i18n="sleepy">Sleepy</span></div>
623622
<span class="conditions-box8"><input type="text" class="input" name="attr_sleepy_note" placeholder="notes" data-i18n-placeholder="notes" title="@{sleepy_note}"/></span>
624623
<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>
625-
<input class="hidden conditions-thirsty" type="checkbox" name="attr_thirsty" value="1">
626624
<div class="conditions-box10"><span class="header-h1 conditions-thirsty" data-i18n="thirsty">Thirsty</span></div>
627625
<span class="conditions-box11"><input type="text" class="input" name="attr_thirsty_note" placeholder="notes" data-i18n-placeholder="notes" title="@{thirsty_note}"/></span>
628626
<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>
629-
<input class="hidden conditions-cold" type="checkbox" name="attr_cold" value="1">
630627
<div class="conditions-box13"><span class="header-h1 conditions-cold" data-i18n="cold">Cold</span></div>
631628
<span class="conditions-box14"><input type="text" class="input" name="attr_cold_note" placeholder="notes" data-i18n-placeholder="notes" title="@{cold_note}"/></span>
632629
</div>
@@ -2233,7 +2230,7 @@ <h1 data-i18n="dice-pool-u">DICE POOL</h1>
22332230
<h1 data-i18n="talent-u">TALENTS</h1>
22342231
</div>
22352232
<div class="talents-box2 column-header-bottom">
2236-
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_talents" value="1" title="more/less" data-i18n="show-more-or-less" checked />
2233+
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_talents" value="1" title="more/less" data-i18n-title="show-more-or-less" checked />
22372234
<span class="expand-section-nav"></span>
22382235
<span data-i18n="rank">Rank</span>
22392236
</div>
@@ -2368,7 +2365,7 @@ <h1 data-i18n="gea-u">GEAR</h1>
23682365
<span data-i18n="carried-abbr">Carr</span>
23692366
</div>
23702367
<div class="gear-box4 column-header-bottom">
2371-
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_gear" value="1" title="more/less" data-i18n="show-more-or-less" checked />
2368+
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_gear" value="1" title="more/less" data-i18n-title="show-more-or-less" checked />
23722369
<span class="expand-section-nav"></span>
23732370
<span data-i18n="weight-abbr">Wt</span>
23742371
</div>
@@ -2436,7 +2433,7 @@ <h1 data-i18n="gea-u">GEAR</h1>
24362433
<input type="checkbox" class="hidden section-toggle-checkbox" name="attr_toggle_mount_gear" value="1" checked />
24372434
<div class="mount-box1 header-top"><h1 data-i18n="moun-u">MOUNT</h1></div>
24382435
<div class="mount_gear-box4 column-header-bottom">
2439-
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_mount_gear" value="1" title="more/less" data-i18n="show-more-or-less" checked />
2436+
<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 />
24402437
<span class="expand-section-nav"></span>
24412438
</div>
24422439
<input class="expand" type="checkbox" name="attr_expand_mount1" value="1" data-i18n-title="show-hide" title="show/hide" /><span></span>
@@ -2520,7 +2517,7 @@ <h1 data-i18n="cart-wagon-other">Cart/Wagon/Other</h1>
25202517
<span data-i18n="carried-abbr">Carr</span>
25212518
</div>
25222519
<div class="cart_gear-box4 column-header-bottom">
2523-
<input type="checkbox" class="section-toggle-checkbox" name="attr_toggle_cart_gear" value="1" title="more/less" data-i18n="show-more-or-less" checked />
2520+
<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 />
25242521
<span class="expand-section-nav"></span>
25252522
<span data-i18n="weight-abbr">Wt</span>
25262523
</div>
@@ -4075,7 +4072,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
40754072
{{#rollGreater() computed::push 0}}
40764073
<div class="template-grid">
40774074
<div class="template-grid-item template-span-six push-option">
4078-
[<span data-i18n:"push-the-roll">Push the Roll</span>](~{{character_name}}|push||{{computed::pushroll}})
4075+
[<span data-i18n="push-the-roll">Push the Roll</span>](~{{character_name}}|push||{{computed::pushroll}})
40794076
</div>
40804077
</div>
40814078
{{/rollGreater() computed::push 0}}
@@ -5426,7 +5423,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
54265423
artifact_die_ocho: 0,
54275424
artifact_die_ten: 0,
54285425
artifact_die_twelve: 0,
5429-
current_preset: getTranslationByKey(`custom-roll`),
5426+
current_preset: `${getTranslationByKey(`custom-roll`)}`,
54305427
subtitle2: '',
54315428
include_with_roll: '',
54325429
pushable: 1,
@@ -5839,7 +5836,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
58395836
artifact_die_eight: 0,
58405837
artifact_die_ten: 0,
58415838
artifact_die_twelve: 0,
5842-
current_preset: getTranslationByKey(`reputation-roll`),
5839+
current_preset: `${getTranslationByKey(`reputation-roll`)}`,
58435840
subtitle2: '',
58445841
// include_with_roll: '{{attribute-die-one}}', // hides the dice column footer
58455842
include_with_roll: '{{dice-label-flag=1}}',
@@ -6250,7 +6247,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
62506247
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),
62516248
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),
62526249
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),
6253-
current_preset: getTranslationByKey(`armor-roll`),
6250+
current_preset: `${getTranslationByKey(`armor-roll`)}`,
62546251
subtitle2: '',
62556252
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}}}`,
62566253
});
@@ -6385,7 +6382,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
63856382
on('sheet:opened', function () {
63866383
// clog('Translation of query text complete.');
63876384
setAttrs({
6388-
translation_push_query: getTranslationByKey('push-query'),
6385+
translation_push_query: `${getTranslationByKey('push-query')}`,
63896386
translation_whisper_macro_query: `?{${getTranslationByKey('whisper-macro')}|${getTranslationByKey('no')},|${getTranslationByKey('yes')},/w gm |}`,
63906387
translation_whisper_api_macro_query: `?{${getTranslationByKey('whisper-macro')}|${getTranslationByKey('no')},!forl |${getTranslationByKey('yes')},!wforl |}`,
63916388
});
@@ -6488,7 +6485,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
64886485
artifact_die_ocho: 0,
64896486
artifact_die_ten: 0,
64906487
artifact_die_twelve: 0,
6491-
current_preset: getTranslationByKey(`roll-strength`),
6488+
current_preset: `${getTranslationByKey(`roll-strength`)}`,
64926489
subtitle2: '',
64936490
include_with_roll: '',
64946491
});
@@ -6508,7 +6505,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
65086505
artifact_die_ocho: 0,
65096506
artifact_die_ten: 0,
65106507
artifact_die_twelve: 0,
6511-
current_preset: getTranslationByKey(`roll-agility`),
6508+
current_preset: `${getTranslationByKey(`roll-agility`)}`,
65126509
subtitle2: '',
65136510
include_with_roll: '',
65146511
});
@@ -6528,7 +6525,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
65286525
artifact_die_ocho: 0,
65296526
artifact_die_ten: 0,
65306527
artifact_die_twelve: 0,
6531-
current_preset: getTranslationByKey(`roll-wits`),
6528+
current_preset: `${getTranslationByKey(`roll-wits`)}`,
65326529
subtitle2: '',
65336530
include_with_roll: '',
65346531
});
@@ -6548,7 +6545,7 @@ <h1 data-i18n="stronghold-notes-u">STRONGHOLD NOTES</h1>
65486545
artifact_die_ocho: 0,
65496546
artifact_die_ten: 0,
65506547
artifact_die_twelve: 0,
6551-
current_preset: getTranslationByKey(`roll-empathy`),
6548+
current_preset: `${getTranslationByKey(`roll-empathy`)}`,
65526549
subtitle2: '',
65536550
include_with_roll: '',
65546551
});

0 commit comments

Comments
 (0)