diff --git a/SNDINFO.PBGore and Nashgore b/SNDINFO.PBGore and Nashgore index d571bcc0b5..a4748e2571 100644 --- a/SNDINFO.PBGore and Nashgore +++ b/SNDINFO.PBGore and Nashgore @@ -3,6 +3,11 @@ //////////////////////////////////////////////////////// //Gore +$random gore/heavyimpact { gore/heavyimpact1 gore/heavyimpact2 gore/heavyimpact3 } +gore/heavyimpact1 "sounds/Gore/gore/kickbody1.ogg" +gore/heavyimpact2 "sounds/Gore/gore/kickbody2.ogg" +gore/heavyimpact3 "sounds/Gore/gore/kickbody3.ogg" + gore/break "sounds/Gore/gore/GoreBreak.ogg" gore/minimum "sounds/Gore/gore/GoreMinimum.ogg" $random gore/tension { gore/tension1 gore/tension2 gore/tension3 gore/tension4 } diff --git a/SOUNDS/GORE/Gore/kickbody1.ogg b/SOUNDS/GORE/Gore/kickbody1.ogg new file mode 100644 index 0000000000..a09915a26a Binary files /dev/null and b/SOUNDS/GORE/Gore/kickbody1.ogg differ diff --git a/SOUNDS/GORE/Gore/kickbody2.ogg b/SOUNDS/GORE/Gore/kickbody2.ogg new file mode 100644 index 0000000000..ac3d5eb873 Binary files /dev/null and b/SOUNDS/GORE/Gore/kickbody2.ogg differ diff --git a/SOUNDS/GORE/Gore/kickbody3.ogg b/SOUNDS/GORE/Gore/kickbody3.ogg new file mode 100644 index 0000000000..5c6c2d2e62 Binary files /dev/null and b/SOUNDS/GORE/Gore/kickbody3.ogg differ diff --git a/SPRITES/Execution/Imp/F008A0.png b/SPRITES/Execution/Imp/F008A0.png new file mode 100644 index 0000000000..77fedf5f1b Binary files /dev/null and b/SPRITES/Execution/Imp/F008A0.png differ diff --git a/SPRITES/Execution/Imp/F008B0.png b/SPRITES/Execution/Imp/F008B0.png new file mode 100644 index 0000000000..ad85c2829e Binary files /dev/null and b/SPRITES/Execution/Imp/F008B0.png differ diff --git a/SPRITES/Execution/Imp/F008C0.png b/SPRITES/Execution/Imp/F008C0.png new file mode 100644 index 0000000000..c8926a6bbb Binary files /dev/null and b/SPRITES/Execution/Imp/F008C0.png differ diff --git a/SPRITES/Execution/Imp/F008D0.png b/SPRITES/Execution/Imp/F008D0.png new file mode 100644 index 0000000000..f054223554 Binary files /dev/null and b/SPRITES/Execution/Imp/F008D0.png differ diff --git a/SPRITES/Execution/Imp/F008E0.png b/SPRITES/Execution/Imp/F008E0.png new file mode 100644 index 0000000000..9879a801eb Binary files /dev/null and b/SPRITES/Execution/Imp/F008E0.png differ diff --git a/SPRITES/Execution/Imp/F008F0.png b/SPRITES/Execution/Imp/F008F0.png new file mode 100644 index 0000000000..35c63296e5 Binary files /dev/null and b/SPRITES/Execution/Imp/F008F0.png differ diff --git a/SPRITES/Execution/Imp/F008G0.png b/SPRITES/Execution/Imp/F008G0.png new file mode 100644 index 0000000000..c14d248deb Binary files /dev/null and b/SPRITES/Execution/Imp/F008G0.png differ diff --git a/SPRITES/Execution/Imp/F008H0.png b/SPRITES/Execution/Imp/F008H0.png new file mode 100644 index 0000000000..bca7119993 Binary files /dev/null and b/SPRITES/Execution/Imp/F008H0.png differ diff --git a/SPRITES/Execution/Imp/F008I0.png b/SPRITES/Execution/Imp/F008I0.png new file mode 100644 index 0000000000..bd6f4fb754 Binary files /dev/null and b/SPRITES/Execution/Imp/F008I0.png differ diff --git a/SPRITES/Execution/Imp/F008J0.png b/SPRITES/Execution/Imp/F008J0.png new file mode 100644 index 0000000000..e51de6fe9b Binary files /dev/null and b/SPRITES/Execution/Imp/F008J0.png differ diff --git a/SPRITES/Execution/Imp/F008K0.png b/SPRITES/Execution/Imp/F008K0.png new file mode 100644 index 0000000000..bc11f1da99 Binary files /dev/null and b/SPRITES/Execution/Imp/F008K0.png differ diff --git a/SPRITES/Execution/Imp/F008L0.png b/SPRITES/Execution/Imp/F008L0.png new file mode 100644 index 0000000000..41f3de0362 Binary files /dev/null and b/SPRITES/Execution/Imp/F008L0.png differ diff --git a/SPRITES/Execution/Imp/F008M0.png b/SPRITES/Execution/Imp/F008M0.png new file mode 100644 index 0000000000..a59e3725d7 Binary files /dev/null and b/SPRITES/Execution/Imp/F008M0.png differ diff --git a/SPRITES/Execution/Imp/F009A0.png b/SPRITES/Execution/Imp/F009A0.png new file mode 100644 index 0000000000..0aed1b7cc4 Binary files /dev/null and b/SPRITES/Execution/Imp/F009A0.png differ diff --git a/SPRITES/Execution/Imp/F009B0.png b/SPRITES/Execution/Imp/F009B0.png new file mode 100644 index 0000000000..e568bfaaf8 Binary files /dev/null and b/SPRITES/Execution/Imp/F009B0.png differ diff --git a/SPRITES/Execution/Imp/F009C0.png b/SPRITES/Execution/Imp/F009C0.png new file mode 100644 index 0000000000..d6ca7a6c81 Binary files /dev/null and b/SPRITES/Execution/Imp/F009C0.png differ diff --git a/SPRITES/Execution/Imp/F009D0.png b/SPRITES/Execution/Imp/F009D0.png new file mode 100644 index 0000000000..3ebe417d6a Binary files /dev/null and b/SPRITES/Execution/Imp/F009D0.png differ diff --git a/SPRITES/Execution/Imp/F009E0.png b/SPRITES/Execution/Imp/F009E0.png new file mode 100644 index 0000000000..23c33bab23 Binary files /dev/null and b/SPRITES/Execution/Imp/F009E0.png differ diff --git a/SPRITES/Execution/Imp/F009F0.png b/SPRITES/Execution/Imp/F009F0.png new file mode 100644 index 0000000000..142db8d987 Binary files /dev/null and b/SPRITES/Execution/Imp/F009F0.png differ diff --git a/SPRITES/Execution/Imp/F009G0.png b/SPRITES/Execution/Imp/F009G0.png new file mode 100644 index 0000000000..1421bca5c3 Binary files /dev/null and b/SPRITES/Execution/Imp/F009G0.png differ diff --git a/SPRITES/Execution/Imp/F009H0.png b/SPRITES/Execution/Imp/F009H0.png new file mode 100644 index 0000000000..813d605f62 Binary files /dev/null and b/SPRITES/Execution/Imp/F009H0.png differ diff --git a/SPRITES/Execution/Imp/F009I0.png b/SPRITES/Execution/Imp/F009I0.png new file mode 100644 index 0000000000..def2ccce5b Binary files /dev/null and b/SPRITES/Execution/Imp/F009I0.png differ diff --git a/SPRITES/Execution/Imp/F009J0.png b/SPRITES/Execution/Imp/F009J0.png new file mode 100644 index 0000000000..baa194e4a3 Binary files /dev/null and b/SPRITES/Execution/Imp/F009J0.png differ diff --git a/SPRITES/Execution/Imp/F009K0.png b/SPRITES/Execution/Imp/F009K0.png new file mode 100644 index 0000000000..2425540f35 Binary files /dev/null and b/SPRITES/Execution/Imp/F009K0.png differ diff --git a/SPRITES/Execution/Imp/F009L0.png b/SPRITES/Execution/Imp/F009L0.png new file mode 100644 index 0000000000..a77e4e079a Binary files /dev/null and b/SPRITES/Execution/Imp/F009L0.png differ diff --git a/SPRITES/Execution/Imp/F009M0.png b/SPRITES/Execution/Imp/F009M0.png new file mode 100644 index 0000000000..77c881c9d6 Binary files /dev/null and b/SPRITES/Execution/Imp/F009M0.png differ diff --git a/SPRITES/Execution/Imp/F009N0.png b/SPRITES/Execution/Imp/F009N0.png new file mode 100644 index 0000000000..3e3909419d Binary files /dev/null and b/SPRITES/Execution/Imp/F009N0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G000J0.png b/SPRITES/WEAPONS/Misc/Execution/G000J0.png new file mode 100644 index 0000000000..9bb698dd36 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G000J0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G000K0.png b/SPRITES/WEAPONS/Misc/Execution/G000K0.png new file mode 100644 index 0000000000..9742997dd6 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G000K0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G000L0.png b/SPRITES/WEAPONS/Misc/Execution/G000L0.png new file mode 100644 index 0000000000..32d489015f Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G000L0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G000M0.png b/SPRITES/WEAPONS/Misc/Execution/G000M0.png new file mode 100644 index 0000000000..0b73b90e5b Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G000M0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G000N0.png b/SPRITES/WEAPONS/Misc/Execution/G000N0.png new file mode 100644 index 0000000000..b41d73cad6 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G000N0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001A0.png b/SPRITES/WEAPONS/Misc/Execution/G001A0.png new file mode 100644 index 0000000000..f1a1e981cd Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001A0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001B0.png b/SPRITES/WEAPONS/Misc/Execution/G001B0.png new file mode 100644 index 0000000000..2e273d8bcc Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001B0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001C0.png b/SPRITES/WEAPONS/Misc/Execution/G001C0.png new file mode 100644 index 0000000000..c47501fe90 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001C0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001D0.png b/SPRITES/WEAPONS/Misc/Execution/G001D0.png new file mode 100644 index 0000000000..68ccd664e7 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001D0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001E0.png b/SPRITES/WEAPONS/Misc/Execution/G001E0.png new file mode 100644 index 0000000000..905d881e18 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001E0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001F0.png b/SPRITES/WEAPONS/Misc/Execution/G001F0.png new file mode 100644 index 0000000000..47eb7362e0 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001F0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001G0.png b/SPRITES/WEAPONS/Misc/Execution/G001G0.png new file mode 100644 index 0000000000..7863f0340a Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001G0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001H0.png b/SPRITES/WEAPONS/Misc/Execution/G001H0.png new file mode 100644 index 0000000000..febb710fed Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001H0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001I0.png b/SPRITES/WEAPONS/Misc/Execution/G001I0.png new file mode 100644 index 0000000000..4847f1d12c Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001I0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001J0.png b/SPRITES/WEAPONS/Misc/Execution/G001J0.png new file mode 100644 index 0000000000..afe2d8997f Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001J0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001K0.png b/SPRITES/WEAPONS/Misc/Execution/G001K0.png new file mode 100644 index 0000000000..e8c8a3fc8c Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001K0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001L0.png b/SPRITES/WEAPONS/Misc/Execution/G001L0.png new file mode 100644 index 0000000000..3b51ae90a2 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001L0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001M0.png b/SPRITES/WEAPONS/Misc/Execution/G001M0.png new file mode 100644 index 0000000000..e58eec3429 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001M0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001N0.png b/SPRITES/WEAPONS/Misc/Execution/G001N0.png new file mode 100644 index 0000000000..40c02cc88b Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001N0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001O0.png b/SPRITES/WEAPONS/Misc/Execution/G001O0.png new file mode 100644 index 0000000000..8337b91bb3 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001O0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G001P0.png b/SPRITES/WEAPONS/Misc/Execution/G001P0.png new file mode 100644 index 0000000000..351b223371 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G001P0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002A0.png b/SPRITES/WEAPONS/Misc/Execution/G002A0.png new file mode 100644 index 0000000000..496a250e3d Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002A0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002B0.png b/SPRITES/WEAPONS/Misc/Execution/G002B0.png new file mode 100644 index 0000000000..979c9f8eb6 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002B0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002C0.png b/SPRITES/WEAPONS/Misc/Execution/G002C0.png new file mode 100644 index 0000000000..59f7b821c8 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002C0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002D0.png b/SPRITES/WEAPONS/Misc/Execution/G002D0.png new file mode 100644 index 0000000000..2d2a608961 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002D0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002E0.png b/SPRITES/WEAPONS/Misc/Execution/G002E0.png new file mode 100644 index 0000000000..9f35bbef26 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002E0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002F0.png b/SPRITES/WEAPONS/Misc/Execution/G002F0.png new file mode 100644 index 0000000000..a10e89de45 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002F0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002G0.png b/SPRITES/WEAPONS/Misc/Execution/G002G0.png new file mode 100644 index 0000000000..81cfab4aa1 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002G0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002H0.png b/SPRITES/WEAPONS/Misc/Execution/G002H0.png new file mode 100644 index 0000000000..a5f4860341 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002H0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002I0.png b/SPRITES/WEAPONS/Misc/Execution/G002I0.png new file mode 100644 index 0000000000..6b9b8b9704 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002I0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002J0.png b/SPRITES/WEAPONS/Misc/Execution/G002J0.png new file mode 100644 index 0000000000..f303a9c1c8 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002J0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002K0.png b/SPRITES/WEAPONS/Misc/Execution/G002K0.png new file mode 100644 index 0000000000..923e62cf48 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002K0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002L0.png b/SPRITES/WEAPONS/Misc/Execution/G002L0.png new file mode 100644 index 0000000000..a01b08271a Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002L0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002M0.png b/SPRITES/WEAPONS/Misc/Execution/G002M0.png new file mode 100644 index 0000000000..4de2d6fa2d Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002M0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002N0.png b/SPRITES/WEAPONS/Misc/Execution/G002N0.png new file mode 100644 index 0000000000..78eb5bf36f Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002N0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002O0.png b/SPRITES/WEAPONS/Misc/Execution/G002O0.png new file mode 100644 index 0000000000..69f7fccda0 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002O0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G002P0.png b/SPRITES/WEAPONS/Misc/Execution/G002P0.png new file mode 100644 index 0000000000..d92933ec74 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G002P0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003A0.png b/SPRITES/WEAPONS/Misc/Execution/G003A0.png new file mode 100644 index 0000000000..6644759def Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003A0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003B0.png b/SPRITES/WEAPONS/Misc/Execution/G003B0.png new file mode 100644 index 0000000000..3a632fa92c Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003B0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003C0.png b/SPRITES/WEAPONS/Misc/Execution/G003C0.png new file mode 100644 index 0000000000..fa146e423a Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003C0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003D0.png b/SPRITES/WEAPONS/Misc/Execution/G003D0.png new file mode 100644 index 0000000000..d3bbc41502 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003D0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003E0.png b/SPRITES/WEAPONS/Misc/Execution/G003E0.png new file mode 100644 index 0000000000..8795d27289 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003E0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003F0.png b/SPRITES/WEAPONS/Misc/Execution/G003F0.png new file mode 100644 index 0000000000..3d9a62861f Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003F0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003G0.png b/SPRITES/WEAPONS/Misc/Execution/G003G0.png new file mode 100644 index 0000000000..74fe1f16cf Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003G0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003H0.png b/SPRITES/WEAPONS/Misc/Execution/G003H0.png new file mode 100644 index 0000000000..8d12323ac9 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003H0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003I0.png b/SPRITES/WEAPONS/Misc/Execution/G003I0.png new file mode 100644 index 0000000000..9e41ea9a58 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003I0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003J0.png b/SPRITES/WEAPONS/Misc/Execution/G003J0.png new file mode 100644 index 0000000000..a66da5efe5 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003J0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003K0.png b/SPRITES/WEAPONS/Misc/Execution/G003K0.png new file mode 100644 index 0000000000..9ab0afe327 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003K0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003L0.png b/SPRITES/WEAPONS/Misc/Execution/G003L0.png new file mode 100644 index 0000000000..d5be4bdf89 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003L0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003M0.png b/SPRITES/WEAPONS/Misc/Execution/G003M0.png new file mode 100644 index 0000000000..24ffe720c9 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003M0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003N0.png b/SPRITES/WEAPONS/Misc/Execution/G003N0.png new file mode 100644 index 0000000000..1881bc37fb Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003N0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003O0.png b/SPRITES/WEAPONS/Misc/Execution/G003O0.png new file mode 100644 index 0000000000..5be2b3940b Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003O0.png differ diff --git a/SPRITES/WEAPONS/Misc/Execution/G003P0.png b/SPRITES/WEAPONS/Misc/Execution/G003P0.png new file mode 100644 index 0000000000..eeb3e33698 Binary files /dev/null and b/SPRITES/WEAPONS/Misc/Execution/G003P0.png differ diff --git a/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F0.png b/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F0.png index a136656976..291468b21a 100644 Binary files a/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F0.png and b/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F0.png differ diff --git a/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F1.png b/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F1.png index 79acdca9b6..c32f8569a9 100644 Binary files a/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F1.png and b/SPRITES/WEAPONS/Slot 1/MELEE/Kicks/RightThrust/KIC1F1.png differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKFD0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKFD0.png deleted file mode 100644 index e1d240b0d0..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKFD0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKGA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKGA0.png deleted file mode 100644 index ca225a6fb6..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKGA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKKA0.png deleted file mode 100644 index c0553e7537..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKB0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKKB0.png deleted file mode 100644 index 1d8fffc19f..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKB0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKC0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKKC0.png deleted file mode 100644 index 1a8d292505..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKC0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKD0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKKD0.png deleted file mode 100644 index ba39d6ad8e..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKD0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKE0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKKE0.png deleted file mode 100644 index 5b47288d77..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKKE0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKSA0.png deleted file mode 100644 index 4fc0ece989..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSB0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKSB0.png deleted file mode 100644 index 791f5bd074..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSB0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSC0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKSC0.png deleted file mode 100644 index 19dc9f5247..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSC0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSD0.png b/SPRITES/WEAPONS/Slot 5/Excavator/5DKSD0.png deleted file mode 100644 index 9e9d3f0fe6..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/5DKSD0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/6DKFD0.png b/SPRITES/WEAPONS/Slot 5/Excavator/6DKFD0.png deleted file mode 100644 index 07cee92c82..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/6DKFD0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/6DKGA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/6DKGA0.png deleted file mode 100644 index 07cee92c82..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/6DKGA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/7DKGA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/7DKGA0.png deleted file mode 100644 index 1da4d3ff74..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/7DKGA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/7DKGB0.png b/SPRITES/WEAPONS/Slot 5/Excavator/7DKGB0.png deleted file mode 100644 index 9ff62b6071..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/7DKGB0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/7DKGC0.png b/SPRITES/WEAPONS/Slot 5/Excavator/7DKGC0.png deleted file mode 100644 index 51ced1a443..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/7DKGC0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA1.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA1.png deleted file mode 100644 index 4b2366dd98..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA1.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA2A8.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA2A8.png deleted file mode 100644 index 599ab80dd4..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA2A8.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA3A7.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA3A7.png deleted file mode 100644 index 61dd8ba81e..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA3A7.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA4A6.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA4A6.png deleted file mode 100644 index 210fddb979..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA4A6.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA5.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA5.png deleted file mode 100644 index 81f45ef492..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPA5.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPB0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPB0.png deleted file mode 100644 index e0e1376170..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPB0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPC0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPC0.png deleted file mode 100644 index 520a9e8158..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPC0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPD0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPD0.png deleted file mode 100644 index 35a8f9a314..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPD0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPE0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPE0.png deleted file mode 100644 index 4838a09a05..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPE0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPF0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPF0.png deleted file mode 100644 index 6ee40a0517..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPF0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPG0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPG0.png deleted file mode 100644 index 4abc176193..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPG0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPH0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPH0.png deleted file mode 100644 index 6a7614ec9d..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPH0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPI0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPI0.png deleted file mode 100644 index 425506a072..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPI0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPJ0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPJ0.png deleted file mode 100644 index 8adaefa834..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPJ0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPK0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPK0.png deleted file mode 100644 index 83167fea28..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPK0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPL0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPL0.png deleted file mode 100644 index 8ea9b18266..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPL0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPM0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPM0.png deleted file mode 100644 index 11e76aa51f..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPM0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPN0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPN0.png deleted file mode 100644 index 60f104988a..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPN0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPO0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPO0.png deleted file mode 100644 index cf63776598..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Ammo/5DKPO0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFA0.png deleted file mode 100644 index a833f724ac..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFB0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFB0.png deleted file mode 100644 index e24a4dc439..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFB0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFC0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFC0.png deleted file mode 100644 index 58df35e8df..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/5DKFC0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFA0.png deleted file mode 100644 index 5d4b776d9c..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFB0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFB0.png deleted file mode 100644 index 487d60c042..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFB0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFC0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFC0.png deleted file mode 100644 index 37bfc68155..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Fire/6DKFC0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Pickup/5DUNA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Pickup/5DUNA0.png deleted file mode 100644 index 3d4166cc09..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Pickup/5DUNA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRA0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRA0.png deleted file mode 100644 index 7bae9b2fed..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRB0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRB0.png deleted file mode 100644 index 4de684ad0c..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRB0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRC0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRC0.png deleted file mode 100644 index 0eb4aec332..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRC0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRD0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRD0.png deleted file mode 100644 index 0eb4aec332..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRD0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRE0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRE0.png deleted file mode 100644 index 8a459d1628..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRE0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRF0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRF0.png deleted file mode 100644 index 8a459d1628..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRF0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRJ0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRJ0.png deleted file mode 100644 index e7a0ea8707..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRJ0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRK0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRK0.png deleted file mode 100644 index 46159dd95c..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRK0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRL0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRL0.png deleted file mode 100644 index e41386ddda..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRL0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRM0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRM0.png deleted file mode 100644 index e3900e3df6..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRM0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRN0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRN0.png deleted file mode 100644 index e268c0a26d..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRN0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRO0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRO0.png deleted file mode 100644 index 2c260a3e0f..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRO0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRP0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRP0.png deleted file mode 100644 index 934c6056c7..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRP0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRQ0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRQ0.png deleted file mode 100644 index 6eb5819681..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRQ0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRR0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRR0.png deleted file mode 100644 index 3e43ba6ffa..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRR0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRS0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRS0.png deleted file mode 100644 index 4a79ebafdd..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRS0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRT0.png b/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRT0.png deleted file mode 100644 index ce4c54bf8f..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/Excavator/Reload/5DKRT0.png and /dev/null differ diff --git a/actors/Brutality/BrutalitiesImp.dec b/actors/Brutality/BrutalitiesImp.dec index cb52a3258a..154282877b 100644 --- a/actors/Brutality/BrutalitiesImp.dec +++ b/actors/Brutality/BrutalitiesImp.dec @@ -1,11 +1,11 @@ ACTOR PB_Imp_Execution_1 { - Scale 1.0 - +NOINTERACTION - +FORCEXYBILLBOARD - +Clientsideonly - States - { + Scale 1.0 + +NOINTERACTION + +FORCEXYBILLBOARD + +Clientsideonly + States + { Spawn: // Frame 1: 5 Ticks @@ -24,8 +24,6 @@ ACTOR PB_Imp_Execution_1 // Frame 3: 10 Ticks F007 FFFGGGGFFFF 1 - - TNT1 A 0 { A_SpawnProjectile ("Teeth", 50, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); A_SpawnProjectile ("Teeth", 50, 0, random (145, 205), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); @@ -62,5 +60,136 @@ ACTOR PB_Imp_Execution_1 A_SpawnItem("DeadImpTR06K"); } Stop - } + } } + +ACTOR PB_Imp_Execution_2 +{ + Scale 1.0 + +NOINTERACTION + +FORCEXYBILLBOARD + +Clientsideonly + States + { + Spawn: + + // Frame 1: 9 Ticks + + + + F008 AAABBBBCCCC 1 + TNT1 A 0 { + A_StartSound("imp/pain", CHAN_BODY); + A_SpawnProjectile ("PB_MuchBlood", 30, 0, random (170, 219), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 100)); + A_SpawnProjectile ("NashGoreBlood", 29, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("NashGoreBlood", 25, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("XDeath1", 28, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("XDeath1", 29, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("XDeath1", 32, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_FaceTarget; + A_FaceMaster; + } + // Frame 2: 4 Ticks + F008 DEFG 1 + // Frame 3: 12 Ticks + F008 GHI 4 + + + TNT1 A 0 { + A_SpawnProjectile ("XDeathHalfImp", 32, 0, 180, CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, 12); + A_StartSound("gore/minimum", CHAN_BODY); + + + A_SpawnProjectile ("PB_SmallGib", 28, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("PB_MuchBlood2", 32, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("PB_MuchBlood2", 28, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("NashGoreBlood", 28, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("NashGoreBlood", 29, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("NashGoreBlood", 25, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("NashGoreBlood", 32, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("NashGoreBlood", 30, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("PB_BloodmistLarge", 30, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (30, 90)); + A_SpawnProjectile ("PB_BloodmistLarge", 28, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (30, 90)); + A_SpawnProjectile ("PB_BloodmistLarge", 24, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (30, 90)); + } + + F008 J 12 + + F008 KLM 6 + TNT1 A 0 A_SpawnItem("DeadImpF008M") + Stop + } +} + +ACTOR PB_Imp_Execution_3 +{ + Scale 1.1 + +NOINTERACTION + +FORCEXYBILLBOARD + +Clientsideonly + +FLOORCLIP + States + { + Spawn: + + // Frame 1: 12 Ticks + F009 A 3 A_FaceMaster +// TNT1 A 0 A_StartSound("monsters/zombie/pain", CHAN_AUTO ) + F009 BBC 2 + + // Frame 2: 8 ticks + TNT1 A 0 { + A_ChangeFlag("FLATSPRITE", true); + } + F009 D 2 + F009 EFG 4 + + // Frame 3: 8 + F009 GGGEE 1 + + TNT1 A 0 { + A_SpawnProjectile ("Teeth", 3, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("Teeth", 3, 0, random (145, 205), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("Teeth", 3, 0, random (145, 205), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("PB_MuchBlood", 3, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("XDeath1", 4, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnItem("BloodSplasher2"); + } + F009 H 3 + + + // Frame 4: 6 + F009 H 1 + F009 I 5 + + // Frame 5: 13 + F009 J 4 { + A_StartSound("imp/pain", CHAN_BODY); + A_SpawnProjectile ("Teeth", 3, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("Teeth", 3, 0, random (145, 205), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("Teeth", 3, 0, random (145, 205), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("Teeth", 3, 0, random (145, 205), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("Teeth", 3, 0, random (145, 205), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("PB_MuchBlood", 3, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("PB_BloodMistLarge", 4, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (20, 90)); + A_SpawnProjectile ("XDeath1", 4, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("XDeath1", 4, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnProjectile ("XDeath1", 4, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + A_SpawnItem("BloodSplasher2"); + } + F009 KKKLLLMMM 1 + + // Frame 6: 13 + F009 LLLMMMLLL 1 + TNT1 A 0 { + A_StopSound(CHAN_BODY); + A_SpawnProjectile ("ImpHeadExplode", 3, 0, random (0, 360), CMF_AIMDIRECTION|CMF_ABSOLUTEPITCH|CMF_OFFSETPITCH|CMF_BADPITCH|CMF_SAVEPITCH, random (0, 160)); + } + F009 NNNNNN 1 + + // Frame 7: 14 + F009 N 16 + TNT1 A 0 A_SpawnItem("DeadImp1") + Stop + } +} \ No newline at end of file diff --git a/actors/Monsters/T1-Imps/IMPS.dec b/actors/Monsters/T1-Imps/IMPS.dec index a945925383..34aa60f365 100644 --- a/actors/Monsters/T1-Imps/IMPS.dec +++ b/actors/Monsters/T1-Imps/IMPS.dec @@ -3598,4 +3598,9 @@ Actor PB_DoomImpBallGravity : PB_DoomImpBall } Loop } -} \ No newline at end of file +} + +Actor DeadImpF008M: DeadImp_Half +{Health 300 States{Spawn: + F008 M -1 + Stop}} \ No newline at end of file diff --git a/actors/Weapons/BaseWeapon.dec b/actors/Weapons/BaseWeapon.dec index 83a5906359..0a09cc99f3 100644 --- a/actors/Weapons/BaseWeapon.dec +++ b/actors/Weapons/BaseWeapon.dec @@ -1603,6 +1603,299 @@ States A_GiveInventory("Stimpack", 2); } Goto GoingToReady2 + + Execution_Imp2: + TNT1 A 0 { + A_SpawnItemEx("PB_Imp_Execution_2", 41, 0,0,0,0,0,0,SXF_NOCHECKPOSITION|SXF_SETMASTER); + A_SetPitch(0, SPF_INTERPOLATE); + A_ZoomFactor(1.2, ZOOM_INSTANT); +// A_OverlayFlags(PSP_WEAPON,PSPF_PLAYERTRANSLATED, true); + A_StartSound("KNIFUP", CHAN_AUTO); + } + + TNT1 A 0 A_SetPitch(pitch+19) + + // Frame 1: 9 Ticks + TNT1 AAA 1 { + A_SetRoll(roll-75); + A_SetPitch(pitch-4); + A_SetAngle(angle+9); + } + TNT1 A 0 { + A_ZoomFactor(1.4, ZOOM_INSTANT); + A_StartSound("KNIFSWNG", CHAN_AUTO); + } + MC3S ABCDEF 1 { + A_SetRoll(roll+6); + A_SetPitch(pitch+1); + A_SetAngle(angle-4); + } + + // Frame 2: 4 Ticks + TNT1 A 0 A_StartSound("Machete/Yum", CHAN_AUTO) + MC3S GHIJ 1 { + A_SetRoll(roll+6); + A_SetPitch(pitch+2); + A_SetAngle(angle-6); + } + TNT1 A 0 { + A_ZoomFactor(1.15, ZOOM_INSTANT); + A_OverlayFlags(PSP_WEAPON,PSPF_PLAYERTRANSLATED, true); + A_StartSound("KICK", CHAN_AUTO); + } + // Frame 3: 12 Ticks + KIC4 ABCDE 1 { + A_SetRoll(roll-3); + A_SetPitch(pitch-1); + A_SetAngle(angle+2); + } + TNT1 A 0 A_ZoomFactor(1.05, ZOOM_INSTANT) + KIC4 FFFF 1 { + A_SetPitch(pitch-3); + A_SetAngle(angle+4); + } + TNT1 A 0 A_ZoomFactor(1.5, ZOOM_INSTANT) + KIC4 GHI 1 { + A_SetRoll(roll+6); + A_SetPitch(pitch-3); + A_SetAngle(angle-3); + } + TNT1 A 0 { + A_StartSound("gore/heavyimpact", CHAN_AUTO); + A_FireCustomMissile("ShakeYourAss", 0, 0, 0, 0); + } + TNT1 A 0 A_ZoomFactor(1.1) + + KIC4 JKLM 1 + TNT1 A 0 A_OverlayFlags(PSP_WEAPON,PSPF_PLAYERTRANSLATED, false) + + + + + TNT1 A 0 { + PB_UnsetPlayerExecutionProperties(); + A_SetRoll(0, SPF_INTERPOLATE); + A_SetPitch(0, SPF_INTERPOLATE); + A_ZoomFactor(1.0); + A_GiveInventory("Stimpack", 2); + } + Goto GoingToReady2 + + + Execution_Imp3_Overlay1: + G003 ABCDEFGHIJKLMNOP 1 + Stop + + Execution_Imp3_Overlay2: + P6NA CDEFGGGG 1 + Stop + + Execution_Imp3: + TNT1 A 0 { + A_SetAngle(angle-180); + A_SpawnItemEx("PB_Imp_Execution_3", 8, 4,-52,0,0,0,0,SXF_NOCHECKPOSITION|SXF_SETMASTER); + A_SetPitch(35); + A_ZoomFactor(2.6,ZOOM_INSTANT); + A_StartSound("player/cyborg/fist", CHAN_AUTO); + A_Overlay(9,"Execution_Imp3_Overlay1"); + A_OverlayFlags(PSP_WEAPON,PSPF_PLAYERTRANSLATED, true); + } + // Frame 1: 12 ticks + TNT1 A 0 A_FireCustomMissile("ShakeYourAss", 0, 0, 0, 0) + SLDK ABCDE 1 { + A_SetPitch(pitch+6); + ThrustThingZ(0,25, 1,0); + A_SetRoll(roll-4); + //A_SetAngle(angle+2); + } + SLDK FGHI 1 { + A_SetRoll(roll+5); + A_SetPitch(pitch+9); + } + + TNT1 A 0 { + A_ZoomFactor(2.5,ZOOM_INSTANT); + A_StartSound("NECK_BRK", CHAN_AUTO ); + A_StartSound("BODYF", CHAN_AUTO ); + } + TNT1 A 0 A_FireCustomMissile("ShakeYourAss", 0, 0, 0, 0) + // Frame 2: 8 ticks + SLDK O 1 + TNT1 A 0 A_ZoomFactor(2.25, ZOOM_INSTANT) + SLDK P 1 { + A_SetPitch(pitch-3); + //A_SetAngle(angle-1); + } + SLDK Q 1 { + A_SetPitch(pitch-3); + //A_SetAngle(angle-1); + } + TNT1 A 0 A_ZoomFactor(2.10, ZOOM_INSTANT) + SLDK R 1 { + A_SetPitch(pitch-4); + //A_SetAngle(angle-1); + } + SLDK S 1 { + A_SetPitch(pitch-4); + //A_SetAngle(angle-1); + } + TNT1 A 0 A_ZoomFactor(1.8, ZOOM_INSTANT) + SLDK T 1 { + A_SetPitch(pitch-5); + } + SLDK U 1 { + A_SetPitch(pitch-5); + } + TNT1 A 0 A_ZoomFactor(1.6, ZOOM_INSTANT) + + // Frame 3: + TNT1 A 1 Offset(0,32) { + A_OverlayFlags(PSP_WEAPON,PSPF_PLAYERTRANSLATED, true); + A_ZoomFactor(1.86); + } + + + // Frame 3: 8 + PUNS JIH 1 + TNT1 A 0 A_StartSound("weapons/fistwhoosh", CHAN_AUTO) + P1NN ABC 1 { + A_SetAngle(angle+3); + A_SetPitch(pitch-2); + } + TNT1 A 0 A_StartSound("execution/impact", CHAN_AUTO) + P2NN DE 1 { + A_SetAngle(angle+2); + A_SetPitch(pitch+4); + } + + TNT1 AAAA 1 { + A_SetAngle(angle-1); + A_SetPitch(pitch-3); + } + + // Frame 4: 6 + TNT1 A 0 A_StartSound("weapons/ultrwhoosh", CHAN_AUTO) + P2NK ABCD 1 { + A_SetAngle(angle-1); + A_SetPitch(pitch-4); + A_SetRoll(roll-2); + } + P2NK EF 1 { + A_SetAngle(angle+4); + A_SetPitch(pitch+6); + A_SetRoll(roll-1); + } + + TNT1 A 0 A_StartSound("execution/impact", CHAN_AUTO) + // Frame 5: 13 + P2NK GHIJ 1 { + A_SetAngle(angle-3); + A_SetPitch(pitch+3); + A_SetRoll(roll+4); + } + P2NK KLMNO 1 { + A_SetAngle(angle-3); + A_SetPitch(pitch+2); + A_SetRoll(roll+2); + } + + P2NK P 1 { + A_SetAngle(angle+2); + A_SetPitch(pitch-2); + A_SetRoll(roll-9); + A_Zoomfactor(1.7, ZOOM_INSTANT); + } + P2NK Q 1 { + A_SetAngle(angle+2); + A_SetPitch(pitch-2); + A_SetRoll(roll-9); + A_Zoomfactor(1.6, ZOOM_INSTANT); + } + P2NK R 1 { + A_SetAngle(angle+2); + A_SetPitch(pitch-2); + A_SetRoll(roll-9); + A_Zoomfactor(1.5, ZOOM_INSTANT); + } + P2NK S 1 { + A_SetAngle(angle+2); + A_SetPitch(pitch-2); + A_SetRoll(roll-9); + A_Zoomfactor(1.4, ZOOM_INSTANT); + } + + TNT1 A 0 { + A_Overlay(9,"Execution_Imp3_Overlay2"); + A_OverlayFlags(PSP_WEAPON,PSPF_PLAYERTRANSLATED, true); + + } + + // Frame 6: 13 + TNT1 A 0 { + A_SetPitch(pitch-3); + A_StartSound("KICK", CHAN_AUTO); + } + KIC1 A 1 { + A_SetPitch(pitch-2); + A_SetRoll(roll-1); + A_Zoomfactor(1.35, ZOOM_INSTANT); + } + KIC1 B 1 { + A_SetPitch(pitch-2); + A_SetRoll(roll-1); + A_Zoomfactor(1.3, ZOOM_INSTANT); + } + KIC1 C 1 { + A_SetPitch(pitch-4); + A_SetRoll(roll-2); + A_Zoomfactor(1.25, ZOOM_INSTANT); + } + KIC1 D 1 { + A_SetPitch(pitch-4); + A_SetRoll(roll-2); + A_Zoomfactor(1.2, ZOOM_INSTANT); + } + KIC1 EE 1 A_Zoomfactor(1.1, ZOOM_INSTANT) + KIC1 E 1 { + A_SetPitch(pitch+5); + A_SetAngle(angle+3); + A_SetRoll(roll-3); + } + + TNT1 A 0 A_Zoomfactor(1.8) + KIC1 FG 1 { + A_SetPitch(pitch+5); + A_SetAngle(angle+3); + A_SetRoll(roll-3); + } + + TNT1 A 0 { + A_FireCustomMissile("ShakeYourAss", 0, 0, 0, 0); + A_SpawnItemEx("BigBloodSpot", 15, 0, 25); + + } + TNT1 A 0 A_StartSound("gore/heavyimpact", CHAN_AUTO) + KIC1 HHHHHHHH 1 + TNT1 A 0 A_Zoomfactor(1.2) + + + // Frame 7: 13 + KIC1 HIJKL 1 { + A_SetPitch(pitch-1); + A_SetRoll(roll+1); + } + TNT1 AAAAAAAA 1 A_SetPitch(pitch-10, SPF_INTERPOLATE) + + TNT1 A 0 { + PB_UnsetPlayerExecutionProperties(); + A_SetRoll(0, SPF_INTERPOLATE); + A_SetPitch(0, SPF_INTERPOLATE); + A_ZoomFactor(1.0); + A_GiveInventory("Stimpack", 2); + A_OverlayFlags(PSP_WEAPON,PSPF_PLAYERTRANSLATED, false); + } + Goto GoingToReady2 + Execution_ShotgunGuy1: TNT1 A 0 { diff --git a/zscript/Weapons/BaseWeapon.zc b/zscript/Weapons/BaseWeapon.zc index 75639b5464..6a69c91860 100644 --- a/zscript/Weapons/BaseWeapon.zc +++ b/zscript/Weapons/BaseWeapon.zc @@ -250,8 +250,8 @@ class PB_WeaponBase : DoomWeapon action StateLabel PB_ExecuteImp() { A_GiveInventory("ExecutionToken", 1, AAPTR_PLAYER_GETTARGET); // Todo: Move this to a higher function once more fatalities are done StateLabel result; -// int selector = (random(1,4)); - int selector = 1; + int selector = (random(1,2)); +// int selector = 2; FLineTraceData RemoteRay; bool wallcheck = LineTrace( angle, @@ -263,11 +263,11 @@ class PB_WeaponBase : DoomWeapon ); // Drop Kick Fatality -// if((z-floorz) > 8) { -// A_Warp(AAPTR_PLAYER_GETTARGET, 0, 0, 54, WARPF_USECALLERANGLE|WARPF_NOCHECKPOSITION); -// result = "Execution_Zombieman4"; -// return result; -// } + if((z-floorz) > 8) { + A_Warp(AAPTR_PLAYER_GETTARGET, 0, 0, 54, WARPF_USECALLERANGLE|WARPF_NOCHECKPOSITION); + result = "Execution_Imp3"; + return result; + } // // Wall Kick Fatality // if(wallcheck && RemoteRay.HitType == TRACE_HitWall) { @@ -280,6 +280,9 @@ class PB_WeaponBase : DoomWeapon case 1: result = "Execution_Imp1"; break; + case 2: + result = "Execution_Imp2"; + break; } return result; }