Merge pull request #3 from UndeadZeratul/develop

v0.3.0
UndeadZeratul · Jan 2, 2024 · c361c8b · c361c8b
2 parents 92e86ff + 036ef83
commit c361c8b
Show file tree

Hide file tree

Showing 80 changed files with 485 additions and 313 deletions.
diff --git a/LANGUAGE.en b/LANGUAGE.en
diff --git a/LANGUAGE.merchant.en b/LANGUAGE.merchant.en
diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ _Extended Mag addon: Sonik.O_
 The Blooper has been swapped out for a Break-Action Grenade Launcher by Sonik.O.
 
 ![blooper](./screenshots/blooper.png)  
-_Credits: TommyGalano5, Sonik.O_
+_Credits: Sonik.O_
 
 #### Brontornis
 The Brontornis Rifle has been swapped out for something with a bit better perspective, as well as fitting the overall aesthetic of the rest of the pack.
@@ -147,6 +147,12 @@ The BFG-9000 Has been swapped out for one that still feels like a BFG, but one t
 ![bfg-9000](./screenshots/bfg-9000.png)  
 _Credits: Sonik.O, 3D Realms_
 
+#### Altis O/U Shotgun
+The Altis O/U Shotgun has had its reloading frames swapped out with a fresh set made by TommyGalano5.
+
+![altis](./screenshots/altis.png)
+_Credits: TommyGalano5_
+
 #### 10mm Pistol
 _Requires [Radtech Weapons Pack](https://github.com/swampyrad/RadTechWeaponsPack)_
 
@@ -320,7 +326,8 @@ By way of the other replacements, the Squad Summoner has thus also been updated.
 _Credits:_  
 _Garrison Armor ([DRLA Credits](#DRLA-Credits)): SoloSpaghetti ([DRLA](https://forum.zdoom.org/viewtopic.php?t=37044))_  
 _Liberator: Matt & Combine Kegan_  
-_Shield Core: Sonik.O_
+_Shield Core: Sonik.O_  
+_Dogtags: TedTheDragon_
 
 #### HUD Helmet
 _Requires [Hideous Helmet](https://forum.zdoom.org/viewtopic.php?f=43&t=71950)_

diff --git a/TEXTURES.altis b/TEXTURES.altis
@@ -0,0 +1,28 @@
+// Texture definitions generated by SLADE3
+// on Thu Nov 16 19:07:08 2023
+
+Sprite "GOLLD0", 273, 95
+{
+	Offset 17, -100
+	Patch "GOLRA0", 0, 0
+}
+
+Sprite "GOLLG0", 157, 171
+{
+	Offset -3, -43
+	Patch "GOLLC0", 0, 0
+}
+
+Sprite "GOLLL0", 273, 95
+{
+	Offset 17, -100
+	Patch "GOLLD0", 0, 0
+}
+
+Sprite "GOLLM0", 89, 140
+{
+	Offset -92, -51
+	Patch "GOLLB0", 0, 0
+}
+
+// End of texture definitions
diff --git a/TEXTURES.hhx b/TEXTURES.hhx
@@ -1,5 +1,5 @@
 // Texture definitions generated by SLADE3
-// on Fri May 26 11:02:55 2023
+// on Fri Dec 15 08:37:02 2023
 
 Graphic "ARMOURG0", 31, 20
 {
@@ -138,4 +138,21 @@ Graphic "SHIELDD0", 15, 17
 	Patch "BON2D0", 0, 0
 }
 
+Graphic "BUXCNTR0", 72, 21
+{
+	XScale 4.000
+	YScale 4.000
+	Patch "MBCKA0", 0, 0
+}
+
+Graphic "BUXCNTR1", 72, 21
+{
+	XScale 4.000
+	YScale 4.000
+	Patch "BUXCNTR0", 0, 0
+	{
+		Translation "0:255=%[0.00,0.00,0.00]:[0.30,0.14,0.00]"
+	}
+}
+
 // End of texture definitions
diff --git a/TEXTURES.pistol b/TEXTURES.pistol
@@ -1,11 +1,29 @@
 // Texture definitions generated by SLADE3
-// on Fri Oct  6 18:55:27 2023
+// on Thu Dec 28 11:40:02 2023
 
-Sprite "PISFA0", 30, 27
+Sprite "PI1GA0", 79, 72
 {
-	Offset -146, -82
+	Offset -104, -99
+	Patch "PISGA0", 0, 0
+}
+
+Sprite "PI1GB0", 61, 77
+{
+	Offset -125, -93
+	Patch "PISGB0", 0, 0
+}
+
+Sprite "PI1GC0", 61, 85
+{
+	Offset -126, -87
+	Patch "PISGC0", 0, 0
+}
+
+Sprite "PI1FA0", 30, 27
+{
+	Offset -145, -82
 	Patch "PISFIRA0", 0, 1
-	Patch "PISGB0", -12, 11
+	Patch "PISGB0", -20, 11
 	{
 		Style Modulate
 	}
@@ -16,11 +34,29 @@ Sprite "PISFA0", 30, 27
 	}
 }
 
+Sprite "PI2GA0", 79, 72
+{
+	Offset -137, -99
+	Patch "PI2GA0", 0, 0
+}
+
+Sprite "PI2GB0", 61, 77
+{
+	Offset -134, -93
+	Patch "PI2GB0", 0, 0
+}
+
+Sprite "PI2GC0", 61, 85
+{
+	Offset -133, -87
+	Patch "PI2GC0", 0, 0
+}
+
 Sprite "PI2FA0", 30, 27
 {
-	Offset -146, -82
+	Offset -145, -82
 	Patch "PISFIRA0", 0, 1
-	Patch "PI2GB0", -21, 11
+	Patch "PI2GB0", -11, 11
 	{
 		Style Modulate
 	}

diff --git a/TEXTURES.six12 b/TEXTURES.six12
@@ -1,9 +1,9 @@
 // Texture definitions generated by SLADE3
-// on Wed Feb  8 19:52:02 2023
+// on Sat Nov 11 16:40:38 2023
 
 Sprite "STMBA0", 11, 8
 {
-	Offset 5, 8
+	Offset 6, 8
 	Patch "STWLSHL", -1, 5
 	Patch "STWLSHL", -1, 0
 	Patch "STWLSHL", -1, 3
@@ -87,7 +87,7 @@ Graphic "STMBI0", 19, 21
 
 Sprite "STMSA0", 11, 8
 {
-	Offset 5, 8
+	Offset 6, 8
 	Patch "STWLSHL", -1, 5
 	Patch "STWLSHL", -1, 0
 	Patch "STWLSHL", -1, 3
@@ -201,4 +201,28 @@ Sprite "STSFA0", 57, 17
 	Patch "STMSB0", 4, 4
 }
 
+Sprite "STLGA0", 86, 71
+{
+	XScale 1.300
+	YScale 1.300
+	Offset -156, -148
+	Patch "STLGA0", 0, 0
+}
+
+Sprite "STLGB0", 86, 71
+{
+	XScale 1.200
+	YScale 1.200
+	Offset -140, -138
+	Patch "STLGA0", 0, 0
+}
+
+Sprite "STLFA0", 80, 54
+{
+	XScale 1.200
+	YScale 1.200
+	Offset -153, -102
+	Patch "STLFA0", 0, 0
+}
+
 // End of texture definitions
diff --git a/TEXTURES.squadsummoner b/TEXTURES.squadsummoner
@@ -1,15 +1,19 @@
 // Texture definitions generated by SLADE3
-// on Fri May  5 11:25:18 2023
+// on Tue Oct 31 09:51:51 2023
 
-Sprite "PRIFA0", 57, 24
+Sprite "PRIFA0", 57, 32
 {
-	Offset 22, 21
-	Patch "ARM1A0", 6, 0
+	Offset 22, 30
+	Patch "ARM1A0", 6, 10
 	{
 		Translation "112:117=144:151", "118:124=108:111"
 	}
-	Patch "BRLLD0", 0, 7
-	Patch "BON2A0", 4, 7
+	Patch "BRLLD0", 0, 17
+	Patch "PLHELMA0", 11, 0
+	{
+		FlipX
+	}
+	Patch "BON2A0", 4, 15
 }
 
 // End of texture definitions
diff --git a/TEXTURES.usp b/TEXTURES.usp
@@ -1,28 +1,28 @@
 // Texture definitions generated by SLADE3
-// on Thu Jul 27 19:42:44 2023
+// on Sat Nov 11 16:23:32 2023
 
-Sprite "USPFA0", 116, 144
+Sprite "USPFA0", 38, 90
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -135, -91
+	Offset -173, -91
 	Patch "USPFA0", 0, 0
 }
 
-Sprite "USPGA0", 116, 119
+Sprite "USPGA0", 117, 119
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -116
+	Offset -135, -116
 	Patch "USPGA0", 0, 0
 }
 
 Sprite "USPGB0", 116, 119
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -120
-	Patch "USPGB0", 0, 0
+	Offset -135, -116
+	Patch "USPGA0", 0, 0
 }
 
 Sprite "USPGY0", 27, 19
@@ -68,51 +68,51 @@ Graphic "USPMGREY", 6, 13
 	}
 }
 
