From 5c32062b2ffecac1898fcf535671c6fdc42b1122 Mon Sep 17 00:00:00 2001 From: Jordan Fearnley Date: Fri, 11 Nov 2016 00:54:53 +0000 Subject: [PATCH] =?UTF-8?q?Various=20changes=20=C2=AF\=5F(=E3=83=84)=5F/?= =?UTF-8?q?=C2=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary of Changes: - Betroll won't give you the greater than 90 bonus for rolling 90 anymore - Send usage updated for clarity - I missed some stuff when the `config.json` stopped having "null" everywhere, this fixes it, *I think.* - more whitespacing in the linux guide for people like Kwoth who want to just be able to copy paste commands - I'm kinda just guessing this'll work so if it doesn't then, "woopsie" --- docs/guides/Linux Guide.md | 26 +++++++++++++-------- docs/guides/OSX Guide.md | 4 ++-- docs/guides/Windows Guide.md | 2 +- src/NadekoBot/Modules/Gambling/Gambling.cs | 2 +- src/NadekoBot/Resources/CommandStrings.resx | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 03b6fff9..50e18691 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -33,7 +33,7 @@ Make sure that you're on the correct page for your distribution of linux as the We'll go over the steps here for Ubuntu 16.04 anyway (these will **only** work on Ubuntu 16.04), accurate as of 16/10/2016 -**2)** +**2)** ``` sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list' @@ -43,11 +43,11 @@ sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2-003131 -y ``` ####Installing Opus Voice Codec and libsodium -**3)** +**3)** `sudo apt-get install libopus0 opus-tools libopus-dev libsodium-dev -y` ####FFMPEG -**4)** +**4)** `apt-get install ffmpeg -y` NOTE: if its "not installing" then, follow the guide here: [FFMPEG Help Guide](http://www.faqforge.com/linux/how-to-install-ffmpeg-on-ubuntu-14-04/) @@ -79,18 +79,24 @@ sudo apt-get update && sudo apt-get install ffmpeg -y` ####Getting NadekoBot **6)** -- `cd ~` -- `curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh` +``` +cd ~ +curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh +``` **If you do not get any errors using the above steps move to the next section, Setting up NadekoBot otherwise, if you get errors follow step 6.1** **6.1)** -- `cd ~ && git clone -b 1.0 --recursive --depth 1 https://github.com/Kwoth/NadekoBot.git` -- `cd ~/NadekoBot/discord.net/src/Discord.Net && dotnet restore && cd ../Discord.Net.Commands && dotnet restore && cd ../../../src/NadekoBot/ && dotnet restore && dotnet build --configuration Release` +``` +cd ~ && git clone -b 1.0 --recursive --depth 1 https://github.com/Kwoth/NadekoBot.git +cd ~/NadekoBot/discord.net/src/Discord.Net && dotnet restore && cd ../Discord.Net.Commands && dotnet restore && cd ../../../src/NadekoBot/ && dotnet restore && dotnet build --configuration Release` +``` -**If you still get some errors using the above steps, follow step 6.2** +**If you still get some errors using the above steps, follow step 6.2** **6.2)** -- `cd ~/NadekoBot/discord.net && dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json && dotnet restore` -- `cd ~/NadekoBot/src/NadekoBot/ && dotnet restore && dotnet build --configuration Release` +``` +cd ~/NadekoBot/discord.net && dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json && dotnet restore +cd ~/NadekoBot/src/NadekoBot/ && dotnet restore && dotnet build --configuration Release +``` ####Setting up NadekoBot diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index 2433e32c..a0dc6240 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -74,8 +74,8 @@ A dialog box will open asking if you want to install `xcode-select`. Select inst - If you mess up the setup of `credentials.json`, rename `credentials_example.json` to `credentials.json`. - Open the file with your Text editor. - In your [applications page][DiscordApp] (the window you were asked to keep open earlier), under the `Bot User` section, you will see `Token:click to reveal`, click to reveal the token. -- Copy your bot's token, and on the `"Token"` line of your `credentials.json`, replace `null` with your bot token and put quotation marks before and after the token, like so `"Example.Token"` -- Copy the `Client ID` on the page and replace the null part of the `ClientId` line with it, and put quotation marks before and after, like earlier. +- Copy your bot's token, and on the `"Token"` line of your `credentials.json`, paste your bot token inbetween the quotation marks before and after the token, like so `"Example.Token"` +- Copy the `Client ID` on the page and replace the `123123123` part of the `ClientId` line with it, and put quotation marks before and after, like earlier. - Again, copy the same `Client ID` and replace the null part of the `BotId` line with it, and do **not** put quotation marks before and after the ID. - Go to a server on discord and attempt to mention yourself, but put a backslash at the start as shown below - So the message `\@fearnlj01#3535` will appears as `<@145521851676884992>` after you send the message (to make it slightly easier, add the backslash after you type the mention out) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index fe82ef07..fdff6ea4 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -80,7 +80,7 @@ ________________________________________________________________________________ - On the left tab, access `Credentials`. Click `Create Credentials` button. Click on `API Key`. A new window will appear with your `Google API key`. - Copy the key. - Open up `credentials.json`. - - For `"GoogleAPIKey"`, replace `null` with the new key we copied and put quotation marks before and after the API key, like how the `Token` and `ClientId` should be set up. + - For `"GoogleAPIKey"`, paste your API key inbetween the quotation marks, like how the `Token` and `ClientId` should be set up. - Follow these steps on how to setup Soundcloud API key: - Go to [Soundcloud][Soundcloud]. - Enter a name for the app and create it. diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index 7107ea41..7a7425fb 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -204,7 +204,7 @@ namespace NadekoBot.Modules.Gambling { str += "More luck next time."; } - else if (rng < 90) + else if (rng < 91) { str += $"Congratulations! You won {amount * 2}{Gambling.CurrencySign} for rolling above 66"; await CurrencyHandler.AddCurrencyAsync(guildUser, "Betroll Gamble", amount * 2, false).ConfigureAwait(false); diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 1545142b..a390b9d3 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -718,7 +718,7 @@ Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. - `{0}send serverid|c:channelid` or `{0}send serverid|u:userid` + `{0}send serverid|c:channelid message` or `{0}send serverid|u:userid message` mentionrole menro