Skip to content

Commit

Permalink
Merge pull request #16 from Roll20/master
Browse files Browse the repository at this point in the history
Sync master
  • Loading branch information
coyotegrey authored Aug 3, 2021
2 parents 22cde7b + 51eeba7 commit 9b9b9be
Show file tree
Hide file tree
Showing 486 changed files with 52,064 additions and 20,089 deletions.
4 changes: 2 additions & 2 deletions 13th Age Glorantha/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Race": "Race",
"Class": "Class",
"Level": "Level",
"AbilityScores": "AbilityScores",
"AbilityScores": "Ability Scores",
"STR": "STR",
"Strength": "Strength",
"CON": "CON",
Expand Down Expand Up @@ -53,7 +53,7 @@
"Temp.": "Temp.",
"Initiative": "Initiative",
"One Unique Thing": "One Unique Thing",
"Describe your characters one unique thing ...": "Describe your characters one unique thing ...",
"Describe your characters one unique thing ...": "Describe your character's one unique thing ...",
"Class Features": "Class Features",
"Talents": "Talents",
"Powers & Spells": "Powers & Spells",
Expand Down
16 changes: 12 additions & 4 deletions AD&D 2E Revised/2ESheet.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@
<div aria-label="Announces changes to sheet">
<input type="checkbox" class="sheet-show-announcement" value="1" title="Show Announcements" name="attr_announcement"/><span></span><b style="color:red;" title="Show Announcements">Announcements</b>
<div class="sheet-announcement">
<h2 style="font-size:24px; line-height: 36px">Changes in <input type="text" name="attr_version" class="sheet-version-large"/></h2>
<h2 style="font-size:24px; line-height: 36px">Potential Changes coming! <input type="text" name="attr_version" class="sheet-version-large"/></h2>
<br/>
<div class="sheet-announce-items">
<p>In order to make room for new functionality on the Monster Sheet, the <b>Variants repeating section is scheduled for deletion</b>. The deletion will happen in 1 month, around the 1st of September.</p>
<p style="text-align: center;">
<img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/uDkBIZp.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
<img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/yILTmXJ.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
</p>
<p><b>If anyone uses this section, please let me know, so that I do not delete your work!</b></p>
<p>If the section gets removed the following features will be added afterwards to the Monster Sheet</p>
<ul style="font-style:italic">
<li>Fixed a bug with setting the character_sheet version attribute on new games / new character sheets</li>
<li>Fixed a bug that made any API loaded with the sheet fail to load correctly</li>
<li>Repeating Weapons / attack table allowing for adding more attacks to a monster</li>
<li>Repeating spells, allowing monsters to use the full list of spells, currently available to players. This also include rolling spells secretly as the DM, so that players cannot see what spell you are using</li>
</ul>

<hr>
<p>
To get notified on future updates, discuss changes, or contribute suggestions, please follow this topic on the forum:
Expand Down Expand Up @@ -30753,7 +30761,7 @@ <h4><b>Ecology</b></h4><textarea name="attr_monsterecology" title="@{repeating_m
// --- Version change start --- //

const sheetName = 'AD&D 2E Revised';
const sheetVersion = '4.1.2';
const sheetVersion = '4.1.3';

