Leahnaya/HexManiacAdvance
1
0
Fork 0
mirror of https://github.com/haven1433/HexManiacAdvance.git synced 2026-05-20 12:18:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: trainer teams should repoint when you change the number of pokemon in the team

Browse Source
This commit is contained in:
Benjamin Popp 2021-06-11 21:25:55 -05:00
parent 53a6ff6f67
commit 2c839ee2d3
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/HexManiac.Core/Models/Runs/TrainerPokemonTeamRun.cs
View File

@ -479,7 +479,10 @@ namespace HavenSoft.HexManiac.Core.Models.Runs {
public TrainerPokemonTeamRun UpdateFromParent(ModelDelta token, int parentSegmentChange, int pointerSource) {
// we only care if the change was to the parent's structType or pokemonCount.
if (parentSegmentChange != 0 && parentSegmentChange != 11) return this;
var sourceTable = model.GetNextRun(pointerSource) as ITableRun;
if (sourceTable == null) return this;
if (sourceTable.ElementContent.Count <= parentSegmentChange) return this;
if (parentSegmentChange != 0 && sourceTable.ElementContent[parentSegmentChange].Name != "pokemonCount") return this;
var newStructType = model[pointerSource - TrainerFormat_PointerOffset];
var newElementCount = model[pointerSource - TrainerFormat_PointerOffset + TrainerFormat_PokemonCountOffset];

43
src/HexManiac.Tests/TrainerTeamTests.cs
View File

@ -1,6 +1,7 @@
using HavenSoft.HexManiac.Core;
using HavenSoft.HexManiac.Core.Models;
using HavenSoft.HexManiac.Core.Models.Runs;
using HavenSoft.HexManiac.Core.ViewModels.Tools;
using System.Linq;
using Xunit;
@ -83,9 +84,49 @@ namespace HavenSoft.HexManiac.Tests {
Assert.InRange(newRun.ReadValue(Model, 0, "ivSpread"), 12 * 8, 12 * 8 + 7);
}
[Fact]
public void TrainerWithTwoPokemon_ChangePokemonCountToThree_PokemonTeamRepoints() {
// write data for two trainers
Model[TrainerTablePokemonCountOffset] = 2;
Model.WritePointer(new ModelDelta(), TrainerTablePokemonPointerOffset, 0x80);
WriteBasicTrainerPokmeon(0x80, 0, 5, 0);
WriteBasicTrainerPokmeon(0x88, 0, 5, 0);
Model[TrainerTableElementLength + TrainerTablePokemonCountOffset] = 2;
Model.WritePointer(new ModelDelta(), TrainerTableElementLength + TrainerTablePokemonPointerOffset, 0x88);
WriteBasicTrainerPokmeon(0x90, 0, 5, 0);
WriteBasicTrainerPokmeon(0x98, 0, 5, 0);
SetupTrainerTable(0, 2);
// set the trainer to have 3 pokemon
ViewPort.Refresh();
var tool = (FieldArrayElementViewModel)ViewPort.Tools.TableTool.Children.Single(child => child is FieldArrayElementViewModel faevm && faevm.Name == "pokemonCount");
tool.Content = "3";
Assert.Single(Messages);
Assert.NotEqual(0x80, Model.GetNextRun(0x80).Start); // run should've repointed
Assert.NotEqual(0x80, Model.ReadPointer(TrainerTablePokemonPointerOffset));
}
/// <summary>
/// Basic trainer pokemon are 8 bytes
/// </summary>
private void WriteBasicTrainerPokmeon(int address, int ivs, int level, int species) {
var token = new ModelDelta();
Model.WriteMultiByteValue(address + 0, 2, token, ivs);
Model.WriteMultiByteValue(address + 2, 2, token, level);
Model.WriteMultiByteValue(address + 4, 2, token, species);
Model.WriteMultiByteValue(address + 6, 2, token, 0);
}
const int TrainerTablePokemonCountOffset = 32;
const int TrainerTablePokemonPointerOffset = 36;
const int TrainerTableElementLength = 40;
private ITableRun SetupTrainerTable(int address, int elementCount) {
ViewPort.Goto.Execute(address);
ViewPort.Edit($"^trainertable[structType. class. stuff: name\"\"12 items:: items:: doubleBattle:: ai:: pokemonCount:: pokemon<>]{elementCount} ");
// 40 bytes per trainer
// 4 16 20 24 28 32 36
ViewPort.Edit($"^trainertable[structType. class. stuff: name\"\"12 items:: items:: doubleBattle:: ai:: pokemonCount:: pokemon<`tpt`>]{elementCount} ");
return Model.GetTable("trainertable");
}
}