merge Sewer56/master into master

README-LOADER.md

@@ -17,10 +17,13 @@ For more information, [please visit the documentation](https://sewer56.dev/p5rpc
 - Support for hot reload (update files on the fly without game reboot).  
 - Automatically merges .tbl files.  
 - Automatically merges PAK (.bin) files.  
-- Automatically merges .bf and .bmd files  
+- Automatically merges .bf files.  
+- Automatically merges .spd files.  
 
 # Special Thanks
 
 - Lipsum (zarroboogs): Original Implementation  
 - CherryCreamSoda: Project Logo  
 - Shujynx, Covfefe: Mod Test Data  
+- AnimatedSwine37: PAK Merging  
+- Secre-C: SPD Merging  

README.md

@@ -22,7 +22,9 @@ For more information, [please visit the documentation](https://sewer56.dev/p5rpc
 - Support for hot reload (update files on the fly without game reboot).  
 - Automatically merges .tbl files.  
 - Automatically merges PAK (.bin) files.  
-- Automatically merges .bf files  
+- Automatically merges .bf files.   
+- Automatically merges .bmd files.
+- Automatically merges .spd files.  
 
 # Building
 
@@ -38,3 +40,6 @@ When you build your project, the files will automatically be copied to the right
 - Lipsum (zarroboogs): Original Implementation  
 - CherryCreamSoda: Project Logo  
 - Shujynx, Covfefe: Mod Test Data  
+- AnimatedSwine37: PAK and BF Merging  
+- Secre-C: SPD Merging  
+- oceanstuck: BMD Merging

docs/index.md

@@ -19,8 +19,9 @@ Persona Essentials is a set of miscellaneous improvements for Persona 3 Portable
 - Support for injecting custom music into the game without extracting files.  
 - Support for hot reload (update files on the fly without game reboot).  
 - Automatically merges .tbl files.  
-- Automatically merges PAK (.bin) files.
-- Automatically merges .bf files
+- Automatically merges PAK (.bin) files.  
+- Automatically merges .bf files.  
+- Automatically merges .spd files.  
 
 # Building
 
@@ -41,3 +42,5 @@ Refer to the [usage section](./usage.md).
 - Lipsum (zarroboogs): Original Implementation  
 - CherryCreamSoda: Project Logo  
 - Shujynx, Covfefe: Mod Test Data  
+- AnimatedSwine37: PAK Merging  
+- Secre-C: SPD Merging  

docs/usage.md

@@ -133,7 +133,7 @@ Then you would put your `.flow` or `.msg` file with the same name in `FEmulator\
 
 ![BFLooseExample2](./images/BFLooseExample2.png)
 
-### Example - BF In Archivee
+### Example - BF In Archive
 To edit `f007.bf` in the archive `field\pack\fd007_003.arc` you would first add a dummy bf file in `FEmulator\PAK\field\pack\fd007_003.arc` (as per [the information above](#replacing-files-in-archives))
 
 ![BFPakedExample1](./images/BFPakedExample1.png)
@@ -191,10 +191,45 @@ In P3P and P4G `MSG.TBL` contains an embedded bmd file. To edit this place your
 
     When BMD emulator releases you will be able to use it to edit only individual messages in this (and other) bmds, for now though you will have to replace the entire file.
 
+## Editing SPD Files
+
+!!! info
+
+    Essentials can be used to edit textures and sprites in SPD files such that multiple mods can edit sprites in the same texture.
+
+[Uses FileRedirectionFramework under the hood, follow instructions here for more information.](https://sewer56.dev/FileEmulationFramework/emulators/spd.html)  
+Don't add dependency on SPD emulator (it's not necessary), but do follow rest of guide.
+
+In addition to the sprite entry files `(.spdspr/.sprt)` and/or textures `(.dds/.tmx)` files you include in `FEmulator\SPD` per the above guide you may need to add dummy spd files where they would normally go in `FEmulator\PAK` (only if the spd you're editing is located in an archive).
+
+### Example - Loose SPD
+
+To edit the loose `CHAT.SPD` file in `FONT\CHAT` you would first create a directory mimicking the path of the spd in `FEmulator\SPD`, including the spds filename.
+
+![SpdLooseExample1](./images/SpdLooseExample1.png)
+
+Then you would put your sprite entry and/or texture files in `FEmulator\SPD\FONT\CHAT\CHAT.SPD\`
+
+![SpdLooseExample2](./images/SpdLooseExample2.png)
+
+### Example - SPD in archive
+
+!!! info
+
+    To create a dummy spd file you can create a new empty text file and just rename it, changing the file extension.
+
+To edit `higawari_common.spd` in the archive `CALENDAR\HIGAWARI.PAK` you would first add a dummy spd file in `FEmulator\PAK\CALENDAR\HIGAWARI.PAK` (as per [the information above](#replacing-files-in-archives))
+
+![SpdPakedExample1](./images/SpdPakedExample1.png)
+
+Then follow the steps for loose spds.
+
+![SpdPakedExample2](./images/SpdPakedExample2.png)
+
 ## Releasing/Uploading your Mods
 
 Please refer to the [Reloaded wiki](https://reloaded-project.github.io/Reloaded-II/EnablingUpdateSupport/), and follow the guidance.  
 
 You should both Enable Update Support AND Publish according to the guidelines.  
 
-It is recommended to enable update support even if you don't plan to ship updates as [doing so will allow your mod to be used in Mod Packs.](https://reloaded-project.github.io/Reloaded-II/CreatingModPacks/)
+It is recommended to enable update support even if you don't plan to ship updates as [doing so will allow your mod to be used in Mod Packs.](https://reloaded-project.github.io/Reloaded-II/CreatingModPacks/)

global.json

@@ -0,0 +1,6 @@
+{
+    "sdk": {
+      "version": "7.0.100",
+      "rollForward": "latestFeature"
+    }
+}

p5rpc.modloader.sln

@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "p5rpc.modloader", "p5rpc.modloader\p5rpc.modloader.csproj", "{6F4B205B-ABF6-4A29-BD48-03E18C769813}"
+	ProjectSection(ProjectDependencies) = postProject
+		{425E6521-F58A-46D4-AD08-30006C929C7C} = {425E6521-F58A-46D4-AD08-30006C929C7C}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Persona.Merger.Common", "Persona.Merger.Common\Persona.Merger.Common.csproj", "{7915AEFD-7E09-4C1A-AF09-14235225975E}"
 EndProject
@@ -21,6 +24,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PAK.Stream.Emulator.Interfa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileEmulationFramework.Lib", "Submodules\FileEmulationFramework\FileEmulationFramework.Lib\FileEmulationFramework.Lib.csproj", "{3D9C1C67-FFB1-48D0-87B0-17D15AA93E00}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPD.File.Emulator.Interfaces", "Submodules\FileEmulationFramework\Emulator\Interfaces\SPD.File.Emulator.Interfaces\SPD.File.Emulator.Interfaces.csproj", "{73CFF175-8E6A-4C31-8D10-D05B8D64755E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BMD.File.Emulator.Interfaces", "Submodules\FileEmulationFramework\Emulator\Interfaces\Bmd.File.Emulator.Interfaces\BMD.File.Emulator.Interfaces.csproj", "{7457A314-6852-4ADA-B266-264BD7510C11}"
 EndProject
 Global
@@ -65,6 +70,10 @@ Global
 		{7457A314-6852-4ADA-B266-264BD7510C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7457A314-6852-4ADA-B266-264BD7510C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7457A314-6852-4ADA-B266-264BD7510C11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73CFF175-8E6A-4C31-8D10-D05B8D64755E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73CFF175-8E6A-4C31-8D10-D05B8D64755E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73CFF175-8E6A-4C31-8D10-D05B8D64755E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73CFF175-8E6A-4C31-8D10-D05B8D64755E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -75,6 +84,7 @@ Global
 		{66B0D482-C88B-483F-995F-32F3308C7859} = {D0885FA9-1AF6-4CB1-8CED-E49AC9F99EC0}
 		{3D9C1C67-FFB1-48D0-87B0-17D15AA93E00} = {D0885FA9-1AF6-4CB1-8CED-E49AC9F99EC0}
 		{7457A314-6852-4ADA-B266-264BD7510C11} = {D0885FA9-1AF6-4CB1-8CED-E49AC9F99EC0}
+		{73CFF175-8E6A-4C31-8D10-D05B8D64755E} = {D0885FA9-1AF6-4CB1-8CED-E49AC9F99EC0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {56D65FA2-2A48-49CB-BA59-C44FDDB11E8D}