mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

now builds, more changes inc

Browse Source
This commit is contained in:
Master Kwoth 2016-03-11 12:14:59 +01:00
parent 50cd1f50b5
commit d9a8a6d4fa
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NadekoBot/Classes/Cards.cs
View File

@ -146,7 +146,7 @@ public class Cards
} }
public override string ToString() => string.Join("", cardPool.Select(c => c.ToString())) + Environment.NewLine; public override string ToString() => string.Join("", cardPool.Select(c => c.ToString())) + Environment.NewLine;
internal override void InitHandValues() { private void InitHandValues() {
Func<List<Card>, bool> hasPair = Func<List<Card>, bool> hasPair =
cards => cards.GroupBy(card => card.Number) cards => cards.GroupBy(card => card.Number)
.Count(group => group.Count() == 2) == 1; .Count(group => group.Count() == 2) == 1;

2
NadekoBot/Commands/PlayingRotate.cs
View File

@ -34,7 +34,7 @@ namespace NadekoBot.Commands {
private readonly object playingPlaceholderLock = new object(); private readonly object playingPlaceholderLock = new object();
public PlayingRotate() { public PlayingRotate(DiscordModule module) : base(module) {
var i = -1; var i = -1;
timer.Elapsed += (s, e) => { timer.Elapsed += (s, e) => {
try { try {

12
NadekoBot/Modules/Administration.cs
View File

@ -15,12 +15,12 @@ using NadekoBot.Classes._DataModels;
namespace NadekoBot.Modules { namespace NadekoBot.Modules {
internal class Administration : DiscordModule { internal class Administration : DiscordModule {
public Administration() { public Administration() {
commands.Add(new ServerGreetCommand()); commands.Add(new ServerGreetCommand(this));
commands.Add(new LogCommand()); commands.Add(new LogCommand(this));
commands.Add(new MessageRepeater()); commands.Add(new MessageRepeater(this));
commands.Add(new PlayingRotate()); commands.Add(new PlayingRotate(this));
commands.Add(new RatelimitCommand()); commands.Add(new RatelimitCommand(this));
commands.Add(new VoicePlusTextCommand()); commands.Add(new VoicePlusTextCommand(this));
} }
public override string Prefix { get; } = "."; public override string Prefix { get; } = ".";

4
NadekoBot/Modules/Conversations.cs
View File

@ -17,8 +17,8 @@ namespace NadekoBot.Modules {
internal class Conversations : DiscordModule { internal class Conversations : DiscordModule {
private const string firestr = "🔥 ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้ 🔥"; private const string firestr = "🔥 ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้ 🔥";
public Conversations() { public Conversations() {
commands.Add(new CopyCommand()); commands.Add(new CopyCommand(this));
commands.Add(new RequestsCommand()); commands.Add(new RequestsCommand(this));
} }
public override string Prefix { get; } = String.Format("<@{0}>", NadekoBot.Creds.BotId); public override string Prefix { get; } = String.Format("<@{0}>", NadekoBot.Creds.BotId);

6
NadekoBot/Modules/Gambling.cs
View File

@ -11,9 +11,9 @@ namespace NadekoBot.Modules
{ {
public Gambling() { public Gambling() {
commands.Add(new DrawCommand()); commands.Add(new DrawCommand(this));
commands.Add(new FlipCoinCommand()); commands.Add(new FlipCoinCommand(this));
commands.Add(new DiceRollCommand()); commands.Add(new DiceRollCommand(this));
} }
public override string Prefix { get; } = "$"; public override string Prefix { get; } = "$";

8
NadekoBot/Modules/Games.cs
View File

@ -15,10 +15,10 @@ namespace NadekoBot.Modules {
private readonly Random rng = new Random(); private readonly Random rng = new Random();
public Games() { public Games() {
commands.Add(new Trivia()); commands.Add(new Trivia(this));
commands.Add(new SpeedTyping()); commands.Add(new SpeedTyping(this));
commands.Add(new PollCommand()); commands.Add(new PollCommand(this));
commands.Add(new ClashOfClans()); commands.Add(new ClashOfClans(this));
_8BallAnswers = JArray.Parse(File.ReadAllText("data/8ball.json")).Select(t => t.ToString()).ToArray(); _8BallAnswers = JArray.Parse(File.ReadAllText("data/8ball.json")).Select(t => t.ToString()).ToArray();
} }

2
NadekoBot/Modules/Help.cs
View File

@ -8,7 +8,7 @@ namespace NadekoBot.Modules {
internal class Help : DiscordModule { internal class Help : DiscordModule {
public Help() { public Help() {
commands.Add(new HelpCommand()); commands.Add(new HelpCommand(this));
} }
public override string Prefix { get; } = "-"; public override string Prefix { get; } = "-";

2
NadekoBot/Modules/Permissions.cs
View File

@ -14,7 +14,7 @@ namespace NadekoBot.Modules {
public override string Prefix { get; } = ";"; public override string Prefix { get; } = ";";
public PermissionModule() { public PermissionModule() {
commands.Add(new FilterInvitesCommand()); commands.Add(new FilterInvitesCommand(this));
} }
public override void Install(ModuleManager manager) { public override void Install(ModuleManager manager) {

2
NadekoBot/Modules/Searches.cs
View File

@ -15,7 +15,7 @@ namespace NadekoBot.Modules {
internal class Searches : DiscordModule { internal class Searches : DiscordModule {
private readonly Random rng; private readonly Random rng;
public Searches() { public Searches() {
commands.Add(new LoLCommands()); commands.Add(new LoLCommands(this));
rng = new Random(); rng = new Random();
} }