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

map tabs of the same model should share the same EventTemplate object.

Browse Source 
This will allow all tabs, between maps, viewports, and duplicates, to track flag/var use together.
This commit is contained in:
haven1433 2023-08-12 23:03:17 -05:00
parent 9cab6d7b9a
commit dedc848ba9
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/HexManiac.Core/Models/Map/MapModel.cs
View File

@ -24,7 +24,7 @@ namespace HavenSoft.HexManiac.Core.Models.Map {
return new MapBankModel(bank, index);
}
}
public int Count => Table.Count;
public int Count => Table?.Count ?? 0;
private IEnumerable<MapBankModel> Enumerate() {
for (int i = 0; i < Count; i++) yield return this[i];

3
src/HexManiac.Core/ViewModels/Map/EventTemplate.cs
View File

@ -70,6 +70,8 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
public IPixelViewModel ObjectTemplateImage { get; private set; }
public IReadOnlyList<IPixelViewModel> OverworldGraphics { get; private set; }
public EventTemplate(IWorkDispatcher dispatcher, IDataModel model, ScriptParser parser, IReadOnlyList<IPixelViewModel> owGraphics) {
(this.model, this.parser) = (model, parser);
RefreshLists(owGraphics);
@ -95,6 +97,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
}
public void RefreshLists(IReadOnlyList<IPixelViewModel> owGraphics) {
OverworldGraphics = owGraphics;
AvailableTemplateTypes.Clear();
AvailableTemplateTypes.Add(TemplateType.None);
AvailableTemplateTypes.Add(TemplateType.Npc);

11
src/HexManiac.Core/ViewModels/Map/MapEditorViewModel.cs
View File

@ -381,15 +381,15 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
public bool IsValidState { get; private set; }
public static bool TryCreateMapEditor(IFileSystem fileSystem, IEditableViewPort viewPort, Singletons singletons, MapTutorialsViewModel tutorials, out MapEditorViewModel editor) {
public static bool TryCreateMapEditor(IFileSystem fileSystem, IEditableViewPort viewPort, Singletons singletons, MapTutorialsViewModel tutorials, EventTemplate templates, out MapEditorViewModel editor) {
editor = null;
var maps = viewPort.Model.GetTable(HardcodeTablesModel.MapBankTable);
if (maps == null) return false;
editor = new MapEditorViewModel(fileSystem, viewPort, singletons, tutorials);
editor = new MapEditorViewModel(fileSystem, viewPort, singletons, tutorials, templates);
return editor.IsValidState;
}
private MapEditorViewModel(IFileSystem fileSystem, IEditableViewPort viewPort, Singletons singletons, MapTutorialsViewModel tutorials) {
private MapEditorViewModel(IFileSystem fileSystem, IEditableViewPort viewPort, Singletons singletons, MapTutorialsViewModel tutorials, EventTemplate eventTemplate) {
(this.fileSystem, this.viewPort) = (fileSystem, viewPort);
(this.singletons, Tutorials) = (singletons, tutorials);
(model, history) = (viewPort.Model, viewPort.ChangeHistory);
@ -401,9 +401,8 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
PrimaryBlocks = PrimaryTiles;
this.format = new Format(model);
var owSprites = BlockMapViewModel.RenderOWs(model);
templates = new(singletons.WorkDispatcher, model, viewPort.Tools.CodeTool.ScriptParser, owSprites);
var map = new BlockMapViewModel(fileSystem, Tutorials, viewPort, format, templates, 3, 0) { AllOverworldSprites = owSprites };
templates = eventTemplate;
var map = new BlockMapViewModel(fileSystem, Tutorials, viewPort, format, templates, 3, 0) { AllOverworldSprites = eventTemplate.OverworldGraphics };
UpdatePrimaryMap(map);
for (int i = 0; i < 0x40; i++) CollisionOptions.Add(i.ToString("X2"));

9
src/HexManiac.Core/ViewModels/ViewPort.cs
View File

@ -814,7 +814,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
public bool CanDuplicate => true;
public IEditableViewPort CreateDuplicate() {
var child = new ViewPort(FileName, Model, dispatcher, Singletons, mapper?.Tutorials, mapper?.FileSystem, PythonTool, history);
var child = new ViewPort(FileName, Model, dispatcher, Singletons, mapper?.Tutorials, mapper?.FileSystem, PythonTool, history, mapper?.Templates);
child.selection.GotoAddress(scroll.DataIndex);
return child;
}
@ -1011,7 +1011,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
public ViewPort() : this(new LoadedFile(string.Empty, new byte[0])) { }
public ViewPort(string fileName, IDataModel model, IWorkDispatcher dispatcher, Singletons singletons = null, MapTutorialsViewModel tutorials = null, IFileSystem fs = null, PythonTool pythonTool = null, ChangeHistory<ModelDelta> changeHistory = null) {
public ViewPort(string fileName, IDataModel model, IWorkDispatcher dispatcher, Singletons singletons = null, MapTutorialsViewModel tutorials = null, IFileSystem fs = null, PythonTool pythonTool = null, ChangeHistory<ModelDelta> changeHistory = null, EventTemplate eventTemplate = null) {
Singletons = singletons ?? new Singletons();
PythonTool = pythonTool;
ownsHistory = changeHistory == null;
@ -1063,12 +1063,13 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
InitializationWorkload = model.InitializationWorkload.ContinueWith(task => {
var firstViewPort = changeHistory == null;
if (firstViewPort) {
if (eventTemplate == null) eventTemplate = new EventTemplate(singletons?.WorkDispatcher ?? InstantDispatch.Instance, Model, Tools.CodeTool.ScriptParser, BlockMapViewModel.RenderOWs(Model));
CascadeScripts();
ValidateMatchedWords();
}
dispatcher.DispatchWork(RefreshBackingData); // this work must be done on the UI thread
if (fs != null) {
if (MapEditorViewModel.TryCreateMapEditor(fs, this, singletons, tutorials, out mapper)) {
if (MapEditorViewModel.TryCreateMapEditor(fs, this, singletons, tutorials, eventTemplate, out mapper)) {
Tools.CodeTool.Investigator = mapper.Templates;
} else {
mapper = null;
@ -1746,7 +1747,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
}
public void OpenInNewTab(int destination) {
var child = new ViewPort(FileName, Model, dispatcher, Singletons, mapper?.Tutorials, mapper?.FileSystem, PythonTool, history);
var child = new ViewPort(FileName, Model, dispatcher, Singletons, mapper?.Tutorials, mapper?.FileSystem, PythonTool, history, mapper?.Templates);
child.selection.GotoAddress(destination);
RequestTabChange?.Invoke(this, new(child));
}

7
src/HexManiac.Integration/MapTests.cs
View File

@ -213,5 +213,12 @@ namespace HavenSoft.HexManiac.Integration {
map.PrimaryUp(0, 0);
// no crash = pass
}
[SkippableFact]
public void FireRed_DuplicateMapTab_SameTemplate() {
var firered = LoadFireRed();
var dup = firered.CreateDuplicate();
Assert.Same(firered.MapEditor.Templates, dup.MapEditor.Templates);
}
}
}