Added a bunch of pride flags.

TODO.md

@@ -16,6 +16,15 @@
 - ~~Organize source_data~~
 - ~~Spraycan spawn CVars~~
 - ~~Spraycan bulk~~
+- ~~More spray patterns~~
+  - ~~NB~~
+  - ~~Ace~~
+  - ~~Progress~~
+  - ~~Demi~~
+  - ~~Switch~~
+  - ~~Pan~~
+  - ~~Bi~~
+  - ~~Gay (rainbow)~~
+- ~~Make firemode switch spray patterns instead of altfire~~
 
-- More spray patterns
 - Loadout code descriptions (hdweapon.loadoutcodes)

decaldef.txt

@@ -16,6 +16,7 @@ decal SnekSpray_TransPride
 	pic KSPYA0
 	animator KiriInstantFade
     randomflipx
+    translucent 0.8
 }
 
 decal SnekSpray_LesbianPride
@@ -23,4 +24,65 @@ decal SnekSpray_LesbianPride
 	pic KSPYB0
 	animator KiriInstantFade
     randomflipx
+    translucent 0.8
 }
+
+decal SnekSpray_NBPride
+{
+	pic KSPYC0
+	animator KiriInstantFade
+    randomflipx
+    translucent 0.8
+}
+
+decal SnekSpray_AcePride
+{
+	pic KSPYD0
+	animator KiriInstantFade
+    randomflipx
+    translucent 0.8
+}
+
+decal SnekSpray_ProgressPride
+{
+	pic KSPYE0
+	animator KiriInstantFade
+    translucent 0.8
+}
+
+decal SnekSpray_DemiPride
+{
+	pic KSPYF0
+	animator KiriInstantFade
+    translucent 0.8
+}
+
+decal SnekSpray_PanPride
+{
+	pic KSPYG0
+	animator KiriInstantFade
+    translucent 0.8
+}
+
+decal SnekSpray_SwitchPride
+{
+	pic KSPYH0
+	animator KiriInstantFade
+}
+
+decal SnekSpray_BiPride
+{
+	pic KSPYI0
+	animator KiriInstantFade
+    translucent 0.8
+    randomflipx
+}
+
+decal SnekSpray_GayPride
+{
+	pic KSPYJ0
+	animator KiriInstantFade
+    translucent 0.8
+    randomflipx
+}
+

textures.txt

@@ -109,6 +109,12 @@ Sprite "KCPLG0", 130, 108
 // ----------------------------------------------------------------------
 // Spray can
 
+Sprite "KSPRB0", 48, 48
+{
+    Offset 24, 24
+    Patch KSPRB0,0,0 { }
+}
+
 Sprite "KSPYA0", 250, 150
 {
     XScale 2
@@ -125,8 +131,68 @@ Sprite "KSPYB0", 250, 150
     Patch KSPYB0,0,0 { }
 }
 
-Sprite "KSPRB0", 48, 48
+Sprite "KSPYC0", 250, 150
 {
-    Offset 24, 24
-    Patch KSPRB0,0,0 { }
+    XScale 2
+    YScale 2
+    Offset 125, 75
+    Patch KSPYC0,0,0 { }
 }
+
+Sprite "KSPYD0", 250, 150
+{
+    XScale 2
+    YScale 2
+    Offset 125, 75
+    Patch KSPYD0,0,0 { }
+}
+
+Sprite "KSPYE0", 250, 150
+{
+    XScale 2
+    YScale 2
+    Offset 125, 75
+    Patch KSPYE0,0,0 { }
+}
+
+Sprite "KSPYF0", 250, 150
+{
+    XScale 2
+    YScale 2
+    Offset 125, 75
+    Patch KSPYF0,0,0 { }
+}
+
+Sprite "KSPYG0", 250, 150
+{
+    XScale 2
+    YScale 2
+    Offset 125, 75
+    Patch KSPYG0,0,0 { }
+}
+
+Sprite "KSPYH0", 32, 32
+{
+    XScale 1
+    YScale 1
+    Offset 16, 16
+    Patch SW1S0,0,0 { }
+}
+
+Sprite "KSPYI0", 250, 150
+{
+    XScale 2
+    YScale 2
+    Offset 125, 75
+    Patch KSPYI0,0,0 { }
+}
+
+Sprite "KSPYJ0", 250, 150
+{
+    XScale 2
+    YScale 2
+    Offset 125, 75
+    Patch KSPYJ0,0,0 { }
+}
+
+

zscript/spraycan.zs

@@ -52,9 +52,13 @@ class Sprayer : HDWeapon
         stop;
 
     ready:
-        KSPR A 1 { A_WeaponReady(WRF_ALL); A_WeaponBusy(false); }
+        KSPR A 1 {
+            A_WeaponReady(WRF_ALL);
+            A_WeaponBusy(false);
+        }
         goto readyend;
 
+    altfire:
     reload:
         KSPR A 1 offset(0, 20) {
             A_OverlayPivot(0, 0.5, 1.0);
@@ -172,7 +176,7 @@ class Sprayer : HDWeapon
         }
         goto waiting;
 
-    altfire:
+    firemode:
         KSPR A 2 { invoker.CycleSprayPattern(); }
         goto waiting;
 
@@ -345,8 +349,8 @@ class Sprayer : HDWeapon
         String currentPattern = CVar.GetCVar("snektech_spraypattern", owner.player).GetString();
 
         return
-            WEPHELP_ALTFIRE.. " Cycle pattern (current: "..currentPattern..").\n"..
-            WEPHELP_RELOAD .. " Shake the can.\n"..
+            WEPHELP_FIREMODE .. " Cycle pattern (current: "..currentPattern..").\n"..
+            WEPHELP_ALTFIRE  .. " Shake the can.\n"..
             WEPHELP_FIRE     .. " "..messages[messageIndex % messages.Size()].."\n";
     }
 }
@@ -361,7 +365,7 @@ class SprayerDecalSpawner : Actor
     states
     {
     spawn:
-        TNT1 A 0;
+        TNT1 A -1;
         stop;
     }
 
@@ -407,7 +411,6 @@ class SprayerDecalSpawner : Actor
                 }
             }
         }
-
     }
 
     override void Tick()
@@ -449,3 +452,67 @@ class SnekSpray_LesbianPride : SprayerPattern
     }
 }
 
+class SnekSpray_NBPride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_NBPride";
+    }
+}
+
+class SnekSpray_AcePride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_AcePride";
+    }
+}
+
+class SnekSpray_ProgressPride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_ProgressPride";
+    }
+}
+
+class SnekSpray_DemiPride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_DemiPride";
+    }
+}
+
+class SnekSpray_PanPride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_PanPride";
+    }
+}
+
+class SnekSpray_SwitchPride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_SwitchPride";
+    }
+}
+
+class SnekSpray_BiPride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_BiPride";
+    }
+}
+
+class SnekSpray_GayPride : SprayerPattern
+{
+    default
+    {
+        SprayerPattern.decalName "SnekSpray_GayPride";
+    }
+}
+