on('sheet:opened', function(){
getAttrs(['character_sheet'],function(attrs){
Expand Down
11 changes: 10 additions & 1 deletion AD&D 2E Revised/2EStyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ button {

.charsheet,
.charsheet button:hover {
background-image: url("http://www.commentnation.com/backgrounds/images/parchment_paper_seamless_pattern.jpg");
background-image: url("https://www.commentnation.com/backgrounds/images/parchment_paper_seamless_pattern.jpg");
}

/*/ Styles for 2ESheet rolltemplates /*/
Expand Down Expand Up @@ -1439,4 +1439,13 @@ div.sheet-announcement {
-ms-user-select: all; /* IE 10+ */
user-select: all; /* Likely future */
}

img.expandable {
transition:transform 0.25s ease;
}

img.expandable:hover {
-webkit-transform:scale(3); /* or some other value */
transform:scale(3);
}
/* Announcement styling end */
14 changes: 11 additions & 3 deletions AD&D 2E Revised/html/2ESheet-base.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@
<div aria-label="Announces changes to sheet">
<input type="checkbox" class="sheet-show-announcement" value="1" title="Show Announcements" name="attr_announcement"/><span></span><b style="color:red;" title="Show Announcements">Announcements</b>
<div class="sheet-announcement">
<h2 style="font-size:24px; line-height: 36px">Changes in <input type="text" name="attr_version" class="sheet-version-large"/></h2>
<h2 style="font-size:24px; line-height: 36px">Potential Changes coming! <input type="text" name="attr_version" class="sheet-version-large"/></h2>
<br/>
<div class="sheet-announce-items">
<p>In order to make room for new functionality on the Monster Sheet, the <b>Variants repeating section is scheduled for deletion</b>. The deletion will happen in 1 month, around the 1st of September.</p>
<p style="text-align: center;">
<img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/uDkBIZp.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
<img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/yILTmXJ.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
</p>
<p><b>If anyone uses this section, please let me know, so that I do not delete your work!</b></p>
<p>If the section gets removed the following features will be added afterwards to the Monster Sheet</p>
<ul style="font-style:italic">
<li>Fixed a bug with setting the character_sheet version attribute on new games / new character sheets</li>
<li>Fixed a bug that made any API loaded with the sheet fail to load correctly</li>
<li>Repeating Weapons / attack table allowing for adding more attacks to a monster</li>
<li>Repeating spells, allowing monsters to use the full list of spells, currently available to players. This also include rolling spells secretly as the DM, so that players cannot see what spell you are using</li>
</ul>

<hr>
<p>
To get notified on future updates, discuss changes, or contribute suggestions, please follow this topic on the forum:
Expand Down
2 changes: 1 addition & 1 deletion AD&D 2E Revised/javascript/version.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// --- Version change start --- //

const sheetName = 'AD&D 2E Revised';
const sheetVersion = '4.1.2';
const sheetVersion = '4.1.3';

on('sheet:opened', function(){
getAttrs(['character_sheet'],function(attrs){
Expand Down
2 changes: 1 addition & 1 deletion AW/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"misses": "Misses",
"move": "Move",
"name": "Name",
"nolonger-vulnerable-hunger": "You can live on local human food and are no loger vulnerable to hunger.",
"nolonger-vulnerable-hunger": "You can live on local human food and are no longer vulnerable to hunger.",
"nolonger-vulnerable-xharm": "You are no longer vulnerable to Ψ-harm.",
"open-your-brain": "Open your brain",
"operator": "Operator",
Expand Down
2 changes: 1 addition & 1 deletion AW2E/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"gang": "Gang",
"gang-new-option": "choose a new option for your gang",
"gear-barter": "Gear &amp; Barter",
"get-2brainer-gear": "get 2 new or relacement brainer gear (you choose)",
"get-2brainer-gear": "get 2 new or replacement brainer gear (you choose)",
"get-ally": "get an ally (cf, detail with the MC)",
"get-establishment": "get an establishment (detail)",
"get-followers-fortune": "get followers (you detail) and Fortunes",
Expand Down
10 changes: 5 additions & 5 deletions Bluebeard's Bride/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"fatale-desc": "You drip sensuality from your lips. Others watch your every move and crave for you to take control.",
"mother": "Mother",
"Mother": "Mother",
"mother-desc": "You walk with authority.\n Others ache for your approval,and long for you to soothe their wounds.\n ",
"mother-desc": "You walk with authority.\n Others ache for your approval, and long for you to soothe their wounds.\n ",
"virgin": "Virgin",
"Virgin": "Virgin",
"virgin-desc": "\n You see beauty where there is none.\n Others seek comfort in your warmth and delight in your obedience.\n ",
"witch": "Witch",
"Witch": "Witch",
"witch-desc": "\n You braid magic from shadow and blood.\n Others desire a taste of your sing and pray for your undoing.\n ",
"witch-desc": "\n You braid magic from shadow and blood.\n Others desire a taste of your sin and pray for your undoing.\n ",
"shattered-desc": "\n When a sister misses her roll, the Groundskeeper may look to you\n to describe what happens to the Bride.<br>\n Use the following prompts to help describe what happens to the Bride:\n ",
"shattered-options": "\n <li>Answer with what you find frightening.</li>\n <li>Illuminate the horror in beauty as well as gore.</li>\n <li>Decribe interesting details using all five senses.</li>\n ",
"shattered-options": "\n <li>Answer with what you find frightening.</li>\n <li>Illuminate the horror in beauty as well as gore.</li>\n <li>Describe interesting details using all five senses.</li>\n ",
"stats": "Stats",
"blood": "blood",
"carnality": "carnality",
Expand All @@ -30,7 +30,7 @@
"the-rooster-desc": "Mark one trauma to give a direct order to an NPC. They do it, but choose one: Your order…",
"the-rooster-options": "<li>is carried out to the letter and then some.</li>\n<li>is overwhelming and carried out sloppily.</li>\n<li>is not something they can do, and a third party steps in to carry it out.</li>",
"the-shield": "The Shield",
"the-shield-desc": "When one of your Sisters marks trauma, explain to her howthe trauma she is experiencing is her fault, then ask if she believes you. If she believes you, she marks one less trauma. If she rejects your explanation, mark one trauma as you experience the shame of your own impotence.",
"the-shield-desc": "When one of your Sisters marks trauma, explain to her how the trauma she is experiencing is her fault, then ask if she believes you. If she believes you, she marks one less trauma. If she rejects your explanation, mark one trauma as you experience the shame of your own impotence.",
"the-dancer": "The Dancer",
"the-dancer-desc": "Remove a piece of your clothing to <em>care for someone</em>.That item of clothing is lost to you forever, but it feeds the appetite of the horror or servant until the Bride speaks again.",
"the-mistress": "The Mistress",
Expand Down Expand Up @@ -119,7 +119,7 @@
"propose-a-truth-desc2": "\n If it is a <em>token of Faithfulness</em>, \n you are close to proving that your trust in your husband is well placed;\n heal one trauma.\n ",
"propose-a-truth-desc3": "\n If it is a <em>token of Disloyalty</em>, you are closer to proving\n that your unkind suspicions about your husband are true;\n mark one trauma.\n ",
"the-bride": "The Bride",
"the-bride-desc": "\n Use this page to track the Bride's progress thru the mansion.\n When the Bride aquires Tokens of <em>Faithfulness</em> and\n <em>Disloyalty</em>, click the appropriate icon, and enter information\n about the Token in the text boxes.\n ",
"the-bride-desc": "\n Use this page to track the Bride's progress through the mansion.\n When the Bride acquires Tokens of <em>Faithfulness</em> and\n <em>Disloyalty</em>, click the appropriate icon, and enter information\n about the Token in the text boxes.\n ",
"faithfulness": "faithfulness",
"disloyalty": "disloyalty",
"help": "Help",
Expand Down
2 changes: 1 addition & 1 deletion Bluebeard's Bride/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"virgin-desc": "\nVous voyez la beauté là où il n'y en a pas.\n Les autres cherchent du confort dans votre chaleur et du bonheur dans vote obéissance.\n ",
"witch": "Sorcière",
"Witch": "Sorcière",
"witch-desc": "\nVous tissez la magie avec l'ombre et le sang.\n Les autres désirent un avant-goût de vos chants et prient pour vos désensorcellement. ",
"witch-desc": "\nVous tissez la magie avec l'ombre et le sang.\n Les autres désirent un avant-goût de vos péchés et prient pour votre ruine. ",
"shattered-desc": "\n Quand une sœur rate son jet, le Jardinier peut prendre la main\n pour décrire ce qui arrive à la Mariée.<br>\n Utilisez les répliques suivantes pour vous aider à décrire ce qui arrive à la Mariée: ",
"shattered-options": "\n <li>Répondez avec ce qui vous terrifie.</li>\n <li>Illustrez l'horreur dans la beauté comme dans le gore.</li>\n <li>Décrivez les détails importants à l'aides des 5 sens.</li> ",
"stats": "Caractéristiques",
Expand Down
Binary file modified CDMG/cdmg-preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9b9b9be

Please sign in to comment.