diff --git a/FuturePlans.md b/FuturePlans.md index 980bbf18e..cfed2cb43 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -10,20 +10,12 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after - [8] Rail Carbine *("Tesla Beamer" in Ultra Suite 2 & 3)* - [9] Ray-Khom *(UnSX)* - [0] Grand Lance *(SWWM Iridium)* -* ***(Maybe)* Add the collectibles that were removed due to time constraints:** - - The Black Rat's Coven - Walpurgisnacht *(Debut album)* - - Cat Catcher *(Promo poster)* - - Hege Cactus *(Appears to absorb all water, causing intense thirst)* - - Raidemin Action Figure *(A popular Nukuri superhero, "looks a lot like you")* - - Hoagie *(Can't eat it, but looks delicious)* - - Lithium - Volume One *(A work of art, one of the finest graphic novels)* - - PISS Whiskey *("Is it actually piss or is that just the brand name? Either way, I don't want to know what's inside")* - - **[Heretic]** Doomguy Action Figure *("Oh, he gets one too?")* - - **[Hexen]** Lord Vilkreath - Fundaments of Puzzle Design *("What the hell is this crap?")* - - **[Hexen]** Obelisk of the Golden Vale *("I puked out my guts when I touched that fucking thing")* -* **Even more collectibles:** +* **More collectibles (some of which were initially planned but didn't make it in time):** - AA-12 *("Ibuki's favorite shotgun. It's just a collectible model, so it doesn't actually shoot")* - Cube *("It's a cube")* + - Hege Cactus *(Appears to absorb all water, causing intense thirst)* + - Hoagie *(Can't eat it, but looks delicious)* + - Lithium - Volume One *(A work of art, one of the finest graphic novels)* - Manarock *("A delicacy for gods, but instantly deadly for mortals")* - Rubber Duck *("Is this some kind of convoluted joke from those two?")* * ***(Maybe)* Fake livestream chat overlay, with dynamic reactions to all sorts of stuff** diff --git a/gldefs.keys b/gldefs.keys index 20b6320de..a5b5f661d 100644 --- a/gldefs.keys +++ b/gldefs.keys @@ -58,6 +58,10 @@ Brightmap Texture "models/DoomKeyLight.png" { Map "brightmaps/Fullbright.png" } +HardwareShader Texture "models/DoomKeyLight3.png" +{ + Shader "shaders/glsl/KeyBlink.fp" +} HardwareShader Texture "models/DoomRedSkull.png" { diff --git a/language.version b/language.version index 086934564..cc61b4933 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r715 \cu(Wed 30 Dec 19:04:52 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r716 \cu(Wed 30 Dec 22:30:44 CET 2020)"; diff --git a/modeldef.gesture b/modeldef.gesture index 298295cc7..975e9852a 100644 --- a/modeldef.gesture +++ b/modeldef.gesture @@ -144,4 +144,1233 @@ Model "SWWMGesture" FrameIndex XZW5 J 0 19 FrameIndex XZW5 K 0 20 } +// Key Gestures +Model "SWWMRedCardGesture" +{ + Path "models" + Model 0 "DoomCard1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomRedKey.png" + SurfaceSkin 0 4 "DoomKeyLight3.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMYellowCardGesture" +{ + Path "models" + Model 0 "DoomCard1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomYellowKey.png" + SurfaceSkin 0 4 "DoomKeyLight3.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMBlueCardGesture" +{ + Path "models" + Model 0 "DoomCard1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomBlueKey.png" + SurfaceSkin 0 4 "DoomKeyLight3.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMSilverCardGesture" +{ + Path "models" + Model 0 "DoomCard1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomSilverKey.png" + SurfaceSkin 0 4 "DoomKeyLight3.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMGreenCardGesture" +{ + Path "models" + Model 0 "DoomCard1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomGreenKey.png" + SurfaceSkin 0 4 "DoomKeyLight3.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMOrangeCardGesture" +{ + Path "models" + Model 0 "DoomCard1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomOrangeKey.png" + SurfaceSkin 0 4 "DoomKeyLight3.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMRedSkullGesture" +{ + Path "models" + Model 0 "DoomSkull1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomRedSkull.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMYellowSkullGesture" +{ + Path "models" + Model 0 "DoomSkull1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomYellowSkull.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMBlueSkullGesture" +{ + Path "models" + Model 0 "DoomSkull1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "DoomBlueSkull.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMGreenKeyGesture" +{ + Path "models" + Model 0 "HereticGreen1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "greenmap.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMBlueKeyGesture" +{ + Path "models" + Model 0 "HereticBlue1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "blumap.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMYellowKeyGesture" +{ + Path "models" + Model 0 "HereticYellow1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "goldmap.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} +Model "SWWMRedKeyGesture" +{ + Path "models" + Model 0 "HereticRed1st_d.3d" + SurfaceSkin 0 0 "DemoTags.png" + SurfaceSkin 0 1 "DemoArms.png" + SurfaceSkin 0 2 "DemoSoft.png" + SurfaceSkin 0 3 "redmap.png" + + AngleOffset -90 + Scale -0.005 0.0025 0.005 + + // Base + FrameIndex XZW1 A 0 0 + // Pickup + FrameIndex XZW1 B 0 1 + FrameIndex XZW1 C 0 2 + FrameIndex XZW1 D 0 3 + FrameIndex XZW1 E 0 4 + FrameIndex XZW1 F 0 5 + FrameIndex XZW1 G 0 6 + FrameIndex XZW1 H 0 7 + FrameIndex XZW1 I 0 8 + FrameIndex XZW1 J 0 9 + FrameIndex XZW1 K 0 10 + FrameIndex XZW1 L 0 11 + FrameIndex XZW1 M 0 12 + FrameIndex XZW1 N 0 13 + FrameIndex XZW1 O 0 14 + FrameIndex XZW1 P 0 15 + FrameIndex XZW1 Q 0 16 + FrameIndex XZW1 R 0 17 + FrameIndex XZW1 S 0 18 + FrameIndex XZW1 T 0 19 + // Use 1 + FrameIndex XZW1 U 0 21 + FrameIndex XZW1 V 0 22 + FrameIndex XZW1 W 0 23 + FrameIndex XZW1 X 0 24 + FrameIndex XZW1 Y 0 25 + FrameIndex XZW1 Z 0 26 + FrameIndex XZW2 A 0 27 + FrameIndex XZW2 B 0 28 + FrameIndex XZW2 C 0 29 + FrameIndex XZW2 D 0 30 + FrameIndex XZW2 E 0 31 + FrameIndex XZW2 F 0 32 + FrameIndex XZW2 G 0 33 + FrameIndex XZW2 H 0 34 + FrameIndex XZW2 I 0 35 + FrameIndex XZW2 J 0 36 + FrameIndex XZW2 K 0 37 + FrameIndex XZW2 L 0 38 + FrameIndex XZW2 M 0 39 + FrameIndex XZW2 N 0 40 + FrameIndex XZW2 O 0 41 + FrameIndex XZW2 P 0 42 + FrameIndex XZW2 Q 0 43 + FrameIndex XZW2 R 0 44 + // Use 2 + FrameIndex XZW2 S 0 46 + FrameIndex XZW2 T 0 47 + FrameIndex XZW2 U 0 48 + FrameIndex XZW2 V 0 49 + FrameIndex XZW2 W 0 51 + FrameIndex XZW2 X 0 52 + FrameIndex XZW2 Y 0 53 + FrameIndex XZW2 Z 0 54 + FrameIndex XZW3 A 0 55 + FrameIndex XZW3 B 0 56 + FrameIndex XZW3 C 0 57 + FrameIndex XZW3 D 0 58 + FrameIndex XZW3 E 0 59 + FrameIndex XZW3 F 0 60 + FrameIndex XZW3 G 0 61 + FrameIndex XZW3 H 0 62 + FrameIndex XZW3 I 0 63 + FrameIndex XZW3 J 0 64 + FrameIndex XZW3 K 0 65 + FrameIndex XZW3 L 0 66 + FrameIndex XZW3 M 0 67 + FrameIndex XZW3 N 0 68 + FrameIndex XZW3 O 0 69 + FrameIndex XZW3 P 0 70 + FrameIndex XZW3 Q 0 71 + FrameIndex XZW3 R 0 72 + FrameIndex XZW3 S 0 73 + FrameIndex XZW3 T 0 74 + FrameIndex XZW3 U 0 75 + FrameIndex XZW3 V 0 76 + FrameIndex XZW3 W 0 77 + FrameIndex XZW3 X 0 78 + FrameIndex XZW3 Y 0 79 +} // TODO Collectible Gestures diff --git a/models/DoomCard1st.blend b/models/DoomCard1st.blend new file mode 100644 index 000000000..7241314db Binary files /dev/null and b/models/DoomCard1st.blend differ diff --git a/models/DoomCard1st_a.3d b/models/DoomCard1st_a.3d new file mode 100644 index 000000000..2c501d541 Binary files /dev/null and b/models/DoomCard1st_a.3d differ diff --git a/models/DoomCard1st_d.3d b/models/DoomCard1st_d.3d new file mode 100644 index 000000000..4a1625198 Binary files /dev/null and b/models/DoomCard1st_d.3d differ diff --git a/models/DoomKeyLight3.png b/models/DoomKeyLight3.png new file mode 100644 index 000000000..a0d8187b0 Binary files /dev/null and b/models/DoomKeyLight3.png differ diff --git a/models/DoomSkull1st.blend b/models/DoomSkull1st.blend new file mode 100644 index 000000000..f303ab69a Binary files /dev/null and b/models/DoomSkull1st.blend differ diff --git a/models/DoomSkull1st_a.3d b/models/DoomSkull1st_a.3d new file mode 100644 index 000000000..dea7c57b6 Binary files /dev/null and b/models/DoomSkull1st_a.3d differ diff --git a/models/DoomSkull1st_d.3d b/models/DoomSkull1st_d.3d new file mode 100644 index 000000000..079900fe7 Binary files /dev/null and b/models/DoomSkull1st_d.3d differ diff --git a/models/HereticBlue1st.blend b/models/HereticBlue1st.blend new file mode 100644 index 000000000..3bab871b5 Binary files /dev/null and b/models/HereticBlue1st.blend differ diff --git a/models/HereticBlue1st_a.3d b/models/HereticBlue1st_a.3d new file mode 100644 index 000000000..1fa3303ac Binary files /dev/null and b/models/HereticBlue1st_a.3d differ diff --git a/models/HereticBlue1st_d.3d b/models/HereticBlue1st_d.3d new file mode 100644 index 000000000..6f3c6bb09 Binary files /dev/null and b/models/HereticBlue1st_d.3d differ diff --git a/models/HereticGreen1st.blend b/models/HereticGreen1st.blend new file mode 100644 index 000000000..8f8bbdbce Binary files /dev/null and b/models/HereticGreen1st.blend differ diff --git a/models/HereticGreen1st_a.3d b/models/HereticGreen1st_a.3d new file mode 100644 index 000000000..c707c6ffb Binary files /dev/null and b/models/HereticGreen1st_a.3d differ diff --git a/models/HereticGreen1st_d.3d b/models/HereticGreen1st_d.3d new file mode 100644 index 000000000..f4c87ea5f Binary files /dev/null and b/models/HereticGreen1st_d.3d differ diff --git a/models/HereticRed1st.blend b/models/HereticRed1st.blend new file mode 100644 index 000000000..d4ff518ab Binary files /dev/null and b/models/HereticRed1st.blend differ diff --git a/models/HereticRed1st_a.3d b/models/HereticRed1st_a.3d new file mode 100644 index 000000000..8fd89a304 Binary files /dev/null and b/models/HereticRed1st_a.3d differ diff --git a/models/HereticRed1st_d.3d b/models/HereticRed1st_d.3d new file mode 100644 index 000000000..d70a6671b Binary files /dev/null and b/models/HereticRed1st_d.3d differ diff --git a/models/HereticYellow1st.blend b/models/HereticYellow1st.blend new file mode 100644 index 000000000..a61d412bd Binary files /dev/null and b/models/HereticYellow1st.blend differ diff --git a/models/HereticYellow1st_a.3d b/models/HereticYellow1st_a.3d new file mode 100644 index 000000000..a80bc1cd4 Binary files /dev/null and b/models/HereticYellow1st_a.3d differ diff --git a/models/HereticYellow1st_d.3d b/models/HereticYellow1st_d.3d new file mode 100644 index 000000000..5b5892113 Binary files /dev/null and b/models/HereticYellow1st_d.3d differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 6f8968d0c..f4c6a84f5 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -11,7 +11,7 @@ Collectible models: x Kirin Manga x Kirin Plush -Collectible pickup animations: +Collectible gestures: - Moth Plushy - Akari Project - Love Signals CD @@ -24,29 +24,27 @@ Collectible pickup animations: - Kirin Manga - Kirin Plush -Key pickup animations: - - Keycard - - Skull key - - Heretic Yellow Key - - Heretic Green Key - - Heretic Blue Key - - Heretic Red Key +Key gestures: + x Keycard + x Skull key + x Heretic Yellow Key + x Heretic Green Key + x Heretic Blue Key + x Heretic Red Key # Post-release stuff Character models: - White Lady -Extra collectibles(?): - - BRC Debut Album - - Cat Catcher Poster +Extra collectibles: + - AA-12 + - Cube - Hege Cactus - - Raidemin Figure - Hoagie - Lithium Vol.1 - - PISS Whiskey - - Doomguy Figure - - Eye Obelisk + - Manarock + - Rubber Duck # DLC Weaponset diff --git a/shaders/glsl/KeyBlink.fp b/shaders/glsl/KeyBlink.fp new file mode 100644 index 000000000..b13f8551e --- /dev/null +++ b/shaders/glsl/KeyBlink.fp @@ -0,0 +1,13 @@ +vec4 ProcessLight( vec4 color ) +{ + if ( mod(timer*35.,20.) < 10. ) + color.rgb = vec3(1.); + return color; +} + +vec4 ProcessTexel() +{ + vec2 uv = vTexCoord.st*vec2(.5,1.); + if ( mod(timer*35.,20.) >= 10. ) uv.x += .5; + return getTexel(uv); +} diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index b368792b4..b16d2b146 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -145,10 +145,9 @@ Class SWWMItemGesture : SWWMWeapon abstract // push back gest.sweapon.Delete(0); gest.suse.Delete(0); - // go back to the main gesture and clear ourselves + // go back to the main gesture player.ReadyWeapon = gest; player.SetPSPrite(PSP_WEAPON,gest.ResolveState("Ready")); - invoker.Destroy(); return; } if ( gest.queued ) @@ -156,17 +155,15 @@ Class SWWMItemGesture : SWWMWeapon abstract gest.whichweapon = null; gest.whichgesture = gest.nextgesture; gest.queued = false; - // go back to the main gesture and clear ourselves + // go back to the main gesture player.ReadyWeapon = gest; player.SetPSPrite(PSP_WEAPON,gest.ResolveState("Ready")); - invoker.Destroy(); return; } - // switch to old weapon and clear ourselves + // switch to old weapon player.ReadyWeapon = gest; player.PendingWeapon = gest.formerweapon; player.SetPSPrite(PSP_WEAPON,gest.ResolveState("Deselect")); - invoker.Destroy(); } Default diff --git a/zscript/swwm_kbase.zsc b/zscript/swwm_kbase.zsc index 7fa6efdef..929376e1d 100644 --- a/zscript/swwm_kbase.zsc +++ b/zscript/swwm_kbase.zsc @@ -2424,20 +2424,21 @@ Class DemolitionistMenu : GenericMenu if ( !multiplayer && (menuactive == Menu.On) ) { // if it's a weapon, play the select sound + // if it's a collectible or key, play the "hands up" sound let w = (Class)(hnd.checklist[j].used); if ( w ) { // play if actually switching if ( hnd.checklist[j].result ) { - // gz 4.5pre workaround (expects a Name now) String snd = GetDefaultByType(w).UpSound; MenuSound(snd); } } + else if ( (hnd.checklist[j].used is 'SWWMCollectible') || (hnd.checklist[j].used is 'SWWMKey') ) + MenuSound("demolitionist/handsup"); else { - // gz 4.5pre workaround (expects a Name now) String snd = GetDefaultByType(hnd.checklist[j].used).UseSound; MenuSound(snd); } diff --git a/zscript/swwm_keys.zsc b/zscript/swwm_keys.zsc index adeff9a06..23848451d 100644 --- a/zscript/swwm_keys.zsc +++ b/zscript/swwm_keys.zsc @@ -54,6 +54,7 @@ Class SWWMRedCard : SWWMKey Species "RedCard"; Inventory.PickupMessage "$T_REDCARD"; Inventory.PickupFlash "SWWMRedPickupFlash"; + SWWMKey.GestureWeapon "SWWMRedCardGesture"; Radius 10; Height 25; } @@ -72,6 +73,7 @@ Class SWWMYellowCard : SWWMKey Species "YellowCard"; Inventory.PickupMessage "$T_YELLOWCARD"; Inventory.PickupFlash "SWWMPickupFlash"; + SWWMKey.GestureWeapon "SWWMYellowCardGesture"; Radius 10; Height 25; } @@ -90,6 +92,7 @@ Class SWWMBlueCard : SWWMKey Species "BlueCard"; Inventory.PickupMessage "$T_BLUECARD"; Inventory.PickupFlash "SWWMBluePickupFlash"; + SWWMKey.GestureWeapon "SWWMBlueCardGesture"; Radius 10; Height 25; } @@ -108,6 +111,7 @@ Class SWWMSilverCardKDiZD : SWWMKey Species "BlueSkull"; Inventory.PickupMessage "$T_SILVERCARD"; Inventory.PickupFlash "SWWMWhitePickupFlash"; + SWWMKey.GestureWeapon "SWWMSilverCardGesture"; Radius 10; Height 25; } @@ -126,6 +130,7 @@ Class SWWMGreenCardKDiZD : SWWMKey Species "YellowSkull"; Inventory.PickupMessage "$T_GREENCARD"; Inventory.PickupFlash "SWWMGreenPickupFlash"; + SWWMKey.GestureWeapon "SWWMGreenCardGesture"; Radius 10; Height 25; } @@ -144,6 +149,7 @@ Class SWWMOrangeCardKDiZD : SWWMKey Species "RedSkull"; Inventory.PickupMessage "$T_ORANGECARD"; Inventory.PickupFlash "SWWMPickupFlash"; + SWWMKey.GestureWeapon "SWWMOrangeCardGesture"; Radius 10; Height 25; } @@ -162,6 +168,7 @@ Class SWWMGreenCard : SWWMKey Species "GreenCard"; Inventory.PickupMessage "$T_GREENCARD"; Inventory.PickupFlash "SWWMGreenPickupFlash"; + SWWMKey.GestureWeapon "SWWMGreenCardGesture"; Radius 10; Height 25; } @@ -182,6 +189,7 @@ Class SWWMRedSkull : SWWMKey Species "RedSkull"; Inventory.PickupMessage "$T_REDSKULL"; Inventory.PickupFlash "SWWMRedPickupFlash"; + SWWMKey.GestureWeapon "SWWMRedSkullGesture"; Radius 10; Height 25; } @@ -200,6 +208,7 @@ Class SWWMBlueSkull : SWWMKey Species "BlueSkull"; Inventory.PickupMessage "$T_BLUESKULL"; Inventory.PickupFlash "SWWMBluePickupFlash"; + SWWMKey.GestureWeapon "SWWMBlueSkullGesture"; Radius 10; Height 25; } @@ -218,6 +227,7 @@ Class SWWMYellowSkull : SWWMKey Species "YellowSkull"; Inventory.PickupMessage "$T_YELLOWSKULL"; Inventory.PickupFlash "SWWMPickupFlash"; + SWWMKey.GestureWeapon "SWWMYellowSkullGesture"; Radius 10; Height 25; } @@ -237,6 +247,7 @@ Class SWWMKeyGreen : SWWMKey Species "KeyGreen"; Inventory.PickupMessage "$T_KEYGREEN"; Inventory.PickupFlash "SWWMGreenPickupFlash"; + SWWMKey.GestureWeapon "SWWMGreenKeyGesture"; Radius 10; Height 25; } @@ -255,6 +266,7 @@ Class SWWMKeyBlue : SWWMKey Species "KeyBlue"; Inventory.PickupMessage "$T_KEYBLUE"; Inventory.PickupFlash "SWWMBluePickupFlash"; + SWWMKey.GestureWeapon "SWWMBlueKeyGesture"; Radius 10; Height 25; } @@ -273,6 +285,7 @@ Class SWWMKeyYellow : SWWMKey Species "KeyYellow"; Inventory.PickupMessage "$T_KEYYELLOW"; Inventory.PickupFlash "SWWMPickupFlash"; + SWWMKey.GestureWeapon "SWWMYellowKeyGesture"; Radius 10; Height 25; } @@ -291,6 +304,7 @@ Class SWWMKeyRed : SWWMKey Species "KeyRed"; Inventory.PickupMessage "$T_KEYRED"; Inventory.PickupFlash "SWWMRedPickupFlash"; + SWWMKey.GestureWeapon "SWWMRedKeyGesture"; Radius 10; Height 25; } @@ -301,3 +315,66 @@ Class SWWMKeyRed : SWWMKey Stop; } } + +// Key gestures +// (they all use the same exact animations, just with the object changed) +// (yeah, I'm lazy, and there's a lot of keys) +Class SWWMKeyGesture : SWWMItemGesture abstract +{ + States + { + Fire: + XZW1 A 3 A_Jump(128,"AltFire","AltFire2"); + XZW1 B 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP); + XZW1 CDEF 3; + XZW1 GHIJKLMNO 4; + XZW1 P 3 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP); + XZW1 QRST 3; + XZW1 A -1 A_FinishGesture(); + Stop; + AltFire: + XZW1 A 3 A_Jump(128,"Fire","AltFire2"); + XZW1 U 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP); + XZW1 VWX 3; + XZW1 YZ 4; + XZW2 ABC 4; + XZW2 D 4 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP,pitch:.7); + XZW2 EFGHIJ 4; + XZW2 KL 3; + XZW2 M 3 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP); + XZW2 NOPQR 3; + XZW1 A -1 A_FinishGesture(); + Stop; + AltFire2: + XZW1 A 3; + XZW2 S 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP); + XZW2 TUVWX 3; + XZW2 YZ 4; + XZW3 ABCDE 4; + XZW3 F 2 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP); + XZW3 GHI 2; + XZW3 JKL 3; + XZW3 MN 2; + XZW3 O 2 A_StartSound("demolitionist/petting",CHAN_WEAPON,CHANF_OVERLAP,.4); + XZW3 PQ 2; + XZW3 RS 4; + XZW3 T 4 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP); + XZW3 UV 4; + XZW3 WXY 3; + XZW1 A -1 A_FinishGesture(); + Stop; + } +} +Class SWWMRedCardGesture : SWWMKeyGesture {} +Class SWWMYellowCardGesture : SWWMKeyGesture {} +Class SWWMBlueCardGesture : SWWMKeyGesture {} +Class SWWMSilverCardGesture : SWWMKeyGesture {} +Class SWWMGreenCardGesture : SWWMKeyGesture {} +Class SWWMOrangeCardGesture : SWWMKeyGesture {} +Class SWWMRedSkullGesture : SWWMKeyGesture {} +Class SWWMYellowSkullGesture : SWWMKeyGesture {} +Class SWWMBlueSkullGesture : SWWMKeyGesture {} +Class SWWMGreenKeyGesture : SWWMKeyGesture {} +Class SWWMBlueKeyGesture : SWWMKeyGesture {} +Class SWWMYellowKeyGesture : SWWMKeyGesture {} +Class SWWMRedKeyGesture : SWWMKeyGesture {} diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 930773ba8..a90df422d 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -3219,11 +3219,13 @@ Class SWWMGesture : SWWMWeapon { // already gesturing // queue if unique - if ( (w.sweapon.Size() <= 0) || (w.sweapon.Find(a) != w.sweapon.Size()) ) + for ( int i=0; i