-Sprite "USPRA0", 116, 119
+Sprite "USPRA0", 99, 119
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -116
+	Offset -152, -116
 	Patch "USRAA0", 0, 0
 }
 
-Sprite "USPRB0", 116, 119
+Sprite "USPRB0", 96, 119
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -116
+	Offset -155, -116
 	Patch "USRBA0", 0, 0
 }
 
-Sprite "USPRC0", 116, 119
+Sprite "USPRC0", 76, 119
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -116
+	Offset -175, -116
 	Patch "USRCA0", 0, 0
 }
 
-Sprite "USPEA0", 116, 119
+Sprite "USPEA0", 99, 118
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -116
+	Offset -152, -116
 	Patch "USRAD0", 0, 0
 }
 
-Sprite "USPEB0", 116, 119
+Sprite "USPEB0", 96, 118
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -116
+	Offset -155, -116
 	Patch "USRBD0", 0, 0
 }
 
-Sprite "USPEC0", 116, 119
+Sprite "USPEC0", 76, 118
 {
 	XScale 1.200
 	YScale 1.200
-	Offset -138, -116
+	Offset -175, -116
 	Patch "USRCD0", 0, 0
 }
 

diff --git a/brightmaps/auto/pisga0.png → brightmaps/auto/PI2GA0.png b/brightmaps/auto/pisga0.png → brightmaps/auto/PI2GA0.png
diff --git a/brightmaps/auto/pisgb0.png → brightmaps/auto/PI2GB0.png b/brightmaps/auto/pisgb0.png → brightmaps/auto/PI2GB0.png
diff --git a/brightmaps/auto/pisgc0.png → brightmaps/auto/PI2GC0.png b/brightmaps/auto/pisgc0.png → brightmaps/auto/PI2GC0.png
diff --git a/brightmaps/auto/pi2ga0.png → brightmaps/auto/PISGA0.png b/brightmaps/auto/pi2ga0.png → brightmaps/auto/PISGA0.png
diff --git a/brightmaps/auto/pi2gb0.png → brightmaps/auto/PISGB0.png b/brightmaps/auto/pi2gb0.png → brightmaps/auto/PISGB0.png
diff --git a/brightmaps/auto/pi2gc0.png → brightmaps/auto/PISGC0.png b/brightmaps/auto/pi2gc0.png → brightmaps/auto/PISGC0.png
diff --git a/brightmaps/auto/pista0.png → brightmaps/auto/PISTA0.png b/brightmaps/auto/pista0.png → brightmaps/auto/PISTA0.png
diff --git a/brightmaps/auto/pistb0.png → brightmaps/auto/PISTB0.png b/brightmaps/auto/pistb0.png → brightmaps/auto/PISTB0.png
diff --git a/brightmaps/auto/PUP2A0.png b/brightmaps/auto/PUP2A0.png
diff --git a/brightmaps/auto/PUP2B0.png b/brightmaps/auto/PUP2B0.png
diff --git a/brightmaps/auto/PUP2C0.png b/brightmaps/auto/PUP2C0.png
diff --git a/brightmaps/auto/PUPGA0.png b/brightmaps/auto/PUPGA0.png
diff --git a/brightmaps/auto/PUPGB0.png b/brightmaps/auto/PUPGB0.png
diff --git a/brightmaps/auto/PUPGC0.png b/brightmaps/auto/PUPGC0.png
diff --git a/brightmaps/auto/USPGA0.png b/brightmaps/auto/USPGA0.png
diff --git a/brightmaps/auto/USPGB0.png b/brightmaps/auto/USPGB0.png
diff --git a/brightmaps/auto/USPGC0.png b/brightmaps/auto/USPGC0.png
diff --git a/patches/USP-45/USPFA0.png b/patches/USP-45/USPFA0.png
diff --git a/patches/USP-45/USPGA0.png b/patches/USP-45/USPGA0.png
diff --git a/patches/USP-45/USPGB0.png b/patches/USP-45/USPGB0.png
diff --git a/patches/USP-45/USPGC0.png b/patches/USP-45/USPGC0.png
diff --git a/patches/USP-45/USRAA0.png b/patches/USP-45/USRAA0.png
diff --git a/patches/USP-45/USRAD0.png b/patches/USP-45/USRAD0.png
diff --git a/patches/USP-45/USRBA0.png b/patches/USP-45/USRBA0.png
diff --git a/patches/USP-45/USRBD0.png b/patches/USP-45/USRBD0.png
diff --git a/patches/USP-45/USRCA0.png b/patches/USP-45/USRCA0.png
diff --git a/patches/USP-45/USRCD0.png b/patches/USP-45/USRCD0.png
diff --git a/screenshots/altis.png b/screenshots/altis.png
diff --git a/screenshots/blooper.png b/screenshots/blooper.png
diff --git a/screenshots/squad-summoner.png b/screenshots/squad-summoner.png
diff --git a/sprites/Items/Summoning Talisman/PLHELMA0.png b/sprites/Items/Summoning Talisman/PLHELMA0.png
diff --git a/sprites/Weapons/10mm Pistol/P10FA0.png b/sprites/Weapons/10mm Pistol/P10FA0.png
diff --git a/sprites/Weapons/10mm Pistol/P10FB0.png b/sprites/Weapons/10mm Pistol/P10FB0.png
diff --git a/sprites/Weapons/Blooper/BLOGA0.png b/sprites/Weapons/Blooper/BLOGA0.png
diff --git a/sprites/Weapons/Blooper/BLOGB0.png b/sprites/Weapons/Blooper/BLOGB0.png
diff --git a/sprites/Weapons/Blooper/BLOGC0.png b/sprites/Weapons/Blooper/BLOGC0.png
diff --git a/sprites/Weapons/Blooper/BLOGD0.png b/sprites/Weapons/Blooper/BLOGD0.png
diff --git a/sprites/Weapons/Blooper/BLOPA0.png b/sprites/Weapons/Blooper/BLOPA0.png
diff --git a/sprites/Weapons/Hush Puppy/PUP2A0.png b/sprites/Weapons/Hush Puppy/PUP2A0.png
diff --git a/sprites/Weapons/Hush Puppy/PUP2B0.png b/sprites/Weapons/Hush Puppy/PUP2B0.png
diff --git a/sprites/Weapons/Hush Puppy/PUP2C0.png b/sprites/Weapons/Hush Puppy/PUP2C0.png
diff --git a/sprites/Weapons/Hush Puppy/PUPGA0.png b/sprites/Weapons/Hush Puppy/PUPGA0.png
diff --git a/sprites/Weapons/Hush Puppy/PUPGB0.png b/sprites/Weapons/Hush Puppy/PUPGB0.png
diff --git a/sprites/Weapons/Hush Puppy/PUPGC0.png b/sprites/Weapons/Hush Puppy/PUPGC0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLLB0.png b/sprites/Weapons/Over-Under Shotgun/GOLLB0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLLC0.png b/sprites/Weapons/Over-Under Shotgun/GOLLC0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLRA0.png b/sprites/Weapons/Over-Under Shotgun/GOLRA0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLRB0.png b/sprites/Weapons/Over-Under Shotgun/GOLRB0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLRC0.png b/sprites/Weapons/Over-Under Shotgun/GOLRC0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLRD0.png b/sprites/Weapons/Over-Under Shotgun/GOLRD0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLRE0.png b/sprites/Weapons/Over-Under Shotgun/GOLRE0.png
diff --git a/sprites/Weapons/Over-Under Shotgun/GOLRF0.png b/sprites/Weapons/Over-Under Shotgun/GOLRF0.png
diff --git a/sprites/Weapons/Pistol/pisga0.png → sprites/Weapons/Pistol/PI2GA0.png b/sprites/Weapons/Pistol/pisga0.png → sprites/Weapons/Pistol/PI2GA0.png
diff --git a/sprites/Weapons/Pistol/pisgb0.png → sprites/Weapons/Pistol/PI2GB0.png b/sprites/Weapons/Pistol/pisgb0.png → sprites/Weapons/Pistol/PI2GB0.png
diff --git a/sprites/Weapons/Pistol/pisgc0.png → sprites/Weapons/Pistol/PI2GC0.png b/sprites/Weapons/Pistol/pisgc0.png → sprites/Weapons/Pistol/PI2GC0.png
diff --git a/sprites/Weapons/Pistol/pi2ga0.png → sprites/Weapons/Pistol/PISGA0.png b/sprites/Weapons/Pistol/pi2ga0.png → sprites/Weapons/Pistol/PISGA0.png
diff --git a/sprites/Weapons/Pistol/pi2gb0.png → sprites/Weapons/Pistol/PISGB0.png b/sprites/Weapons/Pistol/pi2gb0.png → sprites/Weapons/Pistol/PISGB0.png
diff --git a/sprites/Weapons/Pistol/pi2gc0.png → sprites/Weapons/Pistol/PISGC0.png b/sprites/Weapons/Pistol/pi2gc0.png → sprites/Weapons/Pistol/PISGC0.png
diff --git a/sprites/Weapons/Pistol/pista0.png → sprites/Weapons/Pistol/PISTA0.png b/sprites/Weapons/Pistol/pista0.png → sprites/Weapons/Pistol/PISTA0.png
diff --git a/sprites/Weapons/Pistol/pistb0.png → sprites/Weapons/Pistol/PISTB0.png b/sprites/Weapons/Pistol/pistb0.png → sprites/Weapons/Pistol/PISTB0.png
diff --git a/sprites/Weapons/Sawed-Off Slayer/SW2GE0.png b/sprites/Weapons/Sawed-Off Slayer/SW2GE0.png
diff --git a/sprites/Weapons/Sawed-Off Slayer/SWSGE0.png b/sprites/Weapons/Sawed-Off Slayer/SWSGE0.png
diff --git a/sprites/Weapons/Scoped Slayer/SCSFA0.png b/sprites/Weapons/Scoped Slayer/SCSFA0.png
diff --git a/sprites/Weapons/Scoped Slayer/SCSFB0.png b/sprites/Weapons/Scoped Slayer/SCSFB0.png
diff --git a/sprites/Weapons/Scoped Slayer/SCSFC0.png b/sprites/Weapons/Scoped Slayer/SCSFC0.png
diff --git a/sprites/Weapons/Scoped Slayer/SCSLB0.png b/sprites/Weapons/Scoped Slayer/SCSLB0.png
diff --git a/sprites/Weapons/Scoped Slayer/SCSLE0.png b/sprites/Weapons/Scoped Slayer/SCSLE0.png
diff --git a/sprites/Weapons/Six12/STLFA0.png b/sprites/Weapons/Six12/STLFA0.png
diff --git a/sprites/Weapons/Slayer/SH2GA0.png b/sprites/Weapons/Slayer/SH2GA0.png
diff --git a/sprites/Weapons/Slayer/SH2GB0.png b/sprites/Weapons/Slayer/SH2GB0.png
diff --git a/sprites/Weapons/Slayer/SH2GE0.png b/sprites/Weapons/Slayer/SH2GE0.png