diff --git a/5eShaped/translations/fr.json b/5eShaped/translations/fr.json index e98252b8f3..3445cc0966 100644 --- a/5eShaped/translations/fr.json +++ b/5eShaped/translations/fr.json @@ -35,14 +35,14 @@ "ARCANA":"Arcanes", "ARMOR":"Armure", "ARMORED_AND_UNARMORED":"Bonus avec et sans armure", - "ARMOR_CLASS":"Armure", + "ARMOR_CLASS":"Classe d'armure", "ATHLETICS":"Athlétisme", "ATK":"ATQ", "ATTACHERS":"Attaches", "ATTACK":"Attaque", "ATTACKS":"Attaques", "AUTO_REVERT_ADV":"Enlever le (dés)avantage après chaque jet", - "BACKGROUND":"Background", + "BACKGROUND":"Biographie", "BARBARIAN":"Barbare", "BARD":"Barde", "BIG":"Gros", @@ -578,7 +578,7 @@ "UNTIL_DISPELLED":"jusqu'à dissipation", "UNTIL_DISPELLED_OR_TRIGGERED":"jusqu'à dissipation ou déclenchement", "UP_TO_1_MINUTE":"jusqu'à 1 minute", - "1_ROUND":"1 round", + "1_ROUND":"1 tour", "UP_TO_1_ROUND":"jusqu'à 1 round", "UP_TO_6_ROUNDS":"jusqu'à 6 rounds", "UP_TO_10_MINUTES":"jusqu'à 10 minutes", diff --git a/5th Edition OGL by Roll20/translations/zu.json b/5th Edition OGL by Roll20/translations/zu.json index edd0ea1bf0..f139bf49ff 100644 --- a/5th Edition OGL by Roll20/translations/zu.json +++ b/5th Edition OGL by Roll20/translations/zu.json @@ -326,7 +326,7 @@ "halfling-luck-u":"crwdns5855:0crwdne5855:0", "arcane-fighter-u":"crwdns5856:0crwdne5856:0", "arcane-rogue-u":"crwdns5857:0crwdne5857:0", - "class-options-u":"crwdns5858:0{class}crwdne5858:0", + "class-options-u":"crwdns7762:0{class}crwdne7762:0", "2nd-class:-u":"crwdns5859:0crwdne5859:0", "lvl:-u":"crwdns5860:0crwdne5860:0", "3rd-class:-u":"crwdns5861:0crwdne5861:0", diff --git a/Shadowrun5e-Gerdofal/GlitchCatcher.js b/Shadowrun5e-Gerdofal/GlitchCatcher.js index 62daf8d8e7..48dee6d3ed 100644 --- a/Shadowrun5e-Gerdofal/GlitchCatcher.js +++ b/Shadowrun5e-Gerdofal/GlitchCatcher.js @@ -1,41 +1,41 @@ -on('chat:message', function (msg) { - if(((msg.type == 'general' || msg.type == 'whisper') && (msg.rolltemplate.indexOf('sr1') >= 0)) || (msg.type == 'rollresult' || msg.type == 'gmrollresult')) { //todo JSON.parse(msg.content) to get the rollresult obj - if(msg.type == 'rollresult' || msg.type == 'gmrollresult') { - var rollResult = JSON.parse(msg.content); - log(rollResult); - var poolSize = rollResult.rolls[0].dice; - var dice = rollResult.rolls[0].results; - }else { - log(msg.inlinerolls); - var poolSize = msg.inlinerolls[1].results.rolls[0].dice; - var dice = msg.inlinerolls[1].results.rolls[0].results; - } - - if(msg.content.indexOf('Initiative') >= 0) { - return; //not a pooled roll, don't report glitches - } - var oneCount = 0; - var hitCount = 0; - var i = 0; - var r; - - - for(i=0; i poolSize/2 && hitCount == 0) { - log(msg.who + " critically glitched"); - sendChat("player|"+msg.playerid, "/direct CRIT GLITCH!"); - } else if(oneCount > poolSize/2){ - log(msg.who + " glitched"); - sendChat("player|"+msg.playerid, "/direct GLITCH!"); - } - } - +on('chat:message', function (msg) { + if(((msg.type == 'general' || msg.type == 'whisper') && (msg.rolltemplate.indexOf('sr1') >= 0)) || (msg.type == 'rollresult' || msg.type == 'gmrollresult')) { //todo JSON.parse(msg.content) to get the rollresult obj + if(msg.type == 'rollresult' || msg.type == 'gmrollresult') { + var rollResult = JSON.parse(msg.content); + log(rollResult); + var poolSize = rollResult.rolls[0].dice; + var dice = rollResult.rolls[0].results; + }else { + log(msg.inlinerolls); + var poolSize = msg.inlinerolls[1].results.rolls[0].dice; + var dice = msg.inlinerolls[1].results.rolls[0].results; + } + + if(msg.content.indexOf('Initiative') >= 0) { + return; //not a pooled roll, don't report glitches + } + var oneCount = 0; + var hitCount = 0; + var i = 0; + var r; + + + for(i=0; i poolSize/2 && hitCount == 0) { + log(msg.who + " critically glitched"); + sendChat("player|"+msg.playerid, "/direct CRIT GLITCH!"); + } else if(oneCount > poolSize/2){ + log(msg.who + " glitched"); + sendChat("player|"+msg.playerid, "/direct GLITCH!"); + } + } + }); \ No newline at end of file