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

- misc template -> pk tweaks (#3964)

Browse Source 
* - misc template -> pk tweaks
This commit is contained in:
santacrab2 2023-08-16 21:57:44 -04:00 committed by GitHub
parent 5637b1775d
commit 57e23cc860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Templates/Gen3/XD/EncounterTrade3XD.cs
View File

@ -69,7 +69,7 @@ public XK3 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Met_Level = Level,
Version = (byte)GameVersion.CXD,
Ball = (byte)Ball.Poke,
FatefulEncounter = FatefulEncounter,
Language = lang,
OT_Name = TrainerNames[lang],
OT_Gender = 0,

2
PKHeX.Core/Legality/Encounters/Templates/Gen6/EncounterStatic6.cs
View File

@ -61,7 +61,7 @@ public PK6 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Met_Level = LevelMin,
MetDate = EncounterDate.GetDate3DS(),
Ball = (byte)(FixedBall is Ball.None ? Ball.Poke : FixedBall),
FatefulEncounter = FatefulEncounter,
ID32 = tr.ID32,
Version = (byte)version,
Language = lang,

5
PKHeX.Core/Legality/Encounters/Templates/Gen8/EncounterTrade8.cs
View File

@ -134,6 +134,9 @@ public PK8 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
EncounterUtil1.SetEncounterMoves(pk, version, Level);
SetPINGA(pk, criteria);
if (IVs.IsSpecified)
criteria.SetRandomIVs(pk, IVs);
pk.ResetPartyStats();
return pk;
@ -165,7 +168,7 @@ public bool IsMatchExact(PKM pk, EvoCriteria evo)
return false;
if (IVs.IsSpecified)
{
if (!Legal.GetIsFixedIVSequenceValidSkipRand(IVs, pk))
if (!Legal.GetIsFixedIVSequenceValidNoRand(IVs, pk))
return false;
}
if (!IsMatchNatureGenderShiny(pk))

3
PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterDist9.cs
View File

@ -255,6 +255,9 @@ public PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
Obedience_Level = LevelMin,
OT_Name = tr.OT,
OT_Gender = tr.Gender,
ID32 = tr.ID32,
};
SetPINGA(pk, criteria);
pk.SetMoves(Moves);

9
PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterFixed9.cs
View File

@ -93,6 +93,9 @@ public PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
Obedience_Level = LevelMin,
OT_Name = tr.OT,
OT_Gender = tr.Gender,
ID32 = tr.ID32,
};
var type = Tera9RNG.GetTeraType(Util.Rand.Rand64(), TeraType, Species, Form);
@ -105,7 +108,10 @@ public PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
pk.Scale = TeraType != 0 ? (byte)(MinScaleStrongTera + Util.Rand.Next(byte.MaxValue - MinScaleStrongTera + 1)) : PokeSizeUtil.GetRandomScalar();
SetPINGA(pk, criteria);
pk.SetMoves(Moves);
if (Moves.HasMoves)
pk.SetMoves(Moves);
else
EncounterUtil1.SetEncounterMoves(pk, Version, Level);
pk.ResetPartyStats();
return pk;
@ -116,6 +122,7 @@ private void SetPINGA(PK9 pk, EncounterCriteria criteria)
pk.PID = Util.Rand32();
pk.EncryptionConstant = Util.Rand32();
pk.Nature = (int)criteria.GetNature(Nature.Random);
pk.StatNature = pk.Nature;
pk.Gender = criteria.GetGender(-1, PersonalTable.SV.GetFormEntry(Species, Form));
pk.RefreshAbility(criteria.GetAbilityFromNumber(Ability));

3
PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterMight9.cs
View File

@ -263,6 +263,9 @@ public PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
Obedience_Level = LevelMin,
RibbonMarkMightiest = true,
OT_Name = tr.OT,
OT_Gender = tr.Gender,
ID32 = tr.ID32,
};
SetPINGA(pk, criteria);
pk.SetMoves(Moves);

3
PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterStatic9.cs
View File

@ -66,6 +66,9 @@ public PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
Obedience_Level = LevelMin,
OT_Name = tr.OT,
OT_Gender = tr.Gender,
ID32 = tr.ID32,
};
if (Gift && !ScriptedYungoos)

3
PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTera9.cs
View File

@ -136,6 +136,9 @@ public PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
Obedience_Level = LevelMin,
OT_Name = tr.OT,
OT_Gender = tr.Gender,
ID32 = tr.ID32,
};
SetPINGA(pk, criteria);
pk.SetMoves(Moves);