From b6c1910fe352193be6f17deec4881d8ba88c30b3 Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Thu, 14 Jan 2021 12:27:01 -0500 Subject: [PATCH] Update static/gift exports, update encounter scenario enums One of them is used for several Legendaries + Keldeo, not exclusively the dogs. Also use better names. --- .../Encounter/Gen8/FlatGift/GiftEncounter8.cs | 2 +- .../Gen8/FlatStatic/EncounterStatic8.cs | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs b/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs index ba9d7352..835a2da8 100644 --- a/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs +++ b/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs @@ -118,7 +118,7 @@ public string GetSummary(IReadOnlyList species) var ball = Ball == Ball.Poke ? string.Empty : $", Ball = {(int)Ball}"; return - $" new EncounterStatic8 {{ Gift = true, Species = {(int)Species:000}, Level = {Level:00}, Location = -01{ivs}{shiny}{gender}{ability}{nature}{altform}{giga}{dyna}{ball} }},{comment}"; + $" new(SWSH) {{ Gift = true, Species = {(int)Species:000}, Level = {Level:00}, Location = -01{ivs}{shiny}{gender}{ability}{nature}{altform}{giga}{dyna}{ball} }},{comment}"; } } } \ No newline at end of file diff --git a/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs b/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs index 5140751a..83516191 100644 --- a/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs +++ b/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs @@ -72,26 +72,26 @@ public int[] Moves // scenarios that are set for specific story encounters, most don't work on encounters that are not meant to have them public enum Scenario { - None = 0, - Zacian_Zamazenta_1 = 1, - _2 = 2, - _3 = 3, - Eternatus_1 = 4, - Eternatus_2 = 5, - Eternatus_3 = 6, - Zacian_Zamazenta_2 = 7, - Motostoke_Gym_Challenge = 8, - Max_Raid_Battle_1 = 9, - Max_Raid_Battle_2 = 10, - Max_Raid_Battle_3 = 11, - Max_Raid_Battle_4 = 12, - Zacian_Zamazenta_3 = 13, - Fast_Slowpoke = 14, - Regigigas_Raid_Battle = 15, - Special_Raid_Battle = 16, - Calyrex = 17, - Glastrier_Spectrier = 18, - Calyrex_Fusion = 19, + None, + Legendary_Pokémon, + _2, + _3, + Eternatus, + Eternamax_Eternatus_1, + Eternamax_Eternatus_2, + Zacian_Zamazenta_Fog, + Motostoke_Gym_Challenge, + Max_Raid_Battle_1, + Max_Raid_Battle_2, + Max_Raid_Battle_3, + Max_Raid_Battle_4, + Zacian_Zamazenta_Boss, + Fast_Slowpoke, + Regigigas_Raid_Battle, + Special_Raid_Battle, + Calyrex, + Glastrier_Spectrier, + Calyrex_Fusion, } public string GetSummary(IReadOnlyList species) @@ -121,7 +121,7 @@ public string GetSummary(IReadOnlyList species) var dyna = DynamaxLevel == 0 ? string.Empty : $", DynamaxLevel = {DynamaxLevel}"; return - $" new EncounterStatic8 {{ Species = {(int)Species:000}, Level = {Level:00}, Location = -01{moves}{ivs}{shiny}{gender}{ability}{nature}{altform}{giga}{dyna} }},{comment}"; + $" new(SWSH) {{ Species = {(int)Species:000}, Level = {Level:00}, Location = -01{moves}{ivs}{shiny}{gender}{ability}{nature}{altform}{giga}{dyna} }},{comment}"; } } } \ No newline at end of file