Skip to content

Commit

Permalink
Bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Venomalia committed Dec 20, 2024
1 parent e80c943 commit 3107689
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 29 deletions.
28 changes: 12 additions & 16 deletions EFSAdvent/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace EFSAdvent
{
public partial class Form1 : Form
{
private const string VERSION = "1.5";
private const string VERSION = "1.6";
private const string BaseTitel = "EFSAdvent " + VERSION + " [Venomalia]";
private const string WikiUrl = "https://github.com/Venomalia/EFSAdvent/wiki";
private const string SourceCodeUrl = "https://github.com/Venomalia/EFSAdvent";
Expand Down Expand Up @@ -385,21 +385,16 @@ private void LoadRoom(bool newRoom)
}
}
}
RefreshLayersCheckList();
for (int i = 0; i < 16; i++)
{
Color color = _level.Room.IsLayerEmpty(i) ? Color.Gray : Color.Black;
layersCheckList.Colors[$"Layer {(i < 8 ? 1 : 2)}-{i % 8}"] = color;
}
layersCheckList.Refresh();
UpdateView(false);
}
}

private void RefreshLayersCheckList()
{
for (int i = 0; i < 16; i++)
{
Color color = _level.Room.IsLayerEmpty(i) ? Color.Gray : Color.Black;
layersCheckList.Colors[$"Layer {(i < 8 ? 1 : 2)}-{i % 8}"] = color;
}
layersCheckList.Refresh();
}

private void RemoveRoom(object sender, EventArgs e)
{
byte selectedRoom = _level.Map.GetRoomValue(selectedRoomCoordinates.x, selectedRoomCoordinates.y);
Expand Down Expand Up @@ -1151,6 +1146,9 @@ private void ExportLevel(object sender, EventArgs e)

private void ExportRoomAsTmx_Click(object sender, EventArgs e)
{
if (ShowSaveChangesDialog(true, "Save all data before exporting?"))
return;

var saveTmx = new SaveFileDialog
{
DefaultExt = ".tmx",
Expand All @@ -1163,9 +1161,8 @@ private void ExportRoomAsTmx_Click(object sender, EventArgs e)
{
string tilesetSource = $"Tile Sheet {currentTileSheetComboBox.SelectedIndex:D2}.tsx";
string tsxFilePath = Path.Combine(Path.GetDirectoryName(saveTmx.FileName), tilesetSource);
string overlaySource = Path.Combine(dataDirectory, $"Overlays\\filter{(int)MapVariableOverlay.Value}.png");
ExportMapTilesetAsTsx(tsxFilePath);
_level.Room.ExportAsTMX(saveTmx.FileName, tilesetSource, overlaySource);
_level.Room.ExportAsTMX(saveTmx.FileName, tilesetSource);
}
}

Expand All @@ -1175,13 +1172,12 @@ private void ImportRoomFromTmx_Click(object sender, EventArgs e)
{
DefaultExt = ".tmx",
Filter = "Tiled map files|*.tmx;*.xml",
FileName = $"boss{_level.Map.Number}_Room{_level.Room.RoomNumber}"
FileName = $"boss{_level.Map.Number}_Room{_level.Room.RoomNumber}.tmx"
};

if (openTmx.ShowDialog() == DialogResult.OK)
{
_level.Room.ImportRoomFromTMX(openTmx.FileName);
RefreshLayersCheckList();
UpdateView(false);
}
}
Expand Down
4 changes: 2 additions & 2 deletions EFSAdvent/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.0.0")]
[assembly: AssemblyFileVersion("1.5.0.0")]
[assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.6.0.0")]
25 changes: 14 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,20 @@ A level editor for the Nintendo GameCube game Four Swords Adventures.
This branch is an unoficial update based on the [source code](https://bitbucket.org/jaytheham/efsadvent/src/main/) of Jay(theHam) Harland.

## Main Changes
- A bunch of bug fixes.
- Start room is highlighted and loaded when a level is opened.
- Different views of the actor variables.
- Allows the copying and pasting of actor data via clipboard.
- Simple adding and deleting of rooms.
- Import rooms and actors from other levels.
- Preview which tiles will be changed by PNPC and PNP2 actors.
- Detailed documentation for a significant number of actors.
- Shadow Battle Map vaules will be loaded and can be edited.
- Highlights used layers.
- Export Level as .png.
- Fixed multiple bugs to enhance stability.
- Start room is now highlighted and auto-loaded when a level is opened.
- Actor variables are now displayed and editable in their correct format.
- Enabled copying and pasting actor data via clipboard.
- Simplified adding and deleting rooms.
- Enabled importing rooms and actors from other levels.
- Added a preview to show which tiles will be altered by PNPC and PNP2 actors.
- Expanded detailed documentation for numerous actors.
- Shadow Battle Map values can now be loaded and edited.
- Highlights which layers are in use.
- Added the ability to export levels as .png files.
- Enabled export and import of room tiles to Tiled TMX files.
- Added functionality to load actors from templates.
- Added visualization of Overlay filter effects.

## Goals
Fully document all actor variables and their behavior.
Expand Down

0 comments on commit 3107689

Please sign in to comment.