Migration to dll spawner+ares+phobos

.gitattributes

@@ -1,9 +1,15 @@
+* text=crlf
+
 version text eol=crlf
 *.xdp text eol=crlf
 *.cfg text eol=crlf
 *.ini text eol=crlf
 *.map text eol=crlf
 *.txt text eol=crlf
+*.json text eol=crlf
 preupdateexec text eol=crlf
 updateexec text eol=crlf
 version text eol=crlf
+
+*.sh text eol=lf
+*.ps1 eol=lf

.github/workflows/deployment.yml

@@ -13,7 +13,7 @@ on:
   # Run when there is a release published
   release:
     types: [ published ]
-  
+
   # Allows for this workflow to be run manually
   workflow_dispatch:
 
@@ -40,7 +40,7 @@ jobs:
         run: npm ci
 
       # This step validates the format of the tag created, if this was a published release.
-      # Currently, it must be in the format "yr-X.Y" or "yr-X.Y.Z" 
+      # Currently, it must be in the format "yr-X.Y" or "yr-X.Y.Z"
       - name: Validate Tag Name
         if: github.event_name == 'release'
         working-directory: tools
@@ -61,14 +61,18 @@ jobs:
         # replace the second line in the file with the proper version number (X.Y.Z-dev.N)
         run: sed -i "2 s/.*/${{env.GitVersion_SemVer}}/" ./package/versionconfig.ini
 
+      - name: Pack Game Assets
+        working-directory: tools
+        run: npm run mix-packer
+
       - name: Version Writer
         working-directory: tools
         run: npm run version-writer
 
       # Create package archive
       - name: Create package artifact (tar)
         run: tar -C ./package -czvf package.tar.gz .
-        
+
       - name: Create package artifact (zip)
         run: 7z.exe a package.zip ./package
 
@@ -106,7 +110,7 @@ jobs:
         if: github.event_name == 'release'
         working-directory: tools
         run: npm run release-asset-uploader -- --token ${{ secrets.GITHUB_TOKEN }} --assetName "package_${{env.GitVersion_SemVer}} (zip)" --assetPath ../package.zip
-        
+
       # Upload installer to any relevant releases for current tag
       # If there is no release/tag, this will not do anything
       - name: Upload Installer Release Asset
