diff --git a/TODO.md b/TODO.md index 719880a..94f803b 100644 --- a/TODO.md +++ b/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) diff --git a/decaldef.txt b/decaldef.txt index 9b604da..d657498 100644 --- a/decaldef.txt +++ b/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 +} + diff --git a/source_data/spray_acepride.aseprite b/source_data/spray_acepride.aseprite new file mode 100644 index 0000000..675e2c1 Binary files /dev/null and b/source_data/spray_acepride.aseprite differ diff --git a/source_data/spray_bipride2.aseprite b/source_data/spray_bipride2.aseprite new file mode 100644 index 0000000..69ff7b8 Binary files /dev/null and b/source_data/spray_bipride2.aseprite differ diff --git a/source_data/spray_nbpride.aseprite b/source_data/spray_nbpride.aseprite new file mode 100644 index 0000000..465b521 Binary files /dev/null and b/source_data/spray_nbpride.aseprite differ diff --git a/source_data/spraycan_demipride.aseprite b/source_data/spraycan_demipride.aseprite new file mode 100644 index 0000000..335fd20 Binary files /dev/null and b/source_data/spraycan_demipride.aseprite differ diff --git a/source_data/spraycan_gay.aseprite b/source_data/spraycan_gay.aseprite new file mode 100644 index 0000000..543362b Binary files /dev/null and b/source_data/spraycan_gay.aseprite differ diff --git a/source_data/spraycan_pan.aseprite b/source_data/spraycan_pan.aseprite new file mode 100644 index 0000000..625fb8c Binary files /dev/null and b/source_data/spraycan_pan.aseprite differ diff --git a/source_data/spraycan_progress.aseprite b/source_data/spraycan_progress.aseprite new file mode 100644 index 0000000..fd062be Binary files /dev/null and b/source_data/spraycan_progress.aseprite differ diff --git a/sprites/spraycan/kspyc0.png b/sprites/spraycan/kspyc0.png new file mode 100644 index 0000000..4f79f76 Binary files /dev/null and b/sprites/spraycan/kspyc0.png differ diff --git a/sprites/spraycan/kspyd0.png b/sprites/spraycan/kspyd0.png new file mode 100644 index 0000000..cfc0222 Binary files /dev/null and b/sprites/spraycan/kspyd0.png differ diff --git a/sprites/spraycan/kspye0.png b/sprites/spraycan/kspye0.png new file mode 100644 index 0000000..4aadc0c Binary files /dev/null and b/sprites/spraycan/kspye0.png differ diff --git a/sprites/spraycan/kspyf0.png b/sprites/spraycan/kspyf0.png new file mode 100644 index 0000000..0b89aeb Binary files /dev/null and b/sprites/spraycan/kspyf0.png differ diff --git a/sprites/spraycan/kspyg0.png b/sprites/spraycan/kspyg0.png new file mode 100644 index 0000000..fb67089 Binary files /dev/null and b/sprites/spraycan/kspyg0.png differ diff --git a/sprites/spraycan/kspyi0.png b/sprites/spraycan/kspyi0.png new file mode 100644 index 0000000..e468ac1 Binary files /dev/null and b/sprites/spraycan/kspyi0.png differ diff --git a/sprites/spraycan/kspyj0.png b/sprites/spraycan/kspyj0.png new file mode 100644 index 0000000..db154c9 Binary files /dev/null and b/sprites/spraycan/kspyj0.png differ diff --git a/textures.txt b/textures.txt index 044c865..688625d 100644 --- a/textures.txt +++ b/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 { } +} + + diff --git a/zscript/spraycan.zs b/zscript/spraycan.zs index c32c015..37b214e 100644 --- a/zscript/spraycan.zs +++ b/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,9 +349,9 @@ 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_FIRE .. " "..messages[messageIndex % messages.Size()].."\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"; + } +} +