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

moved questions back to a folder, for customization

Browse Source
This commit is contained in:
Master Kwoth 2016-01-28 10:37:00 +01:00
parent 6b1a203b68
commit fbc36c094e
7 changed files with 2 additions and 22806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NadekoBot/Classes/Trivia.cs
View File

@ -376,7 +376,7 @@ namespace NadekoBot
internal void Reload() {
_r = new Random();
pool = new List<TriviaQuestion>();
JArray arr = JArray.Parse(Properties.Resources.questions);
JArray arr = JArray.Parse(File.ReadAllText("data/questions.txt"));
foreach (var item in arr) {
TriviaQuestion tq;

2
NadekoBot/NadekoBot.cs
View File

@ -23,7 +23,7 @@ namespace NadekoBot {
public static string password;
public static string TrelloAppKey;
public static bool ForwardMessages = false;
public static string BotVersion = "0.7-beta5";
public static string BotVersion = "0.8-beta1";
public static int commandsRan = 0;
static void Main() {

3
NadekoBot/NadekoBot.csproj
View File

@ -421,9 +421,6 @@
<ItemGroup>
<None Include="resources\images\cards\2_of_clubs.jpg" />
</ItemGroup>
<ItemGroup>
<None Include="resources\other_data\questions.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

19
NadekoBot/Properties/Resources.Designer.cs generated
View File

@ -720,25 +720,6 @@ namespace NadekoBot.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to [
/// {
/// &quot;Question&quot;: &quot;7x was used to refer to the secret ingredient of what drink&quot;,
/// &quot;Answer&quot;: &quot;coca cola&quot;
/// },
/// {
/// &quot;Question&quot;: &quot;And the big wheel keep on turning neon burning up above and I&apos;m just high on the world come on and take the low ride with me girl on the..... What&apos;s the Dire Straits song title?&quot;,
/// &quot;Answer&quot;: &quot;tunnel of love&quot;
/// },
/// {
/// &quot;Question&quot;: &quot;Beverly Hills Cop, when Axel Foley enters the hotel, he uses an alias. Who does he say he works for, and who does he say he&apos;s go [rest of string was truncated]&quot;;.
/// </summary>
public static string questions {
get {
return ResourceManager.GetString("questions", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
NadekoBot/Properties/Resources.resx
View File

@ -325,7 +325,4 @@
<data name="_9_of_spades" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\images\cards\9_of_spades.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="questions" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\other_data\questions.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
</root>

22778
NadekoBot/resources/other_data/questions.txt
View File

File diff suppressed because it is too large Load Diff

1
README.md
View File

@ -154,7 +154,6 @@ Command and aliases | Description | Usage
`!m q`, `!m yq` | Queue a song using keywords or link. **You must be in a voice channel**. | `!m q Dream Of Venice`
`!m np`, `!m playing` | Shows what song is playing.
`!m lq`, `!m ls`, `!m lp` | Lists up to 10 currently queued songs.
`!m clrbfr`, `!m clearbuffers` | Clears the music buffer across all servers. **Owner only.**
`!m sh` | Shuffles the current playlist.
### Searches