Merge pull request #4 from UndeadZeratul/develop

v0.3.1

.github/workflows/build-pk3/action.yml

@@ -0,0 +1,13 @@
+name: Build PK3
+description: Builds the PK3
+runs:
+  using: "composite"
+  steps:
+  - uses: actions/checkout@v4
+  - name: currentDate
+    id: current-date
+    shell: bash
+    run: echo "CURRENT_DATE=$(date +'%Y%m%d')" >> "$GITHUB_OUTPUT"
+  - uses: montudor/action-zip@v1
+    with:
+      args: zip -r "uzHDAddon-${{ github.ref_name }}.pk3" . -i brightmaps/* filter/* graphics/* patches/* sprites/* GAMEINFO LANGUAGE.* LICENSE MAPINFO README.md TEXTCOLO TEXTURES.* *.fon2

.github/workflows/nightly.yml

@@ -0,0 +1,17 @@
+name: Nightly Build
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/workflows/build-pk3
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: ./*.pk3

.github/workflows/release.yml

@@ -9,14 +9,9 @@ jobs:
   buildAndRelease:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: build PK3
-        uses: montudor/action-zip@v1
-        with:
-          args: zip -r "uzHDAddon-${{ github.ref_name }}.pk3" . -i brightmaps/* filter/* graphics/* patches/* sprites/* GAMEINFO LANGUAGE.* LICENSE MAPINFO README.md TEXTCOLO TEXTURES.* *.fon2
-      - name: Release PK3
-        uses: softprops/[email protected]
+      - uses: actions/checkout@v4
+      - uses: ./.github/workflows/build-pk3
+      - uses: softprops/[email protected]
         with:
           generate_release_notes: true
           discussion_category_name: 'Releases'

LANGUAGE.en

@@ -33,7 +33,7 @@ TAG_PISTOL                       = "Grokk 15 9x22mm Pistol";
 TAG_REVOLVER                     = "Buger \"Deinonychus\" .355 Masterball Revolver";
 TAG_SMG                          = "H&M MP-46 9x22mm Heavy Automatic Pistol";
 TAG_HUNTER                       = "DiFranco SPOS-E28 \"Hunter\" 12ga Pump-Action Shotgun";
-TAG_SLAYER                       = "Calvary Arms SL-41 \"Slayer\" 12ga Double-Barreled Shotgun";
+TAG_SLAYER                       = "Cavalry Arms SL-41 \"Slayer\" 12ga Double-Barreled Shotgun";
 TAG_ZM66                         = "Volt ZM66 4.26mm Assault Rifle";
 TAG_VULC                         = "Volt Mk. III \"Vulcanette\" 4.26mm Rotary Support Weapon";
 TAG_GL                           = "L&M \"Blooper\" 40mm Grenade Launcher";
@@ -757,8 +757,8 @@ PEPPER_PICKUP_NDM_BOX            = "Picked up some 9x25mm NDM rounds.";
 // Vanilla HDest
 PICKUP_9MMAG                     = "Picked up a 9x22mm Grokk 15 Magazine.";
 PICKUP_4MMAG                     = "Picked up a Volt 4.26mm Magazine.";
-PICKUP_9MMAG30                   = "Picked up a 9x22mm SMG magazine.";
-PICKUP_7MMAG                     = "Picked up a Volt 7.76mm magazine.";
+PICKUP_9MMAG30                   = "Picked up a 9x22mm SMG Magazine.";
+PICKUP_7MMAG                     = "Picked up a Volt 7.76mm Magazine.";
 PICKUP_BATTERY                   = "Picked up a Cell Battery.";
 
 // Hexadoken's Legacy, Continued

README.md

@@ -75,12 +75,12 @@ The Arkoudi Revolver Shotgun's ironsights have been recolored.
 _Credits: AdianoTMO69_
 
 #### Hunter Shotgun
-The hunter has been swapped out with Complex Doom's Shotgun sprites, then recolored to match thematically.
+The hunter has been swapped out with a set that looks like the ones made by Daedalus' Complex Doom, yet still keep more of a vanilla feel to it, then recolored to match thematically.
 
 ![hunter](./screenshots/hunter.png)  
 _Credits:  
-HUD Sprites: Daedalus, Neoworm  
-Pickup Sprite: ZikShadow, Daedalus ([Complex Doom](https://forum.zdoom.org/viewtopic.php?t=58535))_
+HUD Sprites: Sonik.O, Neoworm  
+Pickup Sprite: Matt, Sonik.O_
 
 #### Slayers
 _Sawed-Off & Scoped Slayers require [Peppergrinder](https://gitlab.com/hdiscord-saltmines/hd-peppergrinder)_

TEXTURES.shotguns

@@ -0,0 +1,60 @@
+// Texture definitions generated by SLADE3
+// on Tue Jan 16 19:01:16 2024
+
+Sprite "HUNTA0", 64, 15
+{
+	XScale 1.200
+	YScale 1.200
+	Offset 32, 15
+	Patch "HUNTPK", 0, 0
+}
+
+Sprite "HUNTB0", 64, 15
+{
+	XScale 1.200
+	YScale 1.200
+	Offset 32, 15
+	Patch "HUNTPK", 0, -15
+}
+
+Sprite "HUNTC0", 64, 15
+{
+	XScale 1.200
+	YScale 1.200
+	Offset 32, 15
+	Patch "HUNTPK", 0, -30
+}
+
+Sprite "HUNTD0", 64, 15
+{
+	XScale 1.200
+	YScale 1.200
+	Offset 32, 15
+	Patch "HUNTPK", 0, -45
+}
+
+Sprite "HUNTE0", 64, 15
+{
+	XScale 1.200
+	YScale 1.200
+	Offset 32, 15
+	Patch "HUNTPK", 0, -60
+}
+
+Sprite "HUNTF0", 64, 15
+{
+	XScale 1.200
+	YScale 1.200
+	Offset 32, 15
+	Patch "HUNTPK", 0, -75
+}
+
+Sprite "HUNTG0", 64, 15
+{
+	XScale 1.200
+	YScale 1.200
+	Offset 32, 15
+	Patch "HUNTPK", 0, -90
+}
+
+// End of texture definitions