From d8d9bf721051f08d4b612c1e58764df336dfdced Mon Sep 17 00:00:00 2001
From: SuperSamus <40663462+SuperSamus@users.noreply.github.com>
Date: Sat, 27 Jul 2024 13:44:16 +0200
Subject: [PATCH] [Skylanders Spyro's Adventure] Move new pack to /src (#638)

Thanks to @SuperSamus for these changes!
---
 SkylandersSpyrosAdventure/Graphics/rules.txt  | 149 ----------
 SkylandersSpyrosAdventure/Mods/FPS/rules.txt  |  77 ------
 .../Graphics/rules.txt                        | 255 ++++++++++--------
 .../Mods/FPS/rules.txt                        |   4 +-
 4 files changed, 151 insertions(+), 334 deletions(-)
 delete mode 100644 SkylandersSpyrosAdventure/Graphics/rules.txt
 delete mode 100644 SkylandersSpyrosAdventure/Mods/FPS/rules.txt

diff --git a/SkylandersSpyrosAdventure/Graphics/rules.txt b/SkylandersSpyrosAdventure/Graphics/rules.txt
deleted file mode 100644
index 82a83f062..000000000
--- a/SkylandersSpyrosAdventure/Graphics/rules.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-[Definition]
-titleIds = 0005000010142D00
-name = Resolution V2
-path = "Skylanders: Spyro's Adventure/Graphics"
-description = Changes the resolution of the game. Gamepad will only function with base resolution. Using the seperate gamepad view impacts game performance.||Made by Mr.Blinker
-version = 6
-
-[Default]
-$tvWidth = 1280
-$tvHeight = 720
-$gamepadWidth = 854
-$gamepadHeight = 480
-$gameWidth = 1280
-$gameHeight = 720
-$shadowRes = 1
-
-# TV Resolution
-
-[Preset]
-category = Resolution
-name = 1280x720 (Default)
-$tvWidth = 1280
-$tvHeight = 720
-
-[Preset]
-category = Resolution
-name = 640x360
-$tvWidth = 640
-$tvHeight = 360
-
-[Preset]
-category = Resolution
-name = 960x540
-$tvWidth = 960
-$tvHeight = 540
-
-[Preset]
-category = Resolution
-name = 1600x900
-$tvWidth = 1600
-$tvHeight = 900
-
-[Preset]
-category = Resolution
-name = 1920x1080
-$tvWidth = 1920
-$tvHeight = 1080
-
-[Preset]
-category = Resolution
-name = 2560x1440
-$tvWidth = 2560
-$tvHeight = 1440
-
-[Preset]
-category = Resolution
-name = 3200x1800
-$tvWidth = 3200
-$tvHeight = 1800
-
-[Preset]
-category = Resolution
-name = 3840x2160
-$tvWidth = 3840
-$tvHeight = 2160
-
-[Preset]
-category = Resolution
-name = 5120x2880
-$tvWidth = 5120
-$tvHeight = 2880
-
-[Preset]
-category = Resolution
-name = 7680x4320
-$tvWidth = 7680
-$tvHeight = 4320
-
-# Gamepad Resolution
-
-[Preset]
-name = 854x480 (Default)
-category = Gamepad Resolution
-$gamepadWidth = 854
-$gamepadHeight = 480
-
-
-# Shadow Quality
-
-[Preset]
-category = Shadow Quality
-name = Medium (100%, Default)
-
-[Preset]
-category = Shadow Quality
-name = Low (50%)
-$shadowRes = 0.5
-
-[Preset]
-category = Shadow Quality
-name = High (200%)
-$shadowRes = 2
-
-[Preset]
-category = Shadow Quality
-name = Ultra (300%)
-$shadowRes = 3
-
-[Preset]
-category = Shadow Quality
-name = Extreme (400%)
-$shadowRes = 4
-
-# Texture Redefines
-
-[TextureRedefine] # Game output and hud resolution
-width = 1280
-height = 720
-formats = 0x01a,0x011
-overwriteWidth = ($tvWidth/$gameWidth) * 1280
-overwriteHeight = ($tvHeight/$gameHeight) * 720
-
-[TextureRedefine] # Gamepad resolution
-width = 864
-height = 480
-formats = 0x01a
-overwriteWidth = $gamepadWidth
-overwriteHeight = $gamepadHeight
-
-[TextureRedefine] # Stage rendering
-width = 1024
-height = 576
-formats = 0x01a,0x011,0x80e
-overwriteWidth = ($tvWidth/$gameWidth) * 1024
-overwriteHeight = ($tvHeight/$gameHeight) * 576
-
-[TextureRedefine] # Squashed/bloom alt viewport
-width = 512
-height = 576
-formats = 0x01a,0x80e,0x011
-overwriteWidth = ($tvWidth/$gameWidth) * 512
-overwriteHeight = ($tvHeight/$gameHeight) * 576
-
-[TextureRedefine] # Half-res viewport depth, blur and bloom
-width = 512
-height = 288
-formats = 0x01a,0x80e,0x011
-overwriteWidth = ($tvWidth/$gameWidth) * 512
-overwriteHeight = ($tvHeight/$gameHeight) * 288
diff --git a/SkylandersSpyrosAdventure/Mods/FPS/rules.txt b/SkylandersSpyrosAdventure/Mods/FPS/rules.txt
deleted file mode 100644
index b2d57a102..000000000
--- a/SkylandersSpyrosAdventure/Mods/FPS/rules.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-[Definition]
-titleIds = 0005000010142d00
-name = FPS V2
-path = "Skylanders: Spyro's Adventure/Mods/FPS"
-description = Changes the game's dynamic FPS target. Might increase the chance of issues with scanning figures.||Made by Mr.Blinker
-version = 6
-
-[Default]
-$targetFPS:int = 60
-
-
-# FPS Limit
-
-
-[Preset]
-name= 244 FPS
-category = FPS Limit
-$targetFPS:int = 244
-
-[Preset]
-name= 165 FPS
-category = FPS Limit
-$targetFPS:int = 165
-
-[Preset]
-name = 144 FPS
-category = FPS Limit
-$targetFPS:int = 144
-
-[Preset]
-name = 120 FPS
-category = FPS Limit
-$targetFPS:int = 120
-
-[Preset]
-name = 100 FPS
-category = FPS Limit
-$targetFPS:int = 100
-
-[Preset]
-name = 85 FPS
-category = FPS Limit
-$targetFPS:int = 85
-
-[Preset]
-name = 75 FPS
-category = FPS Limit
-$targetFPS:int = 75
-
-[Preset]
-name = 72 FPS
-category = FPS Limit
-$targetFPS:int = 72
-
-[Preset]
-name = 60 FPS
-category = FPS Limit
-default = 1
-
-[Preset]
-name = 40 FPS
-category = FPS Limit
-$targetFPS:int = 40
-
-[Preset]
-name = 30 FPS
-category = FPS Limit
-$targetFPS:int = 30
-
-[Preset]
-name = 20 FPS
-category = FPS Limit
-$targetFPS:int = 20
-
-
-[Control]
-vsyncFrequency = $targetFPS
diff --git a/src/SkylandersSpyrosAdventure/Graphics/rules.txt b/src/SkylandersSpyrosAdventure/Graphics/rules.txt
index f837e02bb..82a83f062 100644
--- a/src/SkylandersSpyrosAdventure/Graphics/rules.txt
+++ b/src/SkylandersSpyrosAdventure/Graphics/rules.txt
@@ -1,106 +1,149 @@
-[Definition]
-titleIds = 0005000010142D00
-name = Resolution
-path = "Skylanders: Spyro's Adventure/Graphics"
-description = Changes the resolution of the game.
-version = 6
-
-[Default]
-$width = 1280
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-
-# Resolution
-
-[Preset]
-category = Resolution
-name = 640x360
-$width = 640
-$height = 360
-
-[Preset]
-category = Resolution
-name = 960x540
-$width = 960
-$height = 540
-
-[Preset]
-category = Resolution
-name = 1280x720 (Default)
-default = 1
-
-[Preset]
-category = Resolution
-name = 1600x900
-$width = 1600
-$height = 900
-
-[Preset]
-category = Resolution
-name = 1920x1080
-$width = 1920
-$height = 1080
-
-[Preset]
-category = Resolution
-name = 2560x1440
-$width = 2560
-$height = 1440
-
-[Preset]
-category = Resolution
-name = 3200x1800
-$width = 3200
-$height = 1800
-
-[Preset]
-category = Resolution
-name = 3840x2160
-$width = 3840
-$height = 2160
-
-[Preset]
-category = Resolution
-name = 5120x2880
-$width = 5120
-$height = 2880
-
-[Preset]
-category = Resolution
-name = 7680x4320
-$width = 7680
-$height = 4320
-
-
-[TextureRedefine]
-width = 1280
-height = 720
-overwriteWidth = ($width/$gameWidth) * 1280
-overwriteHeight = ($height/$gameHeight) * 720
-
-[TextureRedefine]
-width = 864
-height = 480
-overwriteWidth = ($width/$gameWidth) * 864
-overwriteHeight  = ($height/$gameHeight) * 480
-
-[TextureRedefine]
-width = 854
-height = 480
-formatsExcluded = 0x031
-overwriteWidth = ($width/$gameWidth) * 854
-overwriteHeight  = ($height/$gameHeight) * 480
-
-[TextureRedefine]
-width = 640
-height = 360
-overwriteWidth = ($width/$gameWidth) * 640
-overwriteHeight  = ($height/$gameHeight) * 360
-
-[TextureRedefine]
-width = 640
-height = 368
-overwriteWidth = ($width/$gameWidth) * 640
-overwriteHeight  = ($height/$gameHeight) * 368
+[Definition]
+titleIds = 0005000010142D00
+name = Resolution V2
+path = "Skylanders: Spyro's Adventure/Graphics"
+description = Changes the resolution of the game. Gamepad will only function with base resolution. Using the seperate gamepad view impacts game performance.||Made by Mr.Blinker
+version = 6
+
+[Default]
+$tvWidth = 1280
+$tvHeight = 720
+$gamepadWidth = 854
+$gamepadHeight = 480
+$gameWidth = 1280
+$gameHeight = 720
+$shadowRes = 1
+
+# TV Resolution
+
+[Preset]
+category = Resolution
+name = 1280x720 (Default)
+$tvWidth = 1280
+$tvHeight = 720
+
+[Preset]
+category = Resolution
+name = 640x360
+$tvWidth = 640
+$tvHeight = 360
+
+[Preset]
+category = Resolution
+name = 960x540
+$tvWidth = 960
+$tvHeight = 540
+
+[Preset]
+category = Resolution
+name = 1600x900
+$tvWidth = 1600
+$tvHeight = 900
+
+[Preset]
+category = Resolution
+name = 1920x1080
+$tvWidth = 1920
+$tvHeight = 1080
+
+[Preset]
+category = Resolution
+name = 2560x1440
+$tvWidth = 2560
+$tvHeight = 1440
+
+[Preset]
+category = Resolution
+name = 3200x1800
+$tvWidth = 3200
+$tvHeight = 1800
+
+[Preset]
+category = Resolution
+name = 3840x2160
+$tvWidth = 3840
+$tvHeight = 2160
+
+[Preset]
+category = Resolution
+name = 5120x2880
+$tvWidth = 5120
+$tvHeight = 2880
+
+[Preset]
+category = Resolution
+name = 7680x4320
+$tvWidth = 7680
+$tvHeight = 4320
+
+# Gamepad Resolution
+
+[Preset]
+name = 854x480 (Default)
+category = Gamepad Resolution
+$gamepadWidth = 854
+$gamepadHeight = 480
+
+
+# Shadow Quality
+
+[Preset]
+category = Shadow Quality
+name = Medium (100%, Default)
+
+[Preset]
+category = Shadow Quality
+name = Low (50%)
+$shadowRes = 0.5
+
+[Preset]
+category = Shadow Quality
+name = High (200%)
+$shadowRes = 2
+
+[Preset]
+category = Shadow Quality
+name = Ultra (300%)
+$shadowRes = 3
+
+[Preset]
+category = Shadow Quality
+name = Extreme (400%)
+$shadowRes = 4
+
+# Texture Redefines
+
+[TextureRedefine] # Game output and hud resolution
+width = 1280
+height = 720
+formats = 0x01a,0x011
+overwriteWidth = ($tvWidth/$gameWidth) * 1280
+overwriteHeight = ($tvHeight/$gameHeight) * 720
+
+[TextureRedefine] # Gamepad resolution
+width = 864
+height = 480
+formats = 0x01a
+overwriteWidth = $gamepadWidth
+overwriteHeight = $gamepadHeight
+
+[TextureRedefine] # Stage rendering
+width = 1024
+height = 576
+formats = 0x01a,0x011,0x80e
+overwriteWidth = ($tvWidth/$gameWidth) * 1024
+overwriteHeight = ($tvHeight/$gameHeight) * 576
+
+[TextureRedefine] # Squashed/bloom alt viewport
+width = 512
+height = 576
+formats = 0x01a,0x80e,0x011
+overwriteWidth = ($tvWidth/$gameWidth) * 512
+overwriteHeight = ($tvHeight/$gameHeight) * 576
+
+[TextureRedefine] # Half-res viewport depth, blur and bloom
+width = 512
+height = 288
+formats = 0x01a,0x80e,0x011
+overwriteWidth = ($tvWidth/$gameWidth) * 512
+overwriteHeight = ($tvHeight/$gameHeight) * 288
diff --git a/src/SkylandersSpyrosAdventure/Mods/FPS/rules.txt b/src/SkylandersSpyrosAdventure/Mods/FPS/rules.txt
index 031d9f0f6..b2d57a102 100644
--- a/src/SkylandersSpyrosAdventure/Mods/FPS/rules.txt
+++ b/src/SkylandersSpyrosAdventure/Mods/FPS/rules.txt
@@ -1,8 +1,8 @@
 [Definition]
 titleIds = 0005000010142d00
-name = FPS
+name = FPS V2
 path = "Skylanders: Spyro's Adventure/Mods/FPS"
-description = Changes the game's dynamic FPS target. Might increase the chance of issues with scanning figures.||Made by Mew00.
+description = Changes the game's dynamic FPS target. Might increase the chance of issues with scanning figures.||Made by Mr.Blinker
 version = 6
 
 [Default]