@@ -156,7 +160,7 @@ jobs:
             tar -xzvf ${{ secrets.SSH_PATH_UPDATES }}/${{ needs.build-package.outputs.packageUploadVersion }}/package.tar.gz
             rm ${{ secrets.SSH_PATH_UPDATES }}/${{ needs.build-package.outputs.packageUploadVersion }}/package.tar.gz
             chmod 777 --recursive ${{ secrets.SSH_PATH_UPDATES }}/${{ needs.build-package.outputs.packageUploadVersion }}/*
-            
+
       # Create/update a mirror link for client update purposes, using the GitVersion pre release label as the link name.
       # See the file "GitVersion.yml" for more details on the name that will be used for a given branch.
       # Ex: if the branch name is "develop", it will create a link of "dev" to point to the directory "updates/X.Y.Z-dev".
@@ -175,6 +179,3 @@ jobs:
           script: |
             cd ${{ secrets.SSH_PATH_GAMES_YR }}
             ln -sfn updates/${{ needs.build-package.outputs.packageUploadVersion }} ${{ needs.build-package.outputs.mirrorLinkName }}
-
-
-

.gitignore

@@ -1,24 +1,49 @@
-/package/RA2MD.ini
-/package/Maps/Custom/*.zip
+/game-assets/**/*.mix
+
+/package/**/*.SAV
+/package/BINKW32.DLL
+/package/Blowfish.dll
+/package/Client/
+/package/cncnet.mix
+/package/ddraw.dll
+/package/ddraw.ini
+/package/debug/
+/package/langmd.mix
+/package/language.mix
+/package/Map Editor/**
 /package/Maps/Custom/*.map
 /package/Maps/Custom/*.png
 /package/Maps/Custom/*.yrm
-/package/version
+/package/Maps/Custom/*.zip
+/package/maps01.mix
+/package/maps02.mix
+/package/mapsmd03.mix
+/package/movies01.mix
+/package/movies02.mix
+/package/movmd03.mix
+/package/multi.mix
+/package/multimd.mix
+/package/QM/*.txt
 /package/Qt/QM/
-/package/VersionWriter.exe
+/package/ra2.mix
+/package/RA2MD.ini
+/package/RA2MD.ini
+/package/ra2md.mix
+/package/ra2mode.mix
+/package/Saved Games/*.SAV
+/package/spawn.ini
+/package/spawnmap.ini
+/package/syringe.log
+/package/theme.mix
+/package/thememd.mix
+/package/version
+/package/version_u
 /package/VersionWriter-CopiedFiles
-/logs
-/gitversion.json
-ddraw.dll
-ddraw.ini
-RA2MD.ini
-spawn.ini
-spawnmap.ini
-version_u
-/package/Client/
-.idea
+/package/VersionWriter.exe
+
 .idea/*
-/tools/node_modules
 /CnCNet5_YR_Installer.exe
+/gitversion.json
+/logs
 /package.tar.gz
-/Client/
+/tools/node_modules

README.md

@@ -29,7 +29,8 @@ You MUST edit the `YRSource` property in the `Directory.Build.Game.YR.props` fil
 ### Repository Structure
 
 - `package` - This directory contains the exact file structure that should make up the client package that is delivered to users.
-- `resources` - This directory contains any resources to assist in building the package, like other theming elements. For example, this directory contains various `expandspawn09.mix` files for custom crates. These `mix` files can be moved to the `package` directory when we want to change the crate theme.
+- `game-assets` - This directory contains game assets used by CnCNet. All child directories with a `.pack` extension will be packed at build time into `*.mix` archives. Parent `*.mix` will be moved to the `package` directory.
+- `resources` - This directory contains any resources to assist in building the package, like other theming elements.
 - `tools` - This directory contains tools that are used to help build the package. It includes tools like:
   - `download-artifacts/download-client.ps1` - A powershell script to automatically download a specific set of binaries of the `xna-cncnet-client`
   - `download-artifacts/download-client-launcher.ps1` - A powershell script to automatically download a specific instance of the client launcher.

README_Onboarding.md

@@ -1,7 +1,7 @@
 **How to contribute to this repository**
 1. Install git from `https://git-scm.com/`
 2. Download the  CnCNet YR Package repository code
-   - Create a directory anywhere on your local. 
+   - Create a directory anywhere on your local.
    - Right-click in directory select `git bash`, or navigate to the directory in terminal.
    - Enter `git clone https://github.com/CnCNet/cncnet-yr-client-package.git`
    - You now have the codebase on your local machine.
@@ -13,8 +13,8 @@
 1. Fetch latest code from repository and update your local code
     - From project terminal execute `git fetch`, `git pull`
     - Create a new branch from develop
-    
-    
+
+
 2. Prepare new maps and map images
     - Every map file has an accompanying map image with the same name.
     - Map file names should be as follows: `[num_players]_[mapName].map`, e.g. `2_hail_mary.map`, `2_hail_mary.png`
@@ -23,7 +23,7 @@
     - Map files should not have enhanced preview image and should be small in file size.
     - Map images should end in .png, should be x768 on longest side, should run through [TinyPNG](https://tinypng.com/) to shrink the image file size
 
-3. Add new map files to the project.  
+3. Add new map files to the project.
     - If the map is to be played on the ladder, place the map files and map images in `package\Maps\Yuri's Revenge\`
     - If the map is non-ladder, place it in appropriate folder. Battle, Mod Maps
 
@@ -32,10 +32,10 @@
     - Execute this script to automatically update `MpMaps.ini` for you. `\tools\mpmaps-updater\maps-updater.bat`
     - View the output of the bat file to see any warnings or errors.
     - Open MpMaps.ini and ensure each new map you have inserted is in the file, and double check the GameModes and details.
-    
+
 5. Commit and push
     - When all changes are ready, use git to add the files you added, then commit and push them.
     - Using git tools in the IDE is pretty useful for this stuff.
-    
+
 6. Create a pull request from your branch to `develop` at https://github.com/CnCNet/cncnet-yr-client-package/pulls
     - Once your code is merged, it is all ready to be updated in the client. There are separate steps to execute the client update with the latest code.

game-assets/cncnet.pack/TreesShadowFix/README.md

@@ -0,0 +1,17 @@
+# Trees Shadow Fix
+
+### Contributors
+
+-   Starkku
+
+### URL
+
+-   https://ppmforums.com/topic-35406
+
+### Description
+
+```
+Nothing huge really, just the trees from the unmodified game with duplicated frames to prevent the shadow from appearing as 'damaged artwork' (you might've noticed the cyan blobs sometimes appearing where a tree was previously standing) for all theaters, including some extra trees like the dead ones from desert for theaters like temperate and urban.
+
+Credit is not necessary but can do that if you feel like it.
+```