Skip to content

Commit

Permalink
Changed #2120 Exported assets no longer take names from assigned clas…
Browse files Browse the repository at this point in the history
…ses if there is more than 1 assigned class
  • Loading branch information
jindrapetrik committed Nov 16, 2023
1 parent 8c61ceb commit 6a046a6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ All notable changes to this project will be documented in this file.
### Removed
- [#2123] FLA export - Using shape fixer for morphshapes (needs something better)

### Changed
- [#2120] Exported assets no longer take names from assigned classes if there is more than 1 assigned class

## [20.0.0] - 2023-11-05
### Added
- [#1130], [#1220] Remembering last used screen (monitor),
Expand Down Expand Up @@ -3283,6 +3286,7 @@ Major version of SWF to XML export changed to 2.
[#2116]: https://www.free-decompiler.com/flash/issues/2116
[#2122]: https://www.free-decompiler.com/flash/issues/2122
[#2111]: https://www.free-decompiler.com/flash/issues/2111
[#2120]: https://www.free-decompiler.com/flash/issues/2120
[#1130]: https://www.free-decompiler.com/flash/issues/1130
[#1220]: https://www.free-decompiler.com/flash/issues/1220
[#1717]: https://www.free-decompiler.com/flash/issues/1717
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,25 @@ public String getName() {
@Override
public String getExportFileName() {
String result = super.getExportFileName();
return result + "_" + getCharacterId() + (exportName != null ? "_" + exportName : "") + (!classNames.isEmpty() ? "_" + String.join("___", classNames) : "");
result += "_" + getCharacterId();
if (exportName != null) {
result += "_" + exportName;
}
if (classNames.size() == 1) {
result += "_" + classNames.iterator().next();
}
return result;
}

public String getCharacterExportFileName() {
return getCharacterId() + (exportName != null ? "_" + exportName : "") + (!classNames.isEmpty() ? "_" + String.join("___", classNames) : "");
String result = "" + getCharacterId();
if (exportName != null) {
result += "_" + exportName;
}
if (classNames.size() == 1) {
result += "_" + classNames.iterator().next();
}
return result;
}

protected String exportName;
Expand Down

0 comments on commit 6a046a6

Please sign in to comment.