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

Fix labeling of placement flag/work conditionals

Browse Source
This commit is contained in:
Kurt 2025-01-29 01:09:48 -06:00
parent a3f53c3a63
commit 38a9c45fef
4 changed files with 67 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkNX.Structures.FlatBuffers.Arceus/Arceus/Condition/ConditionUtil.cs
View File

@ -4,8 +4,7 @@ public static class ConditionUtil
{
public static string GetConditionTypeSummary(this IHasCondition cond)
{
// todo lookup
return $"{cond.ConditionTypeID}";
return ConditionType.ReverseHash(cond.ConditionTypeID);
}
public static string GetConditionArgsSummary(this IHasCondition cond)
@ -25,7 +24,7 @@ public static string GetConditionArgsSummary(this IHasCondition cond)
public static string GetConditionSummary(this IHasCondition cond)
{
// todo lookup
return $"{cond.ConditionID}({GetConditionArgsSummary(cond)})";
var condition = Condition.ReverseHash(cond.ConditionID);
return $"{condition}({GetConditionArgsSummary(cond)})";
}
}

64
pkNX.Structures.FlatBuffers.Arceus/Arceus/Util/EncounterTableUtil.cs
View File

@ -482,6 +482,19 @@ public static class Condition
public const ulong Equal = 0xB763CBE88B6F844F;
public const ulong None = 0xCBF29CE484222645;
public const ulong Between = 0xE5E34D77DC75E2EF;
public static string ReverseHash(ulong hash) => hash switch
{
GreaterThanEqual => nameof(GreaterThanEqual),
LessThanEqual => nameof(LessThanEqual),
NotEqual => nameof(NotEqual),
Equal => nameof(Equal),
None => nameof(None),
Between => nameof(Between),
Empty => nameof(Empty),
_ => $"0x{hash:X16}",
};
}
public static class ConditionType
@ -531,4 +544,55 @@ public static class ConditionType
public const ulong WorkCondition = 0x2557279B949C81D6; // "work_condition"
public const ulong ZukanResearchCondition = 0x854B2B1FDB9AC9B4; // "zukan_research_condition"
public const ulong ZukanStageCondition = 0x9A193E701C7F9A61; // "zukan_stage_condition"
public static string ReverseHash(ulong hash) => hash switch
{
Empty => nameof(Empty),
None => nameof(None),
BattleWin => nameof(BattleWin),
EventEndFlagComparison => nameof(EventEndFlagComparison),
FlagComparison => nameof(FlagComparison),
FlagComparisonMultiAnd => nameof(FlagComparisonMultiAnd),
FlagComparisonMultiOr => nameof(FlagComparisonMultiOr),
Force => nameof(Force),
IsRide => nameof(IsRide),
ItemNum => nameof(ItemNum),
MkrgCondition => nameof(MkrgCondition),
MoonType => nameof(MoonType),
MydressupParts => nameof(MydressupParts),
NpcPassPokeForm => nameof(NpcPassPokeForm),
NpcPassPokeIndividualNum => nameof(NpcPassPokeIndividualNum),
NpcPassPokeMonsNum => nameof(NpcPassPokeMonsNum),
NpcPassPokeOybn => nameof(NpcPassPokeOybn),
NpcPassPokeSeikaku => nameof(NpcPassPokeSeikaku),
NpcPassPokeSex => nameof(NpcPassPokeSex),
NpcPassPokeSizeAbsolute => nameof(NpcPassPokeSizeAbsolute),
NpcPassPokeSizeIndividual => nameof(NpcPassPokeSizeIndividual),
NpcPassPokeType => nameof(NpcPassPokeType),
NpcPassPokeWaza => nameof(NpcPassPokeWaza),
PartyMonsNoNum => nameof(PartyMonsNoNum),
PartyPokeNum => nameof(PartyPokeNum),
PhaseCondition => nameof(PhaseCondition),
PlayerSex => nameof(PlayerSex),
PokeGetNum => nameof(PokeGetNum),
PokeGetSelf => nameof(PokeGetSelf),
PokeResearchComplete => nameof(PokeResearchComplete),
PokeTotalNum => nameof(PokeTotalNum),
Probability => nameof(Probability),
ProgressWorkCondition => nameof(ProgressWorkCondition),
ProgressWorkConditionHash => nameof(ProgressWorkConditionHash),
ProgressResidentWorkCondition => nameof(ProgressResidentWorkCondition),
ProgressResidentWorkConditionHash => nameof(ProgressResidentWorkConditionHash),
QuestProgressCondition => nameof(QuestProgressCondition),
QuestTaskClearCheck => nameof(QuestTaskClearCheck),
ThrowItemCondition => nameof(ThrowItemCondition),
TimeZone => nameof(TimeZone),
TimeZoneAfternoon => nameof(TimeZoneAfternoon),
TimeZoneNight => nameof(TimeZoneNight),
WorkCondition => nameof(WorkCondition),
ZukanResearchCondition => nameof(ZukanResearchCondition),
ZukanStageCondition => nameof(ZukanStageCondition),
_ => $"0x{hash:X16}",
};
}

1
pkNX.Structures/Legality/Tables/Tables9.cs
View File

@ -2,7 +2,6 @@ namespace pkNX.Structures;
public static partial class Legal
{
// todo sv
public const int MaxSpeciesID_9 = 1025;
public const int MaxMoveID_9 = (int)Move.MalignantChain;
public const int MaxItemID_9 = 2557; // Briar's Book

1
pkNX.WinForms/Subforms/MapViewer8a.cs
View File

@ -3,7 +3,6 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using FlatSharp;
using pkNX.Containers;
using pkNX.Game;
using pkNX.Structures;