DS Map Studio 2.2 + all features of my fork

.editorconfig

@@ -0,0 +1,20 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{bat,cmd}]
+end_of_line = crlf
+
+[*.sh]
+end_of_line = lf
+
+[gradlew]
+end_of_line = lf
+
+[*.md]
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,11 @@
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.sh text eol=lf
+gradlew text eol=lf
+
+*.jar binary
+*.png binary
+*.gif binary
+*.ico binary
+*.pdsts binary
+*.pdsmap binary

.github/workflows/gradle.yml

@@ -1,6 +1,3 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
 name: Java CI with Gradle
 
 on:
@@ -11,26 +8,21 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          distribution: temurin
+          java-version: 21
+          cache: gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew build
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: Package
           path: build/libs

.github/workflows/release.yml

@@ -0,0 +1,76 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  build-portable:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: gradle
+      - run: chmod +x gradlew
+      - run: ./gradlew clean test portableZip
+      - uses: actions/upload-artifact@v4
+        with:
+          name: portable-release
+          path: build/release/*.zip
+
+  build-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: gradle
+      - name: Build application JAR
+        shell: pwsh
+        run: .\gradlew.bat clean test jar
+      - name: Build self-contained Windows application
+        shell: pwsh
+        run: |
+          $version = (Select-String -Path build.gradle -Pattern "version '([^']+)'" ).Matches[0].Groups[1].Value
+          $destination = Join-Path $PWD 'build\windows'
+          New-Item -ItemType Directory -Force -Path $destination | Out-Null
+          jpackage --type app-image --name 'Pokemon DS Map Studio' --app-version $version --input 'build\libs' --main-jar "Pokemon DS Map Studio-$version.jar" --main-class editor.MainFrame --dest $destination
+          $app = Join-Path $destination 'Pokemon DS Map Studio'
+          Copy-Item -Recurse -Force converter (Join-Path $app 'converter')
+          Copy-Item README.md,RELEASE_NOTES.md $app
+          $archive = Join-Path $PWD "build\release\Pokemon.DS.Map.Studio-$version-Windows.zip"
+          New-Item -ItemType Directory -Force -Path (Split-Path $archive) | Out-Null
+          Compress-Archive -Path $app -DestinationPath $archive -CompressionLevel Optimal
+      - uses: actions/upload-artifact@v4
+        with:
+          name: windows-release
+          path: build/release/*.zip
+
+  publish:
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: [build-portable, build-windows]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          path: release
+          merge-multiple: true
+      - name: Generate checksums
+        run: cd release && sha256sum *.zip > SHA256SUMS.txt
+      - uses: softprops/action-gh-release@v2
+        with:
+          body_path: RELEASE_NOTES.md
+          files: |
+            release/*.zip
+            release/SHA256SUMS.txt

README.md

@@ -1,12 +1,16 @@
 # Pokemon DS Map Studio
 ![Java CI with Gradle](https://github.com/Trifindo/Pokemon-DS-Map-Studio/workflows/Java%20CI%20with%20Gradle/badge.svg?branch=master)
 
-Pokemon DS Map Studio is a tool for creating gen 4 and gen 5 Pokémon games' maps, designed to be used alongside SDSME.
+Pokemon DS Map Studio is a tool for creating NDS Pokémon maps, designed to be used alongside SDSME.
 
-It doesn't require 3D modeling, instead it provides a tilemap-like interface that is automatically converted in a 3D model.
-Note that this tool **DOES NOT** import maps from the original games, neither it can modify them.
+It doesn't require 3D modeling knowledge. Rather, it provides a tilemap-like interface that is automatically converted to a 3D model. Please note that this tool **DOES NOT** allow modification of maps from official games.
+
+
+
+### WARNING !
+As soon as you resave your existing PDSMAP files with this new version, backward compatibility with other PDSMS versions (including Trifindo's vanilla PDSMS) will most likely be lost. 
+This is due to the additional 3D layer, and the new "exportgroup" and "egcenter" keywords in PDSMAP files, necessary to make Export Groups work.
 
-![Screenshot of PDSMS](PDSMS_2_1.png)
 
 ### Supported games:
 - Pokemon Diamond/Pearl
@@ -16,21 +20,21 @@ Note that this tool **DOES NOT** import maps from the original games, neither it
 - Pokemon Black 2/ White 2
 
 ## Running
-For running Pokemon DS Map Studio, Java 8 must be installed in the computer.
+Pokemon DS Map Studio has been tested under Windows, Linux and MacOS.
+The Windows release includes a Java runtime and can be started with `Pokemon DS Map Studio.exe` without installing Java. The portable release requires Java 11 or newer.
 Pokemon DS Map Studio can be executed by double clicking the "PokemonDsMapStudio.jar" file. 
-The program is tested under Windows, macOS and Linux.
 
-If it doesn't open, try to open by opening a terminal and typing
+If it doesn't open, try typing the following command in a terminal:
 ```shell
 java -jar PokemonDSMapStudio.jar
 ```
 and look at the output.
-If you can't understand that, please open an issue in the appropriate section of this repository.
+If you don't fully understand that, please open an issue in the appropriate section of this repository.
 
 On Linux, the installation can be done directly in an automated way, just open a terminal and type:
 ```shell
-sh -c "$(wget -O- https://raw.githubusercontent.com/Trifindo/Pokemon-DS-Map-Studio/master/pdsms-linux.sh)"
+sh -c "$(wget -O- https://raw.githubusercontent.com/AdAstra-LD/Pokemon-DS-Map-Studio/master/pdsms-linux.sh)"
 ```
 
 ## Notes
-For exporting `.nsbmd` files, `g3dcvtr.exe` and `xerces-c_2_5_0.dll` must be placed int the `bin/converter` folder.
+If you wish to export `.nsbmd` files, place your legally obtained `g3dcvtr.exe` in the release's `converter` folder. The release creates this folder and includes the supporting DLL and setup instructions, but cannot redistribute `g3dcvtr.exe`.

RELEASE_NOTES.md

@@ -0,0 +1,115 @@
+# Pokemon DS Map Studio 2.3.1 - Enhanced Tools Release
+
+## Download and Packaging Improvements
+
+- Added a ready-to-run Windows package with its own Java runtime and `.exe` launcher.
+- Added a portable ZIP with Windows and Linux/macOS launch scripts.
+- Included the expected root-level `converter` folder, supporting DLL, and setup instructions.
+- Included README and release notes inside each distribution.
+- Added automated tagged releases and SHA-256 checksum generation.
+- `g3dcvtr.exe` remains user-supplied and is not redistributed.
+
+This release expands Pokemon DS Map Studio with new map-selection tools, Smart Drawing workflows, tile organization, portable metadata, and collision-default editing.
+
+## New Map Selection Tools
+
+- Rectangle selection
+- Lasso selection
+- Wand selection
+- Move selected tiles
+- Copy, cut, paste, duplicate, and delete selections
+- Rotate and flip selections
+- Fill a selection with the currently selected tile
+- Selection operations across map boundaries
+- Undo support for selection edits
+
+### Selection Shortcuts
+
+| Action | Shortcut |
+| --- | --- |
+| Select all | `Ctrl+A` |
+| Copy | `Ctrl+C` |
+| Cut | `Ctrl+X` |
+| Paste | `Ctrl+V` |
+| Fill selection | `Ctrl+F` |
+| Deselect | `Ctrl+D` |
+| Delete selection | `Delete` |
+
+Choose a selection tool from the main toolbar, select the required tiles, and then use the toolbar actions, keyboard shortcuts, or selection context menu.
+
+## Smart Tools
+
+- Smart freehand drawing with automatic edges and corners
+- Smart line drawing
+- Smart rectangle drawing
+- Smart circle drawing
+- Smart wand selection
+- Smart rotation and flipping
+- Inverted Smart Drawing shapes using the right mouse button
+- Smart Drawing templates generated from arranged folder tiles
+
+Select a Smart Drawing reference, enable **Smart Tools**, and use the normal drawing or shape tools on the map. Draw with the left mouse button for the standard form or the right mouse button for its inverted form.
+
+## Tile Folders
+
+- Create folders and nested subfolders
+- Arrange tiles in custom grid layouts
+- Keep empty layout spaces without creating placeholder tile IDs
+- Drag and drop tiles between folders
+- Move or remove tiles using the tile context menu
+- Pin folders for access while browsing long tilesets
+- Expand, collapse, resize, reorder, and scroll folders
+- Give folder tiles independent display sizes without changing game tile dimensions
+- Duplicate tile groups while preserving their folder arrangement
+- Organize Smart Drawing templates into expandable groups
+- Keep folder order independent from the game-facing **All Tiles** order
+
+Right-click a folder or tile in the Tile List to access its organization, layout, display-size, movement, import, and export commands. Folder layouts are available in both the main window and the Tileset Editor.
+
+## Portable Tile Metadata
+
+- Export individual folders as portable bundles
+- Import folders without replacing existing folder structures
+- Import bundles containing tiles that are not already in the destination tileset
+- Preserve folder hierarchy and layout slots
+- Preserve tile names and folder display sizes
+- Preserve collision defaults
+- Preserve Smart Drawing organization
+
+Use the folder context menu to export a folder bundle. Import the bundle into another compatible tileset to add its folder structure and included metadata.
+
+## Collision Defaults
+
+- Define collision defaults for both collision layers
+- Create collision footprints larger than a tile's game dimensions
+- Use folder display size as the collision-footprint reference
+- Paint or clear collision values one cell at a time
+- Fill or clear an entire collision layer
+- Copy and paste one collision layer
+- Copy and paste complete collision defaults
+- Edit collision defaults from tile context menus
+- Dedicated Collision Defaults workspace in the Tileset Editor
+- Automatically apply defaults while drawing with **Auto Coll.**
+
+Open the **Collision Defaults** tab in the Tileset Editor and select a tile from the Tile Selector. Choose a collision value, then left-click or drag to paint cells. Right-click a footprint cell to sample its collision value. Use **Copy Layer**, **Paste Layer**, **Copy All**, and **Paste All** to reuse settings efficiently.
+
+Enable **Auto Coll.** in the main map tools when collision defaults should be applied automatically as tiles are painted.
+
+## Tileset Editor Enhancements
+
+- Multi-tile selection follows the visible folder layout order
+- Move and organize folder tiles without changing **All Tiles** ordering
+- Duplicate selected tile arrangements into new layout space
+- Create Smart Drawing templates from selected folder layouts
+- Assign and remove multiple selected tiles from folders
+- Edit collision defaults while browsing the tileset
+
+Use the Tile Selector to choose one or more tiles. Folder-based selection and movement operate on the folder arrangement, while **All Tiles** continues to represent the tileset's game-data order.
+
+## Credits
+
+- **Pokemon DS Map Studio:** [AdAstra-LD](https://github.com/AdAstra-LD/Pokemon-DS-Map-Studio) and the original PDSMS contributors
+- **Enhanced tools and feature design:** [Trinsic64](https://github.com/Trinsic64)
+- **Development assistance:** Claude Code and OpenAI Codex
+
+Pokemon is a trademark of Nintendo, Creatures Inc., and GAME FREAK inc. This is an unofficial community project and is not affiliated with or endorsed by those companies.