Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-09-28 21:06:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor clean

Browse Source
This commit is contained in:
Kurt
2026-01-25 16:48:12 -06:00
parent 056514aef9
commit 3b56ea35e3
5 changed files with 108 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
NHSE.WinForms/Subforms/Map/FieldItemEditor.cs
View File

@@ -328,15 +328,15 @@ private bool GetTile(MouseEventArgs e, LayerFieldItem layerField, [NotNullWhen(t
private bool GetTile(LayerFieldItem layerField, int absX, int absY, [NotNullWhen(true)] out TileCheck<Item>? item)
{
var cfg = Editor.Mutator.Manager.ConfigItems;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
{
item = null;
return false;
}
var rel = cfg.GetCoordinatesRelative(absX, absY);
var tile = layerField.GetTile(rel.X, rel.Y);
item = new TileCheck<Item>(tile, absX, absY, rel.X, rel.Y);
var tile = layerField.GetTile(relX, relY);
item = new TileCheck<Item>(tile, absX, absY, relX, relY);
return true;
}
@@ -350,15 +350,15 @@ private bool GetTile(MouseEventArgs e, LayerTerrain layerField, [NotNullWhen(tru
private bool GetTile(LayerTerrain layerField, int absX, int absY, [NotNullWhen(true)] out TileCheck<TerrainTile>? item)
{
var cfg = Editor.Mutator.Manager.ConfigItems;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
{
item = null;
return false;
}
var rel = cfg.GetCoordinatesRelative(absX, absY);
var tile = layerField.GetTile(rel.X, rel.Y);
item = new TileCheck<TerrainTile>(tile, absX, absY, rel.X, rel.Y);
var tile = layerField.GetTile(relX, relY);
item = new TileCheck<TerrainTile>(tile, absX, absY, relX, relY);
return true;
}
@@ -644,13 +644,13 @@ private void Menu_View_Click(object sender, EventArgs e)
{
var (absX, absY) = GetAbsoluteCoordinatesHover();
var cfg = Editor.Mutator.Manager.ConfigItems;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
{
System.Media.SystemSounds.Asterisk.Play();
return;
}
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (RB_Item.Checked)
{
var tile = CurrentLayer.GetTile(relX, relY);
@@ -669,12 +669,12 @@ private void Menu_Set_Click(object sender, EventArgs e)
{
var (absX, absY) = GetAbsoluteCoordinatesHover();
var cfg = Editor.Mutator.Manager.ConfigItems;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
{
System.Media.SystemSounds.Asterisk.Play();
return;
}
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
var tile = CurrentLayer.GetTile(relX, relY);
SetTile(tile, relX, relY);
@@ -683,13 +683,13 @@ private void Menu_Set_Click(object sender, EventArgs e)
{
var (absX, absY) = GetAbsoluteCoordinatesHoverTerrain();
var cfg = Editor.Mutator.Manager.ConfigTerrain;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
{
System.Media.SystemSounds.Asterisk.Play();
return;
}
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
var tile = Editor.Terrain.GetTile(relX, relY);
SetTile(tile);
}
@@ -701,12 +701,12 @@ private void Menu_Reset_Click(object sender, EventArgs e)
{
var (absX, absY) = GetAbsoluteCoordinatesHover();
var cfg = Editor.Mutator.Manager.ConfigItems;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
{
System.Media.SystemSounds.Asterisk.Play();
return;
}
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
var tile = CurrentLayer.GetTile(relX, relY);
DeleteTile(tile, relX, relY);
@@ -715,13 +715,13 @@ private void Menu_Reset_Click(object sender, EventArgs e)
{
var (absX, absY) = GetAbsoluteCoordinatesHoverTerrain();
var cfg = Editor.Mutator.Manager.ConfigTerrain;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
{
System.Media.SystemSounds.Asterisk.Play();
return;
}
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
var tile = Editor.Terrain.GetTile(relX, relY);
DeleteTile(tile);
}
@@ -739,10 +739,10 @@ private void CM_Click_Opening(object sender, System.ComponentModel.CancelEventAr
var (absX, absY) = GetAbsoluteCoordinatesHover();
var cfg = Editor.Mutator.Manager.ConfigItems;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
return;
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
var flagLayer = NUD_Layer.Value == 0 ? Map.LayerItemFlag0 : Map.LayerItemFlag1;
var isActive = flagLayer.GetIsActive(relX, relY);
Menu_Activate.Text = isActive ? "Inactivate" : "Activate";
@@ -754,10 +754,10 @@ private void Menu_Activate_Click(object sender, EventArgs e)
{
var (absX, absY) = GetAbsoluteCoordinatesHover();
var cfg = Editor.Mutator.Manager.ConfigItems;
if (!cfg.IsCoordinateValidAbsolute(absX, absY))
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
if (!cfg.IsCoordinateValidRelative(relX, relY))
return;
var (relX, relY) = cfg.GetCoordinatesRelative(absX, absY);
var flagLayer = NUD_Layer.Value == 0 ? Map.LayerItemFlag0 : Map.LayerItemFlag1;
var isActive = flagLayer.GetIsActive(relX, relY);
flagLayer.SetIsActive(relX, relY, !isActive);