diff --git a/src/NadekoBot/Common/ImageUrls.cs b/src/NadekoBot/Common/ImageUrls.cs index f10f2acaf..694d5207e 100644 --- a/src/NadekoBot/Common/ImageUrls.cs +++ b/src/NadekoBot/Common/ImageUrls.cs @@ -6,7 +6,7 @@ namespace NadekoBot.Common public class ImageUrls { [Comment("DO NOT CHANGE")] - public int Version { get; set; } = 2; + public int Version { get; set; } = 3; public CoinData Coins { get; set; } public Uri[] Currency { get; set; } @@ -27,7 +27,6 @@ namespace NadekoBot.Common public class SlotData { public Uri[] Emojis { get; set; } - public Uri[] Numbers { get; set; } public Uri Bg { get; set; } } diff --git a/src/NadekoBot/Services/IImageCache.cs b/src/NadekoBot/Services/IImageCache.cs index e19df5264..8b63cc151 100644 --- a/src/NadekoBot/Services/IImageCache.cs +++ b/src/NadekoBot/Services/IImageCache.cs @@ -14,7 +14,6 @@ namespace NadekoBot.Services IReadOnlyList Dice { get; } IReadOnlyList SlotEmojis { get; } - IReadOnlyList SlotNumbers { get; } IReadOnlyList Currency { get; } byte[] SlotBackground { get; } diff --git a/src/NadekoBot/Services/Impl/RedisImagesCache.cs b/src/NadekoBot/Services/Impl/RedisImagesCache.cs index d53037bda..946b2424c 100644 --- a/src/NadekoBot/Services/Impl/RedisImagesCache.cs +++ b/src/NadekoBot/Services/Impl/RedisImagesCache.cs @@ -36,7 +36,6 @@ namespace NadekoBot.Services Dice, SlotBg, SlotEmojis, - SlotNumbers, Currency, RategirlMatrix, RategirlDot, @@ -57,9 +56,6 @@ namespace NadekoBot.Services public IReadOnlyList SlotEmojis => GetByteArrayData(ImageKeys.SlotEmojis); - public IReadOnlyList SlotNumbers - => GetByteArrayData(ImageKeys.SlotNumbers); - public IReadOnlyList Currency => GetByteArrayData(ImageKeys.Currency); @@ -157,20 +153,7 @@ namespace NadekoBot.Services "https://cdn.nadeko.bot/slots/3.png", "https://cdn.nadeko.bot/slots/4.png", "https://cdn.nadeko.bot/slots/5.png" - }.Map(x => new Uri(x)), - Numbers = new[] - { - "https://cdn.nadeko.bot/other/slots/numbers/0.png", - "https://cdn.nadeko.bot/other/slots/numbers/1.png", - "https://cdn.nadeko.bot/other/slots/numbers/2.png", - "https://cdn.nadeko.bot/other/slots/numbers/3.png", - "https://cdn.nadeko.bot/other/slots/numbers/4.png", - "https://cdn.nadeko.bot/other/slots/numbers/5.png", - "https://cdn.nadeko.bot/other/slots/numbers/6.png", - "https://cdn.nadeko.bot/other/slots/numbers/7.png", - "https://cdn.nadeko.bot/other/slots/numbers/8.png", - "https://cdn.nadeko.bot/other/slots/numbers/9.png" - }.Map(x => new Uri(x)), + }.Map(x => new Uri(x)) }, Xp = new ImageUrls.XpData() { @@ -183,6 +166,14 @@ namespace NadekoBot.Services File.WriteAllText(_imagesPath, Yaml.Serializer.Serialize(newData)); } } + + // removed numbers from slots + var localImageUrls = Yaml.Deserializer.Deserialize(File.ReadAllText(_imagesPath)); + if (localImageUrls.Version == 2) + { + localImageUrls.Version = 3; + File.WriteAllText(_imagesPath, Yaml.Serializer.Serialize(localImageUrls)); + } } public async Task Reload() @@ -207,9 +198,6 @@ namespace NadekoBot.Services case ImageKeys.SlotEmojis: await Load(key, ImageUrls.Slots.Emojis); break; - case ImageKeys.SlotNumbers: - await Load(key, ImageUrls.Slots.Numbers); - break; case ImageKeys.Currency: await Load(key, ImageUrls.Currency); break; diff --git a/src/NadekoBot/data/images.yml b/src/NadekoBot/data/images.yml index fd2b33150..b277d8718 100644 --- a/src/NadekoBot/data/images.yml +++ b/src/NadekoBot/data/images.yml @@ -1,5 +1,5 @@ # DO NOT CHANGE -version: 2 +version: 3 coins: heads: - https://cdn.nadeko.bot/coins/heads3.png @@ -36,15 +36,4 @@ slots: - https://cdn.nadeko.bot/slots/3.png - https://cdn.nadeko.bot/slots/4.png - https://cdn.nadeko.bot/slots/5.png - numbers: - - https://cdn.nadeko.bot/other/slots/numbers/0.png - - https://cdn.nadeko.bot/other/slots/numbers/1.png - - https://cdn.nadeko.bot/other/slots/numbers/2.png - - https://cdn.nadeko.bot/other/slots/numbers/3.png - - https://cdn.nadeko.bot/other/slots/numbers/4.png - - https://cdn.nadeko.bot/other/slots/numbers/5.png - - https://cdn.nadeko.bot/other/slots/numbers/6.png - - https://cdn.nadeko.bot/other/slots/numbers/7.png - - https://cdn.nadeko.bot/other/slots/numbers/8.png - - https://cdn.nadeko.bot/other/slots/numbers/9.png bg: https://cdn.nadeko.bot/slots/slots_bg.png