diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.html b/Shadowrun5thEdition/Shadowrun5thEdition.html index ad4ce3b88c..21348ef221 100644 --- a/Shadowrun5thEdition/Shadowrun5thEdition.html +++ b/Shadowrun5thEdition/Shadowrun5thEdition.html @@ -3049,26 +3049,48 @@ }); const versioning = (version) => { - console.log(`Shadowrun 5th Edition versioning, ${version}`); - if (version === "1.36") { - setAttrs({version: "1.4"}); + console.log(`%c Shadowrun 5th Edition versioning, ${version}`, "color: blue; font-weight:bold"); + if (version === "1.41") { + console.log(`%c Shadowrun 5th Edition is update to date`, "color: red; font-weight:bold"); + } else if (version === "1.4") { + const toggles = [`wound_toggle`, `edge_toggle`, `modifier_toggle`]; + getAttrs(toggles, (v) => { + let set = {}; + toggles.forEach(attr => { + const name = attr.split("_")[0], value = v[`${attr}`].toString(); + (value != "0" || !value.includes(name)) ? set[`${attr}`] = 0 : false; + }); + setAttrs(set); + }); + setAttrs({version: "1.41"}, () => {versioning("1.41")}); } else if (version === "1.35") { getAttrs(["sheet_type"], (v) => { let update = {}; (v.sheet_type === "goon") ? update["sheet_type"] = "grunt" : false; setAttrs(update); }); - setAttrs({version: "1.36"}, () => {versioning("1.36")}); + setAttrs({version: "1.36"}, () => {versioning("1.4")}); } else { setAttrs({version: "1.35"}, () => {versioning("1.35")}); }; }; - on("clicked:whisper clicked:wound clicked:modifier clicked:edge", (eventinfo) => { - const attr = (eventinfo.triggerName.includes("whisper")) ? "gm" : eventinfo.triggerName.split("clicked:")[1]; + on("clicked:whisper", (eventinfo) => { + getAttrs([`gm_toggle`], (v) => { + const value = v[`${attr}_toggle`]; + const change = (attr === "gm" && value != "/w gm") ? "/w gm" : " "; + + setAttrs({ + [`${attr}_toggle`]: change + }); + }); + }); + + on("clicked:wound clicked:modifier clicked:edge", (eventinfo) => { + const attr = eventinfo.triggerName.split("clicked:")[1]; getAttrs([`${attr}_toggle`], (v) => { const value = v[`${attr}_toggle`]; - const change = (attr === "gm" && value != "/w gm") ? "/w gm" : (attr === "wound" && value != "@{wounds}") ? "@{wounds}" : (attr === "edge" && value != "@{edge}") ? "@{edge}" : (attr === "modifier" && value != "?{Modifiers +/-|0}") ? "?{Modifiers +/-|0}" : " "; + const change = (attr === "wound" && value != "@{wounds}") ? "@{wounds}" : (attr === "edge" && value != "@{edge}") ? "@{edge}" : (attr === "modifier" && value != "?{Modifiers +/-|0}") ? "?{Modifiers +/-|0}" : 0; setAttrs({ [`${attr}_toggle`]: change diff --git a/Shadowrun5thEdition/sheet.json b/Shadowrun5thEdition/sheet.json index ebf0771bd9..4bd2d51372 100644 --- a/Shadowrun5thEdition/sheet.json +++ b/Shadowrun5thEdition/sheet.json @@ -5,7 +5,7 @@ "roll20userid": "557736", "patreon": "https://www.patreon.com/emeraldgrid", "preview": "preview.png", - "instructions": "Instructions for use can be found on the [GitHub README](https://github.com/Roll20/roll20-character-sheets/blob/master/Shadowrun5thEdition/README.md). Special thanks to Thomas Brown for bug fixes & code refactor. \n\n* *The Topps Company, Inc. has sole ownership of the names, logo, artwork, marks, photographs, sounds, audio, video and/or any proprietary material used in connection with the game Shadowrun. The Topps Company, Inc. has granted permission to use such names, logos, artwork, marks and/or any proprietary materials for promotional and informational purposes on its website but does not endorse, and is not affiliated with any official capacity whatsoever.*", + "instructions": "Instructions for use can be found on the [GitHub README](https://github.com/Roll20/roll20-character-sheets/blob/master/Shadowrun5thEdition/README.md). Special thanks to Thomas Brown for bug fixes & code refactor and Dyvim for French traslations. \n\n* *The Topps Company, Inc. has sole ownership of the names, logo, artwork, marks, photographs, sounds, audio, video and/or any proprietary material used in connection with the game Shadowrun. The Topps Company, Inc. has granted permission to use such names, logos, artwork, marks and/or any proprietary materials for promotional and informational purposes on its website but does not endorse, and is not affiliated with any official capacity whatsoever.*", "useroptions": [{ "attribute": "sheet_type", "displayname": "Sheet Type", diff --git a/Warhammer40k-WrathandGlory/WrathnGlory.css b/Warhammer40k-WrathandGlory/WrathnGlory.css index 11833c1c3d..58aa64da43 100644 --- a/Warhammer40k-WrathandGlory/WrathnGlory.css +++ b/Warhammer40k-WrathandGlory/WrathnGlory.css @@ -493,12 +493,12 @@ font-family: "pictos";} div.sheet-weapons h2:nth-of-type(1) { - margin-right: 20%; + margin-right: 21%; margin-left : 1%;} /* DAMAGE HEADER */ div.sheet-weapons h2:nth-of-type(2){ - margin-right: 3%;} + margin-right: 2.7%;} /* AP HEADER */ div.sheet-weapons h2:nth-of-type(3) { @@ -583,7 +583,7 @@ width: 36%;} div.sheet-weapons div.sheet-display div:nth-of-type(2) { - width: 10%;} + width: 8%;} div.sheet-weapons div.sheet-display div:nth-of-type(3), div.sheet-weapons div.sheet-display div:nth-of-type(4), @@ -1178,3 +1178,119 @@ outline : none; text-shadow : 1px 1px 2px black, 0 0 25px red, 0 0 5px #610b0d;} + /********************************************************************************************/ +/***************** Spanish & French Adjustments ********************************/ +/*******************************************************************************************/ + .charsheet.lang-es {} + +.charsheet.lang-es img.sheet-logo { + margin-right: -5%} + +.charsheet.lang-es div.sheet-tabs button[name*="npc"] { + margin-left: 1%} + +.charsheet.lang-es div.sheet-personal-info input[type="text"] { + width: 80%;} + +.charsheet.lang-es div.sheet-personal-info input + label { + margin-left: 0px;} + +.charsheet.lang-es div.sheet-attributes h2:nth-child(3), +.charsheet.lang-es div.sheet-weapons h2:nth-of-type(2), +.charsheet.lang-fr div.sheet-attributes h2:nth-child(2) { + margin-right: 5%;} + +.charsheet.lang-es div.sheet-combat-traits h2:nth-child(3) { + margin-right: 18%;} + +.charsheet.lang-es div.sheet-2col-left div:nth-of-type(2) input[type="text"] { + width: 60%;} + +.charsheet.lang-es .sheet-personal-info div:nth-of-type(3) label, +.charsheet.lang-es div.sheet-dieroller label, +.charsheet.lang-fr div.sheet-dieroller label { + font-size: 1.1em;} + +.charsheet.lang-es div.sheet-skills h2:nth-of-type(1) { + margin-right: 10%;} + +.charsheet.lang-es div.sheet-weapons h2:nth-of-type(1) { + margin-right: 14%;} + +.charsheet.lang-es div.sheet-weapons h2:nth-of-type(3) { + margin-right: 2%;} + +.charsheet.lang-es div.sheet-weapons div.sheet-display div:nth-of-type(3){ + width: 6%;} + +.charsheet.lang-es div.sheet-weapons div.sheet-display div:nth-of-type(4), +.charsheet.lang-es div.sheet-weapons div.sheet-display div:nth-of-type(5), +.charsheet.lang-es div.sheet-weapons div.sheet-display div:nth-of-type(2) { + width: 8%;} + +.charsheet.lang-es div.sheet-weapons div.sheet-display div:nth-of-type(1) { + width: 20%;} + +.charsheet.lang-es div.sheet-npc-skill-list h2:nth-of-type(1), +.charsheet.lang-es div.sheet-npc-skill-list h2:nth-of-type(3) { + width: 5%;} + +.charsheet.lang-es .sheet-npc div.sheet-dieroller label { + width: 26%;} + +.charsheet.lang-es .sheet-npc div.sheet-dieroller button[type="roll"], +.charsheet.lang-fr .sheet-npc div.sheet-dieroller button[type="roll"] { + margin-left: -0.5%;} + +.charsheet.lang-es div.sheet-npc div.sheet-col-right div.sheet-settings div > div { + margin-right: 1%;} + + + /********************************************************************************************/ +/***************** French Adjustments ********************************/ +/*******************************************************************************************/ + .charsheet.lang-fr {} + + .charsheet.lang-fr .sheet-wrath h1 { + font-size: 1.3em;} + + .charsheet.lang-fr div.sheet-personal-info input[type="number"] { + width: 22%;} + + .charsheet.lang-fr div.sheet-attributes input[type="number"] + input[type="number"] { + width: 30%;} + +.charsheet.lang-fr div.sheet-attributes button[type="action"] { + width: 34%;} + +.charsheet.lang-fr div.sheet-combat-traits h2:nth-child(2) { + margin-right: 32%;} + +.charsheet.lang-fr div.sheet-other-traits h2:nth-of-type(1) { + margin-right: 52%;} + +.charsheet.lang-fr div.sheet-2col-right .sheet-personal-info textarea { + height: 400px;} + +.charsheet.lang-fr div.sheet-skills h2:nth-of-type(1) { + margin-right: 8%;} + +.charsheet.lang-fr div.sheet-skills h2:nth-of-type(2), +.charsheet.lang-fr div.sheet-skills h2:nth-of-type(3) { + margin-right: 12%;} + +.charsheet.lang-fr div.sheet-weapons h2:nth-of-type(1) { + margin-right: 22%;} + +.charsheet.lang-fr div.sheet-stat-long-row input[type="text"] { + width: 68%;} + +.charsheet.lang-fr div.sheet-npc-skill-list h2:nth-of-type(1), +.charsheet.lang-fr div.sheet-npc-skill-list h2:nth-of-type(3) { + margin-right: 11%;} + +.charsheet.lang-fr div.sheet-npc div.sheet-dieroller label { + width: 24%;} + +.charsheet.lang-fr div.sheet-npc div.sheet-dieroller input { + width: 3em;} diff --git a/Warhammer40k-WrathandGlory/WrathnGlory.html b/Warhammer40k-WrathandGlory/WrathnGlory.html index 8c67f8c695..de2161a964 100644 --- a/Warhammer40k-WrathandGlory/WrathnGlory.html +++ b/Warhammer40k-WrathandGlory/WrathnGlory.html @@ -494,20 +494,20 @@ x
- - + +
+ ed
- - - + + +
- +
diff --git a/Warhammer40k-WrathandGlory/sheet.json b/Warhammer40k-WrathandGlory/sheet.json index ec4e12f222..bffcd7ac22 100644 --- a/Warhammer40k-WrathandGlory/sheet.json +++ b/Warhammer40k-WrathandGlory/sheet.json @@ -4,7 +4,7 @@ "authors": "Cassie Levett", "roll20userid": "557736", "preview": "preview.png", - "instructions": "A simple character sheet for Warhammer 40,000: Wrath & Glory. Instructions for use can be found on the [GitHub README](https://github.com/Roll20/roll20-character-sheets/blob/master/Warhammer40k-WrathandGlory/README.md).", + "instructions": "A simple character sheet for Warhammer 40,000: Wrath & Glory by Ulisses North America. Instructions for use can be found on the [GitHub README](https://github.com/Roll20/roll20-character-sheets/blob/master/Warhammer40k-WrathandGlory/README.md).\n\n* En español & en français. Merci y gracias to Dyvim & WallaceMcGregor for providing translations", "useroptions": [{ "attribute": "sheet_type", "displayname": "Sheet Type",