From 0ab3d123c66b4addec3cd2388b870f893bfdca09 Mon Sep 17 00:00:00 2001 From: Miguel Terol Espino Date: Tue, 5 Mar 2024 13:53:48 +0100 Subject: [PATCH] Some more fixes to the new tabs and an arm9 issue (force it uncompressed) --- DS_Map/EditorPanels.cs | 12 +- DS_Map/Editors/LevelScriptEditor.cs | 654 ++++++++++++++-------------- DS_Map/Main Window.Designer.cs | 232 +++++----- DS_Map/Main Window.cs | 10 +- DS_Map/Main Window.resx | 183 ++++---- 5 files changed, 545 insertions(+), 546 deletions(-) diff --git a/DS_Map/EditorPanels.cs b/DS_Map/EditorPanels.cs index c61106c..6693a0e 100644 --- a/DS_Map/EditorPanels.cs +++ b/DS_Map/EditorPanels.cs @@ -8,13 +8,17 @@ namespace DSPRE { public static void Initialize(MainProgram mainProgram) { MainProgram = mainProgram; } + public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } public static ScriptEditor scriptEditor { get { return MainProgram.scriptEditor; } } public static LevelScriptEditor levelScriptEditor { get { return MainProgram.levelScriptEditor; } } - public static TabControl mainTabControl { get { return MainProgram.mainTabControl; } } + + public static EncountersEditor encountersEditor { get { return MainProgram.encountersEditor; } } public static TabPage scriptEditorTabPage { get { return MainProgram.tabPageScriptEditor; } } - public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } - - } + public static TabPage levelScriptEditorTabPage { get { return MainProgram.tabPageLevelScriptEditor; } } + public static TabPage tabPageEncountersEditor { get { return MainProgram.tabPageEncountersEditor; } } + + + } } diff --git a/DS_Map/Editors/LevelScriptEditor.cs b/DS_Map/Editors/LevelScriptEditor.cs index 0c8c424..a980078 100644 --- a/DS_Map/Editors/LevelScriptEditor.cs +++ b/DS_Map/Editors/LevelScriptEditor.cs @@ -5,218 +5,209 @@ using System.Windows.Forms; using DSPRE.ROMFiles; namespace DSPRE.Editors { - public partial class LevelScriptEditor : UserControl { - public bool levelScriptEditorIsReady { get; set; } = false; - LevelScriptFile _levelScriptFile; + public partial class LevelScriptEditor : UserControl { + public bool levelScriptEditorIsReady { get; set; } = false; + LevelScriptFile _levelScriptFile; MainProgram _parent; - public LevelScriptEditor() { - InitializeComponent(); - - } + public LevelScriptEditor() { + InitializeComponent(); - public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { - if (levelScriptEditorIsReady && !force) return; - levelScriptEditorIsReady = true; + } + + public void SetUpLevelScriptEditor(MainProgram parent, bool force = false) { + if (levelScriptEditorIsReady && !force) return; + levelScriptEditorIsReady = true; this._parent = parent; DSUtils.TryUnpackNarcs(new List { RomInfo.DirNames.scripts }); //12 = scripts Narc Dir - populate_selectScriptFileComboBox(); - } + populate_selectScriptFileComboBox(); + } + + public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { - public void OpenLevelScriptEditor(MainProgram parent, int levelScriptID) { - SetUpLevelScriptEditor(parent); - selectScriptFileComboBox.SelectedIndex = levelScriptID; - EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; - } - - private void populate_selectScriptFileComboBox(int selectedIndex = 0) { - selectScriptFileComboBox.Items.Clear(); - int scriptCount = Filesystem.GetScriptCount(); - for (int i = 0; i < scriptCount; i++) { - // ScriptFile currentScriptFile = new ScriptFile(i, true, true); - // selectScriptFileComboBox.Items.Add(currentScriptFile); - selectScriptFileComboBox.Items.Add($"Script File {i}"); - } - - selectScriptFileComboBox.SelectedIndex = selectedIndex; - } - - void disableButtons() { - listBoxTriggers.DataSource = null; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - radioButtonVariableValue.Checked = false; - radioButtonMapChange.Checked = false; - radioButtonScreenReset.Checked = false; - radioButtonLoadGame.Checked = false; - - textBoxScriptID.Enabled = false; - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - - radioButtonVariableValue.Enabled = false; - radioButtonMapChange.Enabled = false; - radioButtonScreenReset.Enabled = false; - radioButtonLoadGame.Enabled = false; - - radioButtonAuto.Enabled = false; - radioButtonHex.Enabled = false; - radioButtonDecimal.Enabled = false; - - buttonImport.Enabled = false; - buttonSave.Enabled = false; - buttonExport.Enabled = false; - checkBoxPadding.Enabled = false; - - buttonAdd.Enabled = false; - buttonRemove.Enabled = false; - } - - void enableButtons() { - // textBoxScriptID.Enabled = true; - // textBoxVariableName.Enabled = true; - // textBoxVariableValue.Enabled = true; - - radioButtonVariableValue.Enabled = true; - radioButtonMapChange.Enabled = true; - radioButtonScreenReset.Enabled = true; - radioButtonLoadGame.Enabled = true; - - radioButtonAuto.Enabled = true; - radioButtonHex.Enabled = true; - radioButtonDecimal.Enabled = true; - - buttonImport.Enabled = true; - buttonSave.Enabled = true; - buttonExport.Enabled = true; - checkBoxPadding.Enabled = true; - } - - void buttonAdd_logic() { - buttonAdd.Enabled = false; - - if (radioButtonVariableValue.Checked) { - if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { - buttonAdd.Enabled = true; + selectScriptFileComboBox.SelectedIndex = levelScriptID; + EditorPanels.mainTabControl.SelectedTab = EditorPanels.levelScriptEditorTabPage; } - } - else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { - if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { - buttonAdd.Enabled = true; + + private void populate_selectScriptFileComboBox(int selectedIndex = 0) { + selectScriptFileComboBox.Items.Clear(); + int scriptCount = Filesystem.GetScriptCount(); + for (int i = 0; i < scriptCount; i++) { + // ScriptFile currentScriptFile = new ScriptFile(i, true, true); + // selectScriptFileComboBox.Items.Add(currentScriptFile); + selectScriptFileComboBox.Items.Add($"Script File {i}"); + } + + selectScriptFileComboBox.SelectedIndex = selectedIndex; } - } - } - private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (selectScriptFileComboBox.SelectedIndex == -1) { - buttonOpenSelectedScript.Enabled = false; - buttonOpenHeaderScript.Enabled = false; - buttonLocate.Enabled = false; - } - else { - buttonOpenSelectedScript.Enabled = true; - buttonOpenHeaderScript.Enabled = true; - buttonLocate.Enabled = true; - } + void disableButtons() { + listBoxTriggers.DataSource = null; - disableButtons(); + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); - try { - _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + radioButtonVariableValue.Checked = false; + radioButtonMapChange.Checked = false; + radioButtonScreenReset.Checked = false; + radioButtonLoadGame.Checked = false; - listBoxTriggers.DataSource = _levelScriptFile.bufferSet; - if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + textBoxScriptID.Enabled = false; + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; - enableButtons(); - } - catch (InvalidDataException ex) { //not a level script - disableButtons(); - Console.WriteLine(ex.Message); - } - } + radioButtonVariableValue.Enabled = false; + radioButtonMapChange.Enabled = false; + radioButtonScreenReset.Enabled = false; + radioButtonLoadGame.Enabled = false; - void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { - if (listBoxTriggers.SelectedItem == null) { - buttonRemove.Enabled = false; - return; - } + radioButtonAuto.Enabled = false; + radioButtonHex.Enabled = false; + radioButtonDecimal.Enabled = false; - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { - radioButtonLoadGame.Checked = true; + buttonImport.Enabled = false; + buttonSave.Enabled = false; + buttonExport.Enabled = false; + checkBoxPadding.Enabled = false; + + buttonAdd.Enabled = false; + buttonRemove.Enabled = false; } - else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { - radioButtonMapChange.Checked = true; + + void enableButtons() { + // textBoxScriptID.Enabled = true; + // textBoxVariableName.Enabled = true; + // textBoxVariableValue.Enabled = true; + + radioButtonVariableValue.Enabled = true; + radioButtonMapChange.Enabled = true; + radioButtonScreenReset.Enabled = true; + radioButtonLoadGame.Enabled = true; + + radioButtonAuto.Enabled = true; + radioButtonHex.Enabled = true; + radioButtonDecimal.Enabled = true; + + buttonImport.Enabled = true; + buttonSave.Enabled = true; + buttonExport.Enabled = true; + checkBoxPadding.Enabled = true; } - else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { - radioButtonScreenReset.Checked = true; + + void buttonAdd_logic() { + buttonAdd.Enabled = false; + + if (radioButtonVariableValue.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text) && !string.IsNullOrEmpty(textBoxVariableName.Text) && !string.IsNullOrEmpty(textBoxVariableValue.Text)) { + buttonAdd.Enabled = true; + } + } else if (radioButtonMapChange.Checked || radioButtonScreenReset.Checked || radioButtonLoadGame.Checked) { + if (!string.IsNullOrEmpty(textBoxScriptID.Text)) { + buttonAdd.Enabled = true; + } + } } - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { - radioButtonVariableValue.Checked = true; + + private void selectScriptFileComboBox_SelectedIndexChanged(object sender, EventArgs e) { + if (selectScriptFileComboBox.SelectedIndex == -1) { + buttonOpenSelectedScript.Enabled = false; + buttonOpenHeaderScript.Enabled = false; + buttonLocate.Enabled = false; + } else { + buttonOpenSelectedScript.Enabled = true; + buttonOpenHeaderScript.Enabled = true; + buttonLocate.Enabled = true; + } + + disableButtons(); + + try { + _levelScriptFile = new LevelScriptFile(selectScriptFileComboBox.SelectedIndex); + + listBoxTriggers.DataSource = _levelScriptFile.bufferSet; + if (listBoxTriggers.Items.Count > 0) listBoxTriggers.SelectedIndex = 0; + + enableButtons(); + } catch (InvalidDataException ex) { //not a level script + disableButtons(); + Console.WriteLine(ex.Message); + } } - } - handleAutoFormat(); - handleHexFormat(); - handleDecimalFormat(); + void listBoxTriggers_SelectedValueChanged(object sender, EventArgs e) { + if (listBoxTriggers.SelectedItem == null) { + buttonRemove.Enabled = false; + return; + } - textBoxScriptID.Enabled = true; - buttonRemove.Enabled = true; - } + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.LOADGAME) { + radioButtonLoadGame.Checked = true; + } else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.MAPCHANGE) { + radioButtonMapChange.Checked = true; + } else if (mapScreenLoadTrigger.triggerType == LevelScriptTrigger.SCREENRESET) { + radioButtonScreenReset.Checked = true; + } + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + if (variableValueTrigger.triggerType == LevelScriptTrigger.VARIABLEVALUE) { + radioButtonVariableValue.Checked = true; + } + } - private void buttonAdd_Click(object sender, EventArgs e) { - // try { - if (_levelScriptFile == null) { - _levelScriptFile = new LevelScriptFile(); - } + handleAutoFormat(); + handleHexFormat(); + handleDecimalFormat(); - int convertBase = 10; //decimal - if (radioButtonHex.Checked) { - convertBase = 16; //hex - } - - if (radioButtonVariableValue.Checked) { - int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); - int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); - int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); - VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); - _levelScriptFile.bufferSet.Add(variableValueTrigger); - } - else { - int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); - if (radioButtonMapChange.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + textBoxScriptID.Enabled = true; + buttonRemove.Enabled = true; } - else if (radioButtonScreenReset.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); - } - else if (radioButtonLoadGame.Checked) { - MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); - _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); - } - } - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - // } - // catch (Exception exception) { - // MessageBox.Show(exception.Message); - // } - } + private void buttonAdd_Click(object sender, EventArgs e) { + // try { + if (_levelScriptFile == null) { + _levelScriptFile = new LevelScriptFile(); + } - private void buttonRemove_Click(object sender, EventArgs e) { - _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); - } + int convertBase = 10; //decimal + if (radioButtonHex.Checked) { + convertBase = 16; //hex + } + + if (radioButtonVariableValue.Checked) { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + int variableName = Convert.ToInt16(textBoxVariableName.Text, convertBase); + int variableValue = Convert.ToInt16(textBoxVariableValue.Text, convertBase); + VariableValueTrigger variableValueTrigger = new VariableValueTrigger(scriptID, variableName, variableValue); + _levelScriptFile.bufferSet.Add(variableValueTrigger); + } else { + int scriptID = Convert.ToInt16(textBoxScriptID.Text, convertBase); + if (radioButtonMapChange.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.MAPCHANGE, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } else if (radioButtonScreenReset.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.SCREENRESET, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } else if (radioButtonLoadGame.Checked) { + MapScreenLoadTrigger mapScreenLoadTrigger = new MapScreenLoadTrigger(LevelScriptTrigger.LOADGAME, scriptID); + _levelScriptFile.bufferSet.Add(mapScreenLoadTrigger); + } + } + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + // } + // catch (Exception exception) { + // MessageBox.Show(exception.Message); + // } + } + + private void buttonRemove_Click(object sender, EventArgs e) { + _levelScriptFile.bufferSet.RemoveAt(listBoxTriggers.SelectedIndex); + } private void buttonOpenHeaderScript_Click(object sender, EventArgs e) { EditorPanels.scriptEditor.OpenScriptEditor(this._parent, (int)EditorPanels.MainProgram.scriptFileUpDown.Value); @@ -227,161 +218,154 @@ namespace DSPRE.Editors { } void buttonLocate_Click(object sender, EventArgs e) { - if (_levelScriptFile == null) return; - string path = Filesystem.GetScriptPath(_levelScriptFile.ID); - Helpers.ExplorerSelect(path); - } - - void buttonImport_Click(object sender, EventArgs e) { - OpenFileDialog ofd = new OpenFileDialog(); - if (ofd.ShowDialog() == DialogResult.OK) { - try { - LevelScriptFile importedFile = new LevelScriptFile(); - importedFile.parse_file(ofd.FileName); - _levelScriptFile.bufferSet.Clear(); - foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { - _levelScriptFile.bufferSet.Add(trigger); - } + if (_levelScriptFile == null) return; + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + Helpers.ExplorerSelect(path); } - catch (InvalidDataException ex) { - MessageBox.Show(ex.Message, ex.GetType().ToString()); + + void buttonImport_Click(object sender, EventArgs e) { + OpenFileDialog ofd = new OpenFileDialog(); + if (ofd.ShowDialog() == DialogResult.OK) { + try { + LevelScriptFile importedFile = new LevelScriptFile(); + importedFile.parse_file(ofd.FileName); + _levelScriptFile.bufferSet.Clear(); + foreach (LevelScriptTrigger trigger in importedFile.bufferSet) { + _levelScriptFile.bufferSet.Add(trigger); + } + } catch (InvalidDataException ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } } - } - } - private void buttonSave_Click(object sender, EventArgs e) { - string path = Filesystem.GetScriptPath(_levelScriptFile.ID); - saveFile(path); - } - - private void buttonExport_Click(object sender, EventArgs e) { - SaveFileDialog sfd = new SaveFileDialog(); - try { - sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); - sfd.FileName = Path.GetFileName(sfd.FileName); - } - catch (Exception ex) { - sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); - sfd.FileName = Path.GetFileName(sfd.FileName); - } - - if (sfd.ShowDialog() == DialogResult.OK) { - saveFile(sfd.FileName); - } - } - - void saveFile(string path) { - try { - long bytes_written = _levelScriptFile.write_file(path); - if (bytes_written <= 4) { - MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + private void buttonSave_Click(object sender, EventArgs e) { + string path = Filesystem.GetScriptPath(_levelScriptFile.ID); + saveFile(path); } - else { - MessageBox.Show("File was correctly saved.", "Success!"); + + private void buttonExport_Click(object sender, EventArgs e) { + SaveFileDialog sfd = new SaveFileDialog(); + try { + sfd.InitialDirectory = Path.GetDirectoryName(sfd.FileName); + sfd.FileName = Path.GetFileName(sfd.FileName); + } catch (Exception ex) { + sfd.InitialDirectory = Path.GetDirectoryName(Environment.SpecialFolder.UserProfile.ToString()); + sfd.FileName = Path.GetFileName(sfd.FileName); + } + + if (sfd.ShowDialog() == DialogResult.OK) { + saveFile(sfd.FileName); + } + } + + void saveFile(string path) { + try { + long bytes_written = _levelScriptFile.write_file(path); + if (bytes_written <= 4) { + MessageBox.Show("Empty level script file was correctly saved.", "Success!"); + } else { + MessageBox.Show("File was correctly saved.", "Success!"); + } + } catch (Exception ex) { + MessageBox.Show(ex.Message, ex.GetType().ToString()); + } + } + + private void handleAutoFormat() { + if (!radioButtonAuto.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void handleHexFormat() { + if (!radioButtonHex.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); + textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); + } + } + + private void handleDecimalFormat() { + if (!radioButtonDecimal.Checked) return; + + textBoxScriptID.Clear(); + textBoxVariableName.Clear(); + textBoxVariableValue.Clear(); + + if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { + textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); + } else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { + textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); + textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); + textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); + } + } + + private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { + handleAutoFormat(); + } + + private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { + handleHexFormat(); + } + + private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { + handleDecimalFormat(); + } + + private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = true; + textBoxVariableValue.Enabled = true; + buttonAdd_logic(); + } + + private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { + textBoxVariableName.Enabled = false; + textBoxVariableValue.Enabled = false; + buttonAdd_logic(); + } + + void textBoxScriptID_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableName_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); + } + + void textBoxVariableValue_TextChanged(object sender, EventArgs e) { + buttonAdd_logic(); } - } - catch (Exception ex) { - MessageBox.Show(ex.Message, ex.GetType().ToString()); - } } - - private void handleAutoFormat() { - if (!radioButtonAuto.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); - textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); - } - } - - private void handleHexFormat() { - if (!radioButtonHex.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "0x" + variableValueTrigger.variableToWatch.ToString("X"); - textBoxVariableValue.Text = "0x" + variableValueTrigger.expectedValue.ToString("X"); - } - } - - private void handleDecimalFormat() { - if (!radioButtonDecimal.Checked) return; - - textBoxScriptID.Clear(); - textBoxVariableName.Clear(); - textBoxVariableValue.Clear(); - - if (listBoxTriggers.SelectedItem is MapScreenLoadTrigger mapScreenLoadTrigger) { - textBoxScriptID.Text = mapScreenLoadTrigger.scriptTriggered.ToString(); - } - else if (listBoxTriggers.SelectedItem is VariableValueTrigger variableValueTrigger) { - textBoxScriptID.Text = variableValueTrigger.scriptTriggered.ToString(); - textBoxVariableName.Text = "" + variableValueTrigger.variableToWatch.ToString("D"); - textBoxVariableValue.Text = "" + variableValueTrigger.expectedValue.ToString("D"); - } - } - - private void radioButtonAuto_CheckedChanged(object sender, EventArgs e) { - handleAutoFormat(); - } - - private void radioButtonHex_CheckedChanged(object sender, EventArgs e) { - handleHexFormat(); - } - - private void radioButtonDecimal_CheckedChanged(object sender, EventArgs e) { - handleDecimalFormat(); - } - - private void radioButtonVariableValue_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = true; - textBoxVariableValue.Enabled = true; - buttonAdd_logic(); - } - - private void radioButtonMapChange_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - private void radioButtonScreenReset_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - private void radioButtonLoadGame_CheckedChanged(object sender, EventArgs e) { - textBoxVariableName.Enabled = false; - textBoxVariableValue.Enabled = false; - buttonAdd_logic(); - } - - void textBoxScriptID_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - - void textBoxVariableName_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - - void textBoxVariableValue_TextChanged(object sender, EventArgs e) { - buttonAdd_logic(); - } - } } diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 6c3edb1..eb9f35d 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -30,22 +30,22 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.headerEditorTabPage = new System.Windows.Forms.TabPage(); this.removeLastHeaderBTN = new System.Windows.Forms.Button(); @@ -2543,7 +2543,7 @@ this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.setSpawnPointButton.Location = new System.Drawing.Point(12, -2832); + this.setSpawnPointButton.Location = new System.Drawing.Point(12, -4034); this.setSpawnPointButton.Name = "setSpawnPointButton"; this.setSpawnPointButton.Size = new System.Drawing.Size(117, 43); this.setSpawnPointButton.TabIndex = 35; @@ -2559,7 +2559,7 @@ this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(12, -2787); + this.saveMatrixButton.Location = new System.Drawing.Point(12, -3989); this.saveMatrixButton.Name = "saveMatrixButton"; this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); this.saveMatrixButton.TabIndex = 34; @@ -2762,40 +2762,40 @@ this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.Format = "D4"; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.Format = "D4"; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.MultiSelect = false; this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2824,43 +2824,43 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle7.Format = "D2"; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle23.Format = "D2"; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.MultiSelect = false; this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -2887,43 +2887,43 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle12.Format = "D4"; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle28.Format = "D4"; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.MultiSelect = false; this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -4324,7 +4324,7 @@ this.radio3D.AutoSize = true; this.radio3D.Checked = true; this.radio3D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio3D.Location = new System.Drawing.Point(-4818, -2808); + this.radio3D.Location = new System.Drawing.Point(-6804, -4010); this.radio3D.Name = "radio3D"; this.radio3D.Size = new System.Drawing.Size(31, 23); this.radio3D.TabIndex = 26; @@ -4339,7 +4339,7 @@ this.radio2D.Appearance = System.Windows.Forms.Appearance.Button; this.radio2D.AutoSize = true; this.radio2D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.radio2D.Location = new System.Drawing.Point(-4818, -2784); + this.radio2D.Location = new System.Drawing.Point(-6804, -3986); this.radio2D.Name = "radio2D"; this.radio2D.Size = new System.Drawing.Size(31, 23); this.radio2D.TabIndex = 25; @@ -4354,7 +4354,7 @@ this.wireframeCheckBox.Appearance = System.Windows.Forms.Appearance.Button; this.wireframeCheckBox.AutoSize = true; this.wireframeCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -2760); + this.wireframeCheckBox.Location = new System.Drawing.Point(1140, -3962); this.wireframeCheckBox.Name = "wireframeCheckBox"; this.wireframeCheckBox.Size = new System.Drawing.Size(31, 23); this.wireframeCheckBox.TabIndex = 27; @@ -7316,8 +7316,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle31.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 500); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7420,9 +7420,9 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -11960,8 +11960,8 @@ public DSPRE.Editors.LevelScriptEditor levelScriptEditor; public System.Windows.Forms.TabControl mainTabControl; public System.Windows.Forms.NumericUpDown scriptFileUpDown; - private System.Windows.Forms.TabPage tabPageEncountersEditor; - private Editors.EncountersEditor encountersEditor; + public System.Windows.Forms.TabPage tabPageEncountersEditor; + public Editors.EncountersEditor encountersEditor; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index defa900..cc46e3f 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -728,6 +728,8 @@ namespace DSPRE { } } + DSUtils.ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4)); + Helpers.statusLabelMessage("Repacking ROM..."); if (DSUtils.CheckOverlayHasCompressionFlag(1)) { @@ -751,7 +753,7 @@ namespace DSPRE { for (int i = 0; i < 128; i++) { if (!DSUtils.OverlayIsCompressed(i)) { - DSUtils.CompressOverlay(i); + //DSUtils.CompressOverlay(i); } } @@ -881,6 +883,12 @@ namespace DSPRE { SetupBattleEffectsTables(); tableEditorIsReady = true; } + } else if (mainTabControl.SelectedTab == EditorPanels.scriptEditorTabPage) { + scriptEditor.SetupScriptEditor(this); + } else if (mainTabControl.SelectedTab == EditorPanels.levelScriptEditorTabPage) { + levelScriptEditor.SetUpLevelScriptEditor(this); + } else if (mainTabControl.SelectedTab == EditorPanels.tabPageEncountersEditor) { + encountersEditor.SetupEncountersEditor(); } } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index af8eb9d..45d1ad3 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,6 +117,96 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM + EgAAAk1TRnQBSQFMAgEBCgEAASgBHAEoARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xMABLwEAAS8KwAGvAIA + BOkBvAMABOkBvCoAASYBHgQAArwBAATpBAAE6QG8KgABJgEeAgABJgEeAQABvAEAAukBvAIABLwBAALp + AbwtAAG8ASYBHgMAAukBvAEABAsCvALpAbwsAAEmAR4CAAG8AgAC6QG8AgsBvAEAAgsBvALpAbwmAAO8 + AgABJgEeAgABvAMAAukBvAILArwCCwEAAukBvCUAAc0BCgEAAbwBAAEmAR4BAAHsAwABvAEAAukBvAUL + AgAC6QG8JQABzQEKAQACvAEmAR4BAAESArwBAAG8AQAC6QG8AgsCvAMAAukBvCQAAc0BCgMAAbwBAAEm + AR4GAALpAbwBAAILA7wBAALpAbwkAAHNAQoBEgHsAQABEgG8CAAC6QG8AgADCwIAAukBvCQAAc0BCgES + AgABEgG8CAAC6QO8BAABvALpAbwjAAHNAQoBAAG8AwABvAgABOkBvAMABOkBvAEAAbwhAAHNAQoBAAG8 + AwAB7AG8BwAE6QQABOkBGwExAZkhAAFlGwADMT0AARsBMQEbKQAB7AESAe8FAAH0EQAKEhgAAvMC6wHv + AewB6wHzBQAB6gH0BQAC8gH0BgADEgZKAxIUAAHzAfEBvALsAQcBvAEHAewB6wEHBAABDgESAe0EAAHw + ASIBKQHrAfMFAAESAkoGbgJKARIDAAEPBwABDwUAAQ8BAAG8AfcB7QGSAe8BvAEHAfAB9AHyAesB6gQA + AQ4BbQHtAwABBwEjAisBKgHrAfMDAAESAUoBbgFKBm4BSgFuAUoBEgEAAQ8J7wEPAwAB7wIAAW0C9wHw + AbwB8wLyAvQB7QHrAQcDAAEHARUB6gPtASkBKwElAR8BJQEqAesB9AIAARIBSgFuAUoGkwFKAW4BSgES + AgAB7wEBAR8G7wMAAu8CAAG8Ae8B8QH0AfYB8gLwAfQB9gHvAewBbQMAAfQBEAHrAUoBMAEDASUBFwH5 + AiABJQEqAeoCAAESAUoBkwFuBkkBbgGTAUoBEgIAAe8CAQEfBe8BAAIPAu8CAAHyAe8C9gH3AW0B6wHy + AfQB9gHzAesB7AEHAgAB9AEQAXMBRQEkASAB+QEXAfkBIAEfASABMQEiAfQBAAESAZMBbgFJBmwBSQFu + AZMBEgIAAe8BAQEfBu8DAALvAwAB7wHzAbwBkgHwAfcB9gH3Ae0BBwHrAewB7wMAAfIBEQFFAR8CIAH5 + ARcB+QEgAR8BMQEiAfQBAAESAZMBSQJsBHECbAFJAZMBEgEAAQ8J7wEPAwAB7wMAAQcB8AFEASUBGgKS + AfIC8wH0ARIB6wHyAgAB8gFDAewBRQEfASAB+QEXASYBMQE3ATABFAIAAUkBbgFsAXEBlwRxAZcBcQFs + AW4BEgIAAQ8HAAEPBQABDwIAAfQBbQEsASUB6wH0AvEC7wHyAusBvAIAAfMBbQHrAUUBHwIgAfkBMQFR + Am0B8wIAAUkCbAGXAnEClwJxAZcCbAFJAgABFQEPARUDAAEVAQ8BFQgAARwBLAErAeoBBwG8Au8B9AK8 + AfMCbQMAAfABEwFFAR8BJAIrAVEBvAUAAUkBbAJxBpcCcQFsAUkBAAEVAfcBBwH3ARUBAAEVAfcBBwH3 + ARUGAAHvAisBSwHvAQcBvAHxBAcB9AGLAeoDAAHwAREBSwEkASMBAwFKAfAHAAFsAXEDlwJ4A5cBcQFs + AgABDwEHAQABBwEPAQABDwEHAQABBwEPBQAB7wErASwBRQK8AQcB7wEHAbwB8AEZAtsBbAEHAwAB8AEj + AisBDgHwAfEIAAFJAXEClwF4BZcBcQFJAgABFQH3AQcB9wEVAQABFQH3AQcB9wEVBQABEgEsAUUB8gHz + Ae8B8gHxAbsC2gGzAosB8wQAAfABIwE3ATEBDgsAAUkBcQKXAXgDlwFxAUkEAAEVAQ8BFQMAARUBDwEV + BwABEgG8AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0 + EwAN8xMAAQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGz + DQABswUAAkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFD + CPABQwQAAe8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFW + CVABVgEAAbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHT + AQAC0wEAAdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARW + AQABswH0AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFD + AmMBEgHwAUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwES + BEcCQwRHARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7 + Aq0EswG7AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQA + Ae8CAAEQAkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8 + AvcBAAHvAgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEA + ASwDwwFTAQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQA + Ae8BAAF0AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUA + Ae8IAAHzAfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+ + BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAv8CwwQAAf8BgQKDBAAB/wEAAYcBgwQA + Af8BMAGMASMEAAH/AeEBiAEDBAAB/wHBAYEBAwQAAfEBgwGAASMEAAHhAQ4BgAFjBAAB4AEAAYAB4wQA + AcABgQGIASMEAAHAAX8BjAFjBAABxAF/AYMBwwQAAYQBfwGDAYIEAAGEAT8BhwGABAABjAF/Af8B+AQA + A/8B+AQAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHAAQMBgAE8AYABBwGOAQMBgAEB + AQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGAAQECAAHAAQEBwAEAAYABAQEA + ARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEPAYABAQEEAR8BgAEAAeABHwHA + AQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHwAf8B8AEPAv8B+AF/Av8B/AE/ + Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg + AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA + AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk + Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA + AR8BAAEBAQABAQL/Cw== + + @@ -946,96 +1036,6 @@ p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= - - - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAARgBHAEYARwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xMABLwEAAS8KwAGvAIA - BOkBvAMABOkBvCoAASYBHgQAArwBAATpBAAE6QG8KgABJgEeAgABJgEeAQABvAEAAukBvAIABLwBAALp - AbwtAAG8ASYBHgMAAukBvAEABAsCvALpAbwsAAEmAR4CAAG8AgAC6QG8AgsBvAEAAgsBvALpAbwmAAO8 - AgABJgEeAgABvAMAAukBvAILArwCCwEAAukBvCUAAc0BCgEAAbwBAAEmAR4BAAHsAwABvAEAAukBvAUL - AgAC6QG8JQABzQEKAQACvAEmAR4BAAESArwBAAG8AQAC6QG8AgsCvAMAAukBvCQAAc0BCgMAAbwBAAEm - AR4GAALpAbwBAAILA7wBAALpAbwkAAHNAQoBEgHsAQABEgG8CAAC6QG8AgADCwIAAukBvCQAAc0BCgES - AgABEgG8CAAC6QO8BAABvALpAbwjAAHNAQoBAAG8AwABvAgABOkBvAMABOkBvAEAAbwhAAHNAQoBAAG8 - AwAB7AG8BwAE6QQABOkBGwExAZkhAAFlGwADMT0AARsBMQEbKQAB7AESAe8FAAH0EQAKEhgAAvMC6wHv - AewB6wHzBQAB6gH0BQAC8gH0BgADEgZKAxIUAAHzAfEBvALsAQcBvAEHAewB6wEHBAABDgESAe0EAAHw - ASIBKQHrAfMFAAESAkoGbgJKARIDAAEPBwABDwUAAQ8BAAG8AfcB7QGSAe8BvAEHAfAB9AHyAesB6gQA - AQ4BbQHtAwABBwEjAisBKgHrAfMDAAESAUoBbgFKBm4BSgFuAUoBEgEAAQ8J7wEPAwAB7wIAAW0C9wHw - AbwB8wLyAvQB7QHrAQcDAAEHARUB6gPtASkBKwElAR8BJQEqAesB9AIAARIBSgFuAUoGkwFKAW4BSgES - AgAB7wEBAR8G7wMAAu8CAAG8Ae8B8QH0AfYB8gLwAfQB9gHvAewBbQMAAfQBEAHrAUoBMAEDASUBFwH5 - AiABJQEqAeoCAAESAUoBkwFuBkkBbgGTAUoBEgIAAe8CAQEfBe8BAAIPAu8CAAHyAe8C9gH3AW0B6wHy - AfQB9gHzAesB7AEHAgAB9AEQAXMBRQEkASAB+QEXAfkBIAEfASABMQEiAfQBAAESAZMBbgFJBmwBSQFu - AZMBEgIAAe8BAQEfBu8DAALvAwAB7wHzAbwBkgHwAfcB9gH3Ae0BBwHrAewB7wMAAfIBEQFFAR8CIAH5 - ARcB+QEgAR8BMQEiAfQBAAESAZMBSQJsBHECbAFJAZMBEgEAAQ8J7wEPAwAB7wMAAQcB8AFEASUBGgKS - AfIC8wH0ARIB6wHyAgAB8gFDAewBRQEfASAB+QEXASYBMQE3ATABFAIAAUkBbgFsAXEBlwRxAZcBcQFs - AW4BEgIAAQ8HAAEPBQABDwIAAfQBbQEsASUB6wH0AvEC7wHyAusBvAIAAfMBbQHrAUUBHwIgAfkBMQFR - Am0B8wIAAUkCbAGXAnEClwJxAZcCbAFJAgABFQEPARUDAAEVAQ8BFQgAARwBLAErAeoBBwG8Au8B9AK8 - AfMCbQMAAfABEwFFAR8BJAIrAVEBvAUAAUkBbAJxBpcCcQFsAUkBAAEVAfcBBwH3ARUBAAEVAfcBBwH3 - ARUGAAHvAisBSwHvAQcBvAHxBAcB9AGLAeoDAAHwAREBSwEkASMBAwFKAfAHAAFsAXEDlwJ4A5cBcQFs - AgABDwEHAQABBwEPAQABDwEHAQABBwEPBQAB7wErASwBRQK8AQcB7wEHAbwB8AEZAtsBbAEHAwAB8AEj - AisBDgHwAfEIAAFJAXEClwF4BZcBcQFJAgABFQH3AQcB9wEVAQABFQH3AQcB9wEVBQABEgEsAUUB8gHz - Ae8B8gHxAbsC2gGzAosB8wQAAfABIwE3ATEBDgsAAUkBcQKXAXgDlwFxAUkEAAEVAQ8BFQMAARUBDwEV - BwABEgG8AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0 - EwAN8xMAAQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGz - DQABswUAAkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFD - CPABQwQAAe8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFW - CVABVgEAAbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHT - AQAC0wEAAdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARW - AQABswH0AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFD - AmMBEgHwAUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwES - BEcCQwRHARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7 - Aq0EswG7AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQA - Ae8CAAEQAkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8 - AvcBAAHvAgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEA - ASwDwwFTAQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQA - Ae8BAAF0AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUA - Ae8IAAHzAfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+ - BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAv8CwwQAAf8BgQKDBAAB/wEAAYcBgwQA - Af8BMAGMASMEAAH/AeEBiAEDBAAB/wHBAYEBAwQAAfEBgwGAASMEAAHhAQ4BgAFjBAAB4AEAAYAB4wQA - AcABgQGIASMEAAHAAX8BjAFjBAABxAF/AYMBwwQAAYQBfwGDAYIEAAGEAT8BhwGABAABjAF/Af8B+AQA - A/8B+AQAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHAAQMBgAE8AYABBwGOAQMBgAEB - AQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGAAQECAAHAAQEBwAEAAYABAQEA - ARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEPAYABAQEEAR8BgAEAAeABHwHA - AQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHwAf8B8AEPAv8B+AF/Av8B/AE/ - Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg - AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA - AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk - Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA - AR8BAAEBAQABAQL/Cw== @@ -1047,6 +1047,9 @@ 386, 19 + + 533, 20 + 67