Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions SysBot.Pokemon.Discord/Helpers/EtumrepDump/PermuteUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,33 @@ private static void InitializeSlots()
new(100, "Rufflet", false, [55, 58], 0),
new( 1, "Rufflet", true, [70, 73], 3),
],
// Fieldlands: No number: spawner close to the crescent-moon shaped lake in the North-East, right above the Alpha Floatzel; Not Night; Any weather (2-2)
[
new(100, "Buizel", false, [2, 4], 0),
new( 2, "Buizel", true, [17, 19], 3),
],
// Coastlands: No number: spawner in the water just south of the Molten Arena; Night; Sunny, Cloudy, Drought, Fog (3-3)
[
new(100, "Tentacool", false, [24, 29], 0),
new( 2, "Tentacool", true, [39, 44], 3),
new( 60, "Tentacruel", false, [31, 34], 0),
new( 1, "Tentacruel", true, [46, 49], 3),
new(100, "Drifloon", false, [24, 27], 0),
new( 2, "Drifloon", true, [39, 42], 3),
new( 60, "Drifblim", false, [31, 34], 0),
new( 1, "Drifblim", true, [46, 49], 3),
],
// Icelands: 81AB7DC29C2E5AB3; Night; Sunny, Cloudy (2-2)
[
new(100, "Swinub", false, [29, 32], 0),
new( 2, "Swinub", true, [44, 47], 3),
new( 50, "Piloswine", false, [47, 50], 0),
new( 1, "Piloswine", true, [62, 65], 3),
new( 20, "Duskull", false, [33, 36], 0),
new( 2, "Duskull", true, [48, 51], 3),
new(100, "Dusclops", false, [47, 50], 0),
new( 1, "Dusclops", true, [62, 65], 3),
],
];

for (int s = 0; s < FakeSlots.Length; s++)
Expand Down Expand Up @@ -406,7 +433,7 @@ private static async Task DoPermutationsAsync(SocketModal modal, UserEnteredSpaw
{
var spawnerInput = int.Parse(modal.Data.CustomId.Split(';')[2]);
var key = SpawnGenerator.EncounterTables.FirstOrDefault(x => x.Value == FakeSlots[spawnerInput]).Key;
int count = spawnerInput is (2 or 12 or 13) ? 3 : 2;
int count = spawnerInput is (2 or 12 or 13 or 24) ? 3 : 2;
var details = new SpawnCount(count, count);
var set = new SpawnSet(key, count);
var spawner = SpawnInfo.GetLoop(details, set, SpawnType.Regular);
Expand Down Expand Up @@ -578,7 +605,10 @@ private static async Task ModalEmbedFollowupAsync(SocketModal modal, string desc
new SelectMenuOptionBuilder("Swinub/Piloswine", "19", "All shiny Swinub/Piloswine paths"),
new SelectMenuOptionBuilder("Paras/Parasect", "20", "All shiny Paras/Parasect paths"),
new SelectMenuOptionBuilder("Paras/Parasect/Zubat/Golbat", "21", "All shiny Paras/Parasect/Zubat/Golbat paths"),
new SelectMenuOptionBuilder("Rufflet", "22", "All shiny Rufflet paths")
new SelectMenuOptionBuilder("Rufflet", "22", "All shiny Rufflet paths"),
new SelectMenuOptionBuilder("Buizel", "23", "All shiny Buizel paths"),
new SelectMenuOptionBuilder("Tentacool/Tentacruel/Drifloon/Drifblim", "24", "All shiny Tentacool/Tentacruel/Drifloon/Drifblim paths"),
new SelectMenuOptionBuilder("Swinub/Piloswine/Duskull/Dusclops", "25", "All shiny Swinub/Piloswine/Duskull/Dusclops paths")
]
};
}
6 changes: 6 additions & 0 deletions SysBot.Pokemon/LA/BotTrade/PokeTradeBotLA.cs
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,7 @@ private async Task<PokeTradeResult> ProcessEtumrepTradeAsync(PokeTradeDetail<PA8

ushort[] multiExceptions =
[
// Original multispawner species
(ushort)Species.Bidoof, (ushort)Species.Eevee,
(ushort)Species.Combee,
(ushort)Species.Qwilfish,
Expand All @@ -798,6 +799,11 @@ private async Task<PokeTradeResult> ProcessEtumrepTradeAsync(PokeTradeDetail<PA8
(ushort)Species.Swinub, (ushort)Species.Piloswine,
(ushort)Species.Paras, (ushort)Species.Parasect, (ushort)Species.Zubat, (ushort)Species.Golbat,
(ushort)Species.Rufflet,

// Additional multispawner species (as added multispawners)
(ushort)Species.Buizel,
(ushort)Species.Tentacool, (ushort)Species.Tentacruel, (ushort)Species.Drifloon, (ushort)Species.Drifblim,
(ushort)Species.Duskull, (ushort)Species.Dusclops,
];

bool isMulti = multiExceptions.Intersect(dumps.Select(x => x.Species)).ToArray().Length >= 1 && dumps.All(x => multiExceptions.Contains(x.Species));
Expand Down