Skip to content

Commit

Permalink
indigo color dice and more quickstarts (#343)
Browse files Browse the repository at this point in the history
  • Loading branch information
@twonirwana
twonirwana authored Oct 18, 2023
1 parent 1e01dc8 commit 774487a
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ Valid for d6 and the only supported color is: `white`

image:image/draw_color.png[image,600]

Valid for d4, d6, d10, d8, d12, d20, d100 and the supported colors are: `white`, `gray`, `black`, `red`, `pink`, `orange`, `yellow`, `green`, `magenta`, `cyan`, `blue`.
Valid for d4, d6, d10, d8, d12, d20, d100 and the supported colors are: `white`, `gray`, `black`, `red`, `pink`, `orange`, `yellow`, `green`, `magenta`, `cyan`, `blue` and `indigo`.

==== polyhedral_alies_v1

Expand Down
26 changes: 20 additions & 6 deletions bot/src/main/java/de/janno/discord/bot/command/help/RpgSystemCommandPreset.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public CommandAndMessageDefinition createMessage(PresetId presetId, UUID newConf
}
case DND5_IMAGE -> {
CustomDiceConfig config = new CustomDiceConfig(null, string2ButtonIdLabelAndDiceExpression("1d4;1d6;1d8;1d10;1d12;1d20;1d100;2d20k1@D20 Advantage;2d20L1@D20 Disadvantage;2d4=@2d4;2d6=@2d6;2d8=@2d8;2d10=@2d10;2d12=@2d12;2d20=@2d20"),
DiceParserSystem.DICE_EVALUATOR, AnswerFormatType.without_expression, null, new DiceStyleAndColor(DiceImageStyle.polyhedral_3d, DiceImageStyle.polyhedral_3d.getDefaultColor()));
DiceParserSystem.DICE_EVALUATOR, AnswerFormatType.without_expression, null, new DiceStyleAndColor(DiceImageStyle.polyhedral_RdD, DiceImageStyle.polyhedral_RdD.getDefaultColor()));
yield startPreset(config, customDiceCommand, newConfigUUID, guildId, channelId);
}
case NWOD -> {
Expand All @@ -104,9 +104,9 @@ public CommandAndMessageDefinition createMessage(PresetId presetId, UUID newConf
yield startPreset(config, sumCustomSetCommand, newConfigUUID, guildId, channelId);
}
case OSR -> {
//1d20@D20;1d6@D6;2d6@2D6;1d4@D4;1d8@D8;3d6=,3d6=,3d6=,3d6=,3d6=,3d6=@Stats;(3d6=)*10@Gold;1d100@D100;1d10@D10;1d12@D12
//1d20@D20;1d6@D6;2d6@2D6;1d4@D4;1d8@D8;6x3d6=@Stats;(3d6=)*10@Gold;1d100@D100;1d10@D10;1d12@D12
CustomDiceConfig config = new CustomDiceConfig(null,
string2ButtonIdLabelAndDiceExpression("1d20@D20;1d6@D6;2d6@2D6;1d4@D4;1d8@D8;3d6=,3d6=,3d6=,3d6=,3d6=,3d6=@Stats;(3d6=)*10@Gold;1d100@D100;1d10@D10;1d12@D12"),
string2ButtonIdLabelAndDiceExpression("1d20@D20;1d6@D6;2d6@2D6;1d4@D4;1d8@D8;6x3d6=@Stats;(3d6=)*10@Gold;1d100@D100;1d10@D10;1d12@D12"),
DiceParserSystem.DICE_EVALUATOR, AnswerFormatType.without_expression, null, new DiceStyleAndColor(DiceImageStyle.polyhedral_3d, DiceImageStyle.polyhedral_3d.getDefaultColor()));
yield startPreset(config, customDiceCommand, newConfigUUID, guildId, channelId);
}
Expand Down Expand Up @@ -193,8 +193,8 @@ public CommandAndMessageDefinition createMessage(PresetId presetId, UUID newConf
yield startPreset(config, customParameterCommand, newConfigUUID, guildId, channelId);
}
case DND5_CALC -> {
//Alternate 5e Calculating setup: /sum_custom_set start buttons: d4;d6;d8;d10;d12;d20;d100;1;2;3;4;5;k@Keep Highest;L@Keep Lowest;(2d20k1)@D20 Advantage;(2d20L1)@D20 Disadvantage;-@Minus;+@Plus;(4r(d6))k3=@Stats;,@Split;[Muliple dice can be rolled using Number then die type. Plus Minus can be used to add modifiers If adding a modifier to an Advantage or disadvantage roll those buttons must be used. Keep Highest Lowest only work correctly with multiple dice of the same type. If you want to roll dice added together use Plus between each die type. This is a work around to give some guidance. Bot is not supposed to work this way.]@Help always_sum_result: true answer_format: full dice_image_style: polyhedral_alies_v2 dice_image_color: orange_and_silver
SumCustomSetConfig config = new SumCustomSetConfig(null, string2ButtonIdLabelAndDiceExpression("d4;d6;d8;d10;d12;d20;d100;1;2;3;4;5;k@Keep Highest;L@Keep Lowest;(2d20k1)@D20 Advantage;(2d20L1)@D20 Disadvantage;-@Minus;+@Plus;(4r(d6))k3=@Stats;,@Split")
//Alternate 5e Calculating setup: /sum_custom_set start buttons: d4;d6;d8;d10;d12;d20;d100;1;2;3;4;5;k@Keep Highest;L@Keep Lowest;(2d20k1)@D20 Advantage;(2d20L1)@D20 Disadvantage;-@Minus;+@Plus;4d6k3=@Stats;,@Split;[Muliple dice can be rolled using Number then die type. Plus Minus can be used to add modifiers If adding a modifier to an Advantage or disadvantage roll those buttons must be used. Keep Highest Lowest only work correctly with multiple dice of the same type. If you want to roll dice added together use Plus between each die type. This is a work around to give some guidance. Bot is not supposed to work this way.]@Help always_sum_result: true answer_format: full dice_image_style: polyhedral_alies_v2 dice_image_color: orange_and_silver
SumCustomSetConfig config = new SumCustomSetConfig(null, string2ButtonIdLabelAndDiceExpression("d4;d6;d8;d10;d12;d20;d100;1;2;3;4;5;k@Keep Highest;L@Keep Lowest;(2d20k1)@D20 Advantage;(2d20L1)@D20 Disadvantage;-@Minus;+@Plus;4d6k3=@Stats;,@Split")
, DiceParserSystem.DICE_EVALUATOR, true, AnswerFormatType.full, null, new DiceStyleAndColor(DiceImageStyle.polyhedral_3d, DiceImageStyle.polyhedral_3d.getDefaultColor()));
yield startPreset(config, sumCustomSetCommand, newConfigUUID, guildId, channelId);
}
Expand All @@ -204,6 +204,18 @@ public CommandAndMessageDefinition createMessage(PresetId presetId, UUID newConf
DiceParserSystem.DICE_EVALUATOR, AnswerFormatType.without_expression, null, new DiceStyleAndColor(DiceImageStyle.polyhedral_RdD, DiceImageStyle.polyhedral_RdD.getDefaultColor()));
yield startPreset(config, customDiceCommand, newConfigUUID, guildId, channelId);
}
case PUBLIC_ACCESS -> {
//Public Access (Carved from Brindlewood): /custom_dice start buttons: 2d6=@Roll;3d6k2=@Advantage;3d6l2=@Disadvantage answer_format: full dice_image_style: polyhedral_3d dice_image_color: red_and_white
CustomDiceConfig config = new CustomDiceConfig(null, string2ButtonIdLabelAndDiceExpression(" 2d6=@Roll;3d6k2=@Advantage;3d6l2=@Disadvantage"),
DiceParserSystem.DICE_EVALUATOR, AnswerFormatType.without_expression, null, new DiceStyleAndColor(DiceImageStyle.polyhedral_3d, DiceImageStyle.polyhedral_3d.getDefaultColor()));
yield startPreset(config, customDiceCommand, newConfigUUID, guildId, channelId);
}
case PARANOIA -> {
///custom_dice start buttons:asc((0d6 > 4) col 'black' + replace(1d6 > 4, [6], 'Computer!')) @ 0d6 + Computer; asc((1d6 > 4) col 'black' + replace(1d6 > 4, [6], 'Computer!')) @ 1d6 + Computer; asc((2d6 > 4) col 'red' + replace(1d6 > 4, [6], 'Computer!')) @ 2d6 + Computer; asc((3d6 > 4) col 'orange' + replace(1d6 > 4, [6], 'Computer!')) @ 3d6 + Computer; asc((4d6 > 4) col 'yellow' + replace(1d6 > 4, [6], 'Computer!')) @ 4d6 + Computer; asc((5d6 > 4) col 'green' + replace(1d6 > 4, [6], 'Computer!')) @ 5d6 + Computer; asc((6d6 > 4) col 'cyan' + replace(1d6 > 4, [6], 'Computer!')) @ 6d6 + Computer; asc((7d6 > 4) col 'blue' + replace(1d6 > 4, [6], 'Computer!')) @ 7d6 + Computer; asc((8d6 > 4) col 'magenta' + replace(1d6 > 4, [6], 'Computer!')) @ 8d6 + Computer; asc((9d6 > 4) col 'white' + replace(1d6 > 4, [6], 'Computer!')) @ 9d6 + Computer dice_image_style:polyhedral_2d dice_image_color:gray
CustomDiceConfig config = new CustomDiceConfig(null, string2ButtonIdLabelAndDiceExpression(" asc((0d6 > 4) col 'black' + replace(1d6 > 4, [6], 'Computer!')) @ 0d6 + Computer; asc((1d6 > 4) col 'black' + replace(1d6 > 4, [6], 'Computer!')) @ 1d6 + Computer; asc((2d6 > 4) col 'red' + replace(1d6 > 4, [6], 'Computer!')) @ 2d6 + Computer; asc((3d6 > 4) col 'orange' + replace(1d6 > 4, [6], 'Computer!')) @ 3d6 + Computer; asc((4d6 > 4) col 'yellow' + replace(1d6 > 4, [6], 'Computer!')) @ 4d6 + Computer; asc((5d6 > 4) col 'green' + replace(1d6 > 4, [6], 'Computer!')) @ 5d6 + Computer; asc((6d6 > 4) col 'cyan' + replace(1d6 > 4, [6], 'Computer!')) @ 6d6 + Computer; asc((7d6 > 4) col 'blue' + replace(1d6 > 4, [6], 'Computer!')) @ 7d6 + Computer; asc((8d6 > 4) col 'magenta' + replace(1d6 > 4, [6], 'Computer!')) @ 8d6 + Computer; asc((9d6 > 4) col 'white' + replace(1d6 > 4, [6], 'Computer!')) @ 9d6 + Computer"),
DiceParserSystem.DICE_EVALUATOR, AnswerFormatType.without_expression, null, new DiceStyleAndColor(DiceImageStyle.polyhedral_2d, "grey"));
yield startPreset(config, customDiceCommand, newConfigUUID, guildId, channelId);
}
};
}

Expand Down Expand Up @@ -256,7 +268,9 @@ public enum PresetId {
CITY_OF_MIST("City of Mist", List.of()),
RISUS("Risus The Anything RPG \"Evens Up\"", List.of()),
KIDS_ON_BROOMS("Kids on Brooms", List.of()),
REVE_DE_DRAGON("Rêve de Dragon", List.of("Reve de Dragon"));
REVE_DE_DRAGON("Rêve de Dragon", List.of("Reve de Dragon")),
PARANOIA("Paranoia: Red Clearance Edition", List.of()),
PUBLIC_ACCESS ("Public Access", List.of("Carved from Brindlewood"));
private final String displayName;
private final List<String> synonymes;
}
Expand Down
1 change: 1 addition & 0 deletions bot/src/main/java/de/janno/discord/bot/dice/image/provider/PolyhedralSvgWithColor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class PolyhedralSvgWithColor implements ImageProvider {
.put("magenta", Color.magenta)
.put("cyan", Color.cyan)
.put("blue", Color.blue)
.put("indigo", new Color( 75, 0, 130))
.build();


Expand Down
Loading

0 comments on commit 774487a

Please sign in to comment.