Skip to content

Commit 3107689

Browse files
committed
Bump
1 parent e80c943 commit 3107689

File tree

3 files changed

+28
-29
lines changed

3 files changed

+28
-29
lines changed

EFSAdvent/Form1.cs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace EFSAdvent
1414
{
1515
public partial class Form1 : Form
1616
{
17-
private const string VERSION = "1.5";
17+
private const string VERSION = "1.6";
1818
private const string BaseTitel = "EFSAdvent " + VERSION + " [Venomalia]";
1919
private const string WikiUrl = "https://github.com/Venomalia/EFSAdvent/wiki";
2020
private const string SourceCodeUrl = "https://github.com/Venomalia/EFSAdvent";
@@ -385,21 +385,16 @@ private void LoadRoom(bool newRoom)
385385
}
386386
}
387387
}
388-
RefreshLayersCheckList();
388+
for (int i = 0; i < 16; i++)
389+
{
390+
Color color = _level.Room.IsLayerEmpty(i) ? Color.Gray : Color.Black;
391+
layersCheckList.Colors[$"Layer {(i < 8 ? 1 : 2)}-{i % 8}"] = color;
392+
}
393+
layersCheckList.Refresh();
389394
UpdateView(false);
390395
}
391396
}
392397

393-
private void RefreshLayersCheckList()
394-
{
395-
for (int i = 0; i < 16; i++)
396-
{
397-
Color color = _level.Room.IsLayerEmpty(i) ? Color.Gray : Color.Black;
398-
layersCheckList.Colors[$"Layer {(i < 8 ? 1 : 2)}-{i % 8}"] = color;
399-
}
400-
layersCheckList.Refresh();
401-
}
402-
403398
private void RemoveRoom(object sender, EventArgs e)
404399
{
405400
byte selectedRoom = _level.Map.GetRoomValue(selectedRoomCoordinates.x, selectedRoomCoordinates.y);
@@ -1151,6 +1146,9 @@ private void ExportLevel(object sender, EventArgs e)
11511146

11521147
private void ExportRoomAsTmx_Click(object sender, EventArgs e)
11531148
{
1149+
if (ShowSaveChangesDialog(true, "Save all data before exporting?"))
1150+
return;
1151+
11541152
var saveTmx = new SaveFileDialog
11551153
{
11561154
DefaultExt = ".tmx",
@@ -1163,9 +1161,8 @@ private void ExportRoomAsTmx_Click(object sender, EventArgs e)
11631161
{
11641162
string tilesetSource = $"Tile Sheet {currentTileSheetComboBox.SelectedIndex:D2}.tsx";
11651163
string tsxFilePath = Path.Combine(Path.GetDirectoryName(saveTmx.FileName), tilesetSource);
1166-
string overlaySource = Path.Combine(dataDirectory, $"Overlays\\filter{(int)MapVariableOverlay.Value}.png");
11671164
ExportMapTilesetAsTsx(tsxFilePath);
1168-
_level.Room.ExportAsTMX(saveTmx.FileName, tilesetSource, overlaySource);
1165+
_level.Room.ExportAsTMX(saveTmx.FileName, tilesetSource);
11691166
}
11701167
}
11711168

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

11811178
if (openTmx.ShowDialog() == DialogResult.OK)
11821179
{
11831180
_level.Room.ImportRoomFromTMX(openTmx.FileName);
1184-
RefreshLayersCheckList();
11851181
UpdateView(false);
11861182
}
11871183
}

EFSAdvent/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.5.0.0")]
35-
[assembly: AssemblyFileVersion("1.5.0.0")]
34+
[assembly: AssemblyVersion("1.6.0.0")]
35+
[assembly: AssemblyFileVersion("1.6.0.0")]

README.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ A level editor for the Nintendo GameCube game Four Swords Adventures.
77
This branch is an unoficial update based on the [source code](https://bitbucket.org/jaytheham/efsadvent/src/main/) of Jay(theHam) Harland.
88

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

2225
## Goals
2326
Fully document all actor variables and their behavior.

0 commit comments

Comments
 (0)