Improved Dice Calculator (#452)

twonirwana · Feb 26, 2024 · 6b8f313 · 6b8f313
1 parent d843d45
commit 6b8f313
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/bot/src/main/resources/botMessages.properties b/bot/src/main/resources/botMessages.properties
@@ -260,7 +260,7 @@ rpg.system.command.preset.OWOD.expression=val('$diceNumber',{Number of Dice}) va
 rpg.system.command.preset.SHADOWRUN.expression=val('$roll',{number of dice:1<=>20}d6) concat('$roll'>4c, if('$roll'==1c >? '$roll'c/2,' - Glitch!'))
 rpg.system.command.preset.SHADOWRUN_IMAGE.expression=val('$roll',{number of dice:1<=>20}d6) concat('$roll'>4c, if('$roll'==1c >? '$roll'c/2,' - Glitch!'))
 rpg.system.command.preset.COIN.expression=1d[Head 😀/Tail 🦅]@Coin Toss 🪙
-rpg.system.command.preset.DICE_CALCULATOR.expression=7;8;9;+;-;4;5;6;d;k;1;2;3;0;l
+rpg.system.command.preset.DICE_CALCULATOR.expression=7;8;9;+;-;4;5;6;(;);1;2;3;d;r;0;00;d20;k;l;(2d20k1)@ADV;(2d20L1)@DIS
 rpg.system.command.preset.OSR.expression=1d20@D20;1d6@D6;2d6@2D6;1d4@D4;1d8@D8;6x3d6=@Stats;(3d6=)*10@Gold;1d100@D100;1d10@D10;1d12@D12
 rpg.system.command.preset.TRAVELLER.expression=+2d6;+(3d6k2)@Boon;+(3d6l2)@Bane;+1d6;+1;+2;+3;+4;-1;-2;-3;-4
 rpg.system.command.preset.SAVAGE_WORLDS.expression=(d!!{Dice:4@D4/6@D6/8@D8/12@D12/20@D20} + {Type: 0@Regular/1d!!6@Wildcard})k1

diff --git a/bot/src/main/resources/botMessages_de.properties b/bot/src/main/resources/botMessages_de.properties
@@ -247,7 +247,7 @@ rpg.system.command.preset.OWOD.expression=val('$diceNumber',{Würfelanzahl}) val
 rpg.system.command.preset.SHADOWRUN.expression=val('$roll',{Würfelanzahl:1<=>20}d6) concat('$roll'>4c, if('$roll'==1c >? '$roll'c/2,' - Glitch!'))
 rpg.system.command.preset.SHADOWRUN_IMAGE.expression=val('$roll',{Würfelanzahl:1<=>20}d6) concat('$roll'>4c, if('$roll'==1c >? '$roll'c/2,' - Glitch!'))
 rpg.system.command.preset.COIN.expression=1d[Kopf 😀/Zahl 🦅]@Münzwurf 🪙
-rpg.system.command.preset.DICE_CALCULATOR.expression=7;8;9;+;-;4;5;6;d@w;k;1;2;3;0;l
+#rpg.system.command.preset.DICE_CALCULATOR.expression=7;8;9;+;-;4;5;6;d@w;k;1;2;3;0;l
 rpg.system.command.preset.OSR.expression=1d20@W20;1d6@W6;2d6@2W6;1d4@W4;1d8@W8;6x3d6=@Attribute;(3d6=)*10@Gold;1d100@W100;1d10@W10;1d12@W12
 rpg.system.command.preset.TRAVELLER.expression=+2d6;+(3d6k2)@Boon;+(3d6l2)@Bane;+1d6;+1;+2;+3;+4;-1;-2;-3;-4
 rpg.system.command.preset.SAVAGE_WORLDS.expression=(d!!{Würfel:4@W4/6@W6/8@W8/12@W12/20@W20} + {Type: 0@Normal/1d!!6@Wildcard})k1

diff --git a/bot/src/main/resources/botMessages_pt_BR.properties b/bot/src/main/resources/botMessages_pt_BR.properties
@@ -239,7 +239,7 @@ rpg.system.command.preset.OWOD.expression=val('$diceNumber',{Quantidade de Dados
 rpg.system.command.preset.SHADOWRUN.expression=val('$roll',{Quantidade de Dados:1<=>20}d6) concat('$roll'>4c, if('$roll'==1c >? '$roll'c/2,' - Glitch!'))
 rpg.system.command.preset.SHADOWRUN_IMAGE.expression=val('$roll',{Quantidade de Dados:1<=>20}d6) concat('$roll'>4c, if('$roll'==1c >? '$roll'c/2,' - Glitch!'))
 rpg.system.command.preset.COIN.expression=1d[Cara 😀/Coroa ♛]@Cara ou Coroa 🪙
-rpg.system.command.preset.DICE_CALCULATOR.expression=7;8;9;+;-;4;5;6;d;k;1;2;3;0;l
+#rpg.system.command.preset.DICE_CALCULATOR.expression=7;8;9;+;-;4;5;6;d;k;1;2;3;0;l
 rpg.system.command.preset.OSR.expression=1d20@D20;1d6@D6;2d6@2D6;1d4@D4;1d8@D8;6x3d6=@Atributos;(3d6=)*10@Ouro;1d100@D100;1d10@D10;1d12@D12
 rpg.system.command.preset.TRAVELLER.expression=+2d6;+(3d6k2)@Benefício;+(3d6l2)@Defeito;+1d6;+1;+2;+3;+4;-1;-2;-3;-4
 rpg.system.command.preset.SAVAGE_WORLDS.expression=(d!!{Dados:4@D4/6@D6/8@D8/12@D12/20@D20} + {Tipo: 0@Normal/1d!!6@Carta Selvagem})k1