Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-05-09 04:31:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compress wild slots pickle

Browse Source 
Order areas for negligibly faster search
This commit is contained in:
Kurt 2022-02-27 15:09:30 -08:00
parent d897e79e0f
commit 4cde037a60
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkNX.Structures.FlatBuffers/Arceus/Util/EncounterTable8aUtil.cs
View File

@ -56,7 +56,7 @@ public static class EncounterTable8aUtil
var s = area.Spawners;
var spawners = s.Where(z => nhoLottery.IsAreaGroup(z, nhoGroup, table.TableID));
var sl = spawners.SelectMany(z => z.GetIntersectingLocations(area.Locations, SpawnerBias));
foreach (var a in GetAll(sl, SpawnerType.Spawner))
foreach (var a in GetAll(sl, SpawnerType.SpawnerNHO))
yield return a;
}
@ -97,14 +97,11 @@ IEnumerable<byte[]> GetAll(IEnumerable<PlacementLocation8a> places, SpawnerType
yield break;
if (areas.Remove(baseArea) && areas.Count == 0)
areas.Add(baseArea);
else if (!areas.All(IsDungeonZone) && !areas.Contains(baseArea))
areas.Add(baseArea);
foreach (var a in areas)
{
var parent = baseArea;
if (IsDungeonZone(a))
parent = a; // disallow crossover-out for dungeons
yield return GetArea(a, parent, slots, table.MinLevel, table.MaxLevel, type, misc, bmin, bmax);
}
areas.Sort();
yield return GetArea(areas, slots, table.MinLevel, table.MaxLevel, type, misc, bmin, bmax);
}
}
@ -115,7 +112,7 @@ IEnumerable<byte[]> GetAll(IEnumerable<PlacementLocation8a> places, SpawnerType
private static readonly int[] OybnSettings = { 15, 15, 15, 20, 20 };
private static byte[] GetArea(int location, int parentArea, IReadOnlyCollection<EncounterSlot8a> slots,
private static byte[] GetArea(IReadOnlyList<int> locations, IReadOnlyCollection<EncounterSlot8a> slots,
int tableMinLevel, int tableMaxLevel, SpawnerType type,
PokeMiscTable8a misc,
int bonusMin = 0,
@ -123,8 +120,12 @@ IEnumerable<byte[]> GetAll(IEnumerable<PlacementLocation8a> places, SpawnerType
{
using var ms = new MemoryStream();
using var bw = new BinaryWriter(ms);
bw.Write((byte)location);
bw.Write((byte)parentArea);
bw.Write((byte)locations.Count);
foreach (var loc in locations)
bw.Write((byte)loc);
if (bw.BaseStream.Position % 2 != 0)
bw.Write((byte)0);
bw.Write((byte)type);
bw.Write((byte)slots.Count);
foreach (var s in slots)

1
pkNX.Structures.FlatBuffers/Arceus/Util/SpawnerType.cs
View File

@ -5,5 +5,6 @@ public enum SpawnerType
Spawner,
Wormhole,
Landmark,
SpawnerNHO,
Unown,
}