diff --git a/fonts/Tewi/0000.png b/fonts/Tewi/0000.png index 8644e996d..70d8f20a8 100644 Binary files a/fonts/Tewi/0000.png and b/fonts/Tewi/0000.png differ diff --git a/fonts/Tewi/0100.png b/fonts/Tewi/0100.png index 4ad5f6665..04453c7e0 100644 Binary files a/fonts/Tewi/0100.png and b/fonts/Tewi/0100.png differ diff --git a/fonts/Tewi/0200.png b/fonts/Tewi/0200.png index ff9fe8213..90e62f668 100644 Binary files a/fonts/Tewi/0200.png and b/fonts/Tewi/0200.png differ diff --git a/fonts/Tewi/0300.png b/fonts/Tewi/0300.png index ffa9ff3d2..c9fdf3e0c 100644 Binary files a/fonts/Tewi/0300.png and b/fonts/Tewi/0300.png differ diff --git a/fonts/Tewi/0400.png b/fonts/Tewi/0400.png index baa2db75b..64afc3188 100644 Binary files a/fonts/Tewi/0400.png and b/fonts/Tewi/0400.png differ diff --git a/fonts/Tewi/0500.png b/fonts/Tewi/0500.png index 3e34b2392..459c7fe33 100644 Binary files a/fonts/Tewi/0500.png and b/fonts/Tewi/0500.png differ diff --git a/fonts/Tewi/1E00.png b/fonts/Tewi/1E00.png index 8a6958a98..d3d3bd85c 100644 Binary files a/fonts/Tewi/1E00.png and b/fonts/Tewi/1E00.png differ diff --git a/fonts/Tewi/1F00.png b/fonts/Tewi/1F00.png index 750f20e3a..ea8cf0754 100644 Binary files a/fonts/Tewi/1F00.png and b/fonts/Tewi/1F00.png differ diff --git a/fonts/Tewi/2000.png b/fonts/Tewi/2000.png index d54bbba83..27611387a 100644 Binary files a/fonts/Tewi/2000.png and b/fonts/Tewi/2000.png differ diff --git a/fonts/Tewi/2100.png b/fonts/Tewi/2100.png index fff02cd46..f9317be33 100644 Binary files a/fonts/Tewi/2100.png and b/fonts/Tewi/2100.png differ diff --git a/fonts/Tewi/2200.png b/fonts/Tewi/2200.png index b07439019..25a769970 100644 Binary files a/fonts/Tewi/2200.png and b/fonts/Tewi/2200.png differ diff --git a/fonts/Tewi/2300.png b/fonts/Tewi/2300.png index 0238228d6..51ab491d4 100644 Binary files a/fonts/Tewi/2300.png and b/fonts/Tewi/2300.png differ diff --git a/fonts/Tewi/2400.png b/fonts/Tewi/2400.png index 3871f786c..50a6c1dcc 100644 Binary files a/fonts/Tewi/2400.png and b/fonts/Tewi/2400.png differ diff --git a/fonts/Tewi/2500.png b/fonts/Tewi/2500.png index d540b2787..350733b52 100644 Binary files a/fonts/Tewi/2500.png and b/fonts/Tewi/2500.png differ diff --git a/fonts/Tewi/2600.png b/fonts/Tewi/2600.png index ecc3cace9..d8215a182 100644 Binary files a/fonts/Tewi/2600.png and b/fonts/Tewi/2600.png differ diff --git a/fonts/Tewi/2700.png b/fonts/Tewi/2700.png index fb75b517c..4d9e7585c 100644 Binary files a/fonts/Tewi/2700.png and b/fonts/Tewi/2700.png differ diff --git a/fonts/Tewi/2800.png b/fonts/Tewi/2800.png index 4d94ece04..e1ab453bb 100644 Binary files a/fonts/Tewi/2800.png and b/fonts/Tewi/2800.png differ diff --git a/fonts/Tewi/2900.png b/fonts/Tewi/2900.png index 3a4b9fcc7..5c9bc98d3 100644 Binary files a/fonts/Tewi/2900.png and b/fonts/Tewi/2900.png differ diff --git a/fonts/Tewi/2B00.png b/fonts/Tewi/2B00.png index 68f68f074..d884be92e 100644 Binary files a/fonts/Tewi/2B00.png and b/fonts/Tewi/2B00.png differ diff --git a/fonts/Tewi/2C00.png b/fonts/Tewi/2C00.png index f4d572f5a..fe6e4a6de 100644 Binary files a/fonts/Tewi/2C00.png and b/fonts/Tewi/2C00.png differ diff --git a/fonts/Tewi/2E00.png b/fonts/Tewi/2E00.png index 7057d93f7..ae78c576b 100644 Binary files a/fonts/Tewi/2E00.png and b/fonts/Tewi/2E00.png differ diff --git a/fonts/Tewi/font.inf b/fonts/Tewi/font.inf index 944b52a72..343d55184 100644 --- a/fonts/Tewi/font.inf +++ b/fonts/Tewi/font.inf @@ -1,3 +1,3 @@ -TranslationType Console +TranslationType Standard CellSize 7, 14 Kerning -1 diff --git a/fonts/TewiShaded/0000.png b/fonts/TewiShaded/0000.png index 990564366..2c8764f88 100644 Binary files a/fonts/TewiShaded/0000.png and b/fonts/TewiShaded/0000.png differ diff --git a/fonts/TewiShaded/0100.png b/fonts/TewiShaded/0100.png index adbacc96d..386cb31ad 100644 Binary files a/fonts/TewiShaded/0100.png and b/fonts/TewiShaded/0100.png differ diff --git a/fonts/TewiShaded/0200.png b/fonts/TewiShaded/0200.png index a11a0b20f..ea2b47fc4 100644 Binary files a/fonts/TewiShaded/0200.png and b/fonts/TewiShaded/0200.png differ diff --git a/fonts/TewiShaded/0300.png b/fonts/TewiShaded/0300.png index 2e4942dcd..ce3d2615d 100644 Binary files a/fonts/TewiShaded/0300.png and b/fonts/TewiShaded/0300.png differ diff --git a/fonts/TewiShaded/0400.png b/fonts/TewiShaded/0400.png index c0de85e18..8516b76f6 100644 Binary files a/fonts/TewiShaded/0400.png and b/fonts/TewiShaded/0400.png differ diff --git a/fonts/TewiShaded/0500.png b/fonts/TewiShaded/0500.png index 8ec514eff..3d8a15cd5 100644 Binary files a/fonts/TewiShaded/0500.png and b/fonts/TewiShaded/0500.png differ diff --git a/fonts/TewiShaded/1E00.png b/fonts/TewiShaded/1E00.png index a6cf9a34f..35e2c23a6 100644 Binary files a/fonts/TewiShaded/1E00.png and b/fonts/TewiShaded/1E00.png differ diff --git a/fonts/TewiShaded/1F00.png b/fonts/TewiShaded/1F00.png index 47f49d03a..8d285717f 100644 Binary files a/fonts/TewiShaded/1F00.png and b/fonts/TewiShaded/1F00.png differ diff --git a/fonts/TewiShaded/2000.png b/fonts/TewiShaded/2000.png index 6f4091eff..614232a8e 100644 Binary files a/fonts/TewiShaded/2000.png and b/fonts/TewiShaded/2000.png differ diff --git a/fonts/TewiShaded/2100.png b/fonts/TewiShaded/2100.png index 26c183380..8e2990a2b 100644 Binary files a/fonts/TewiShaded/2100.png and b/fonts/TewiShaded/2100.png differ diff --git a/fonts/TewiShaded/2200.png b/fonts/TewiShaded/2200.png index e8f0ca674..5b15f02d8 100644 Binary files a/fonts/TewiShaded/2200.png and b/fonts/TewiShaded/2200.png differ diff --git a/fonts/TewiShaded/2300.png b/fonts/TewiShaded/2300.png index 2c37d6637..c6015ecab 100644 Binary files a/fonts/TewiShaded/2300.png and b/fonts/TewiShaded/2300.png differ diff --git a/fonts/TewiShaded/2400.png b/fonts/TewiShaded/2400.png index eafb3f2a9..55eb71767 100644 Binary files a/fonts/TewiShaded/2400.png and b/fonts/TewiShaded/2400.png differ diff --git a/fonts/TewiShaded/2500.png b/fonts/TewiShaded/2500.png index 4707d29d3..809a31369 100644 Binary files a/fonts/TewiShaded/2500.png and b/fonts/TewiShaded/2500.png differ diff --git a/fonts/TewiShaded/2600.png b/fonts/TewiShaded/2600.png index 9093fbf2a..75ee912f9 100644 Binary files a/fonts/TewiShaded/2600.png and b/fonts/TewiShaded/2600.png differ diff --git a/fonts/TewiShaded/2700.png b/fonts/TewiShaded/2700.png index 63eba054b..b03009427 100644 Binary files a/fonts/TewiShaded/2700.png and b/fonts/TewiShaded/2700.png differ diff --git a/fonts/TewiShaded/2800.png b/fonts/TewiShaded/2800.png index 78bc99795..22e25d38f 100644 Binary files a/fonts/TewiShaded/2800.png and b/fonts/TewiShaded/2800.png differ diff --git a/fonts/TewiShaded/2900.png b/fonts/TewiShaded/2900.png index e094e598d..331f6d48e 100644 Binary files a/fonts/TewiShaded/2900.png and b/fonts/TewiShaded/2900.png differ diff --git a/fonts/TewiShaded/2B00.png b/fonts/TewiShaded/2B00.png index 7a18443eb..ab6537a1f 100644 Binary files a/fonts/TewiShaded/2B00.png and b/fonts/TewiShaded/2B00.png differ diff --git a/fonts/TewiShaded/2C00.png b/fonts/TewiShaded/2C00.png index 4f57a66c1..cd4674890 100644 Binary files a/fonts/TewiShaded/2C00.png and b/fonts/TewiShaded/2C00.png differ diff --git a/fonts/TewiShaded/2E00.png b/fonts/TewiShaded/2E00.png index 71426d3e2..43d4af1e0 100644 Binary files a/fonts/TewiShaded/2E00.png and b/fonts/TewiShaded/2E00.png differ diff --git a/fonts/TewiShaded/font.inf b/fonts/TewiShaded/font.inf index 944b52a72..343d55184 100644 --- a/fonts/TewiShaded/font.inf +++ b/fonts/TewiShaded/font.inf @@ -1,3 +1,3 @@ -TranslationType Console +TranslationType Standard CellSize 7, 14 Kerning -1 diff --git a/fonts/TewiShadedInverse/0000.png b/fonts/TewiShadedInverse/0000.png new file mode 100644 index 000000000..990564366 Binary files /dev/null and b/fonts/TewiShadedInverse/0000.png differ diff --git a/fonts/TewiShadedInverse/0100.png b/fonts/TewiShadedInverse/0100.png new file mode 100644 index 000000000..adbacc96d Binary files /dev/null and b/fonts/TewiShadedInverse/0100.png differ diff --git a/fonts/TewiShadedInverse/0200.png b/fonts/TewiShadedInverse/0200.png new file mode 100644 index 000000000..a11a0b20f Binary files /dev/null and b/fonts/TewiShadedInverse/0200.png differ diff --git a/fonts/TewiShadedInverse/0300.png b/fonts/TewiShadedInverse/0300.png new file mode 100644 index 000000000..2e4942dcd Binary files /dev/null and b/fonts/TewiShadedInverse/0300.png differ diff --git a/fonts/TewiShadedInverse/0400.png b/fonts/TewiShadedInverse/0400.png new file mode 100644 index 000000000..c0de85e18 Binary files /dev/null and b/fonts/TewiShadedInverse/0400.png differ diff --git a/fonts/TewiShadedInverse/0500.png b/fonts/TewiShadedInverse/0500.png new file mode 100644 index 000000000..8ec514eff Binary files /dev/null and b/fonts/TewiShadedInverse/0500.png differ diff --git a/fonts/TewiShadedInverse/1E00.png b/fonts/TewiShadedInverse/1E00.png new file mode 100644 index 000000000..a6cf9a34f Binary files /dev/null and b/fonts/TewiShadedInverse/1E00.png differ diff --git a/fonts/TewiShadedInverse/1F00.png b/fonts/TewiShadedInverse/1F00.png new file mode 100644 index 000000000..47f49d03a Binary files /dev/null and b/fonts/TewiShadedInverse/1F00.png differ diff --git a/fonts/TewiShadedInverse/2000.png b/fonts/TewiShadedInverse/2000.png new file mode 100644 index 000000000..6f4091eff Binary files /dev/null and b/fonts/TewiShadedInverse/2000.png differ diff --git a/fonts/TewiShadedInverse/2100.png b/fonts/TewiShadedInverse/2100.png new file mode 100644 index 000000000..26c183380 Binary files /dev/null and b/fonts/TewiShadedInverse/2100.png differ diff --git a/fonts/TewiShadedInverse/2200.png b/fonts/TewiShadedInverse/2200.png new file mode 100644 index 000000000..e8f0ca674 Binary files /dev/null and b/fonts/TewiShadedInverse/2200.png differ diff --git a/fonts/TewiShadedInverse/2300.png b/fonts/TewiShadedInverse/2300.png new file mode 100644 index 000000000..2c37d6637 Binary files /dev/null and b/fonts/TewiShadedInverse/2300.png differ diff --git a/fonts/TewiShadedInverse/2400.png b/fonts/TewiShadedInverse/2400.png new file mode 100644 index 000000000..eafb3f2a9 Binary files /dev/null and b/fonts/TewiShadedInverse/2400.png differ diff --git a/fonts/TewiShadedInverse/2500.png b/fonts/TewiShadedInverse/2500.png new file mode 100644 index 000000000..4707d29d3 Binary files /dev/null and b/fonts/TewiShadedInverse/2500.png differ diff --git a/fonts/TewiShadedInverse/2600.png b/fonts/TewiShadedInverse/2600.png new file mode 100644 index 000000000..9093fbf2a Binary files /dev/null and b/fonts/TewiShadedInverse/2600.png differ diff --git a/fonts/TewiShadedInverse/2700.png b/fonts/TewiShadedInverse/2700.png new file mode 100644 index 000000000..63eba054b Binary files /dev/null and b/fonts/TewiShadedInverse/2700.png differ diff --git a/fonts/TewiShadedInverse/2800.png b/fonts/TewiShadedInverse/2800.png new file mode 100644 index 000000000..78bc99795 Binary files /dev/null and b/fonts/TewiShadedInverse/2800.png differ diff --git a/fonts/TewiShadedInverse/2900.png b/fonts/TewiShadedInverse/2900.png new file mode 100644 index 000000000..e094e598d Binary files /dev/null and b/fonts/TewiShadedInverse/2900.png differ diff --git a/fonts/TewiShadedInverse/2B00.png b/fonts/TewiShadedInverse/2B00.png new file mode 100644 index 000000000..7a18443eb Binary files /dev/null and b/fonts/TewiShadedInverse/2B00.png differ diff --git a/fonts/TewiShadedInverse/2C00.png b/fonts/TewiShadedInverse/2C00.png new file mode 100644 index 000000000..4f57a66c1 Binary files /dev/null and b/fonts/TewiShadedInverse/2C00.png differ diff --git a/fonts/TewiShadedInverse/2E00.png b/fonts/TewiShadedInverse/2E00.png new file mode 100644 index 000000000..71426d3e2 Binary files /dev/null and b/fonts/TewiShadedInverse/2E00.png differ diff --git a/fonts/TewiShadedInverse/LICENSE b/fonts/TewiShadedInverse/LICENSE new file mode 100644 index 000000000..beff238eb --- /dev/null +++ b/fonts/TewiShadedInverse/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2015-2017 lucy + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/fonts/TewiShadedInverse/font.inf b/fonts/TewiShadedInverse/font.inf new file mode 100644 index 000000000..343d55184 --- /dev/null +++ b/fonts/TewiShadedInverse/font.inf @@ -0,0 +1,3 @@ +TranslationType Standard +CellSize 7, 14 +Kerning -1 diff --git a/zscript.txt b/zscript.txt index dce00a797..35769a4f4 100644 --- a/zscript.txt +++ b/zscript.txt @@ -37,7 +37,7 @@ Class SWWMCrashHandler : StaticEventHandler override void UiTick() { - if ( gamestate == GS_LEVEL ) + if ( (gamestate == GS_LEVEL) || (gamestate == GS_TITLELEVEL) ) { wasinmap = true; timer = 0; @@ -48,14 +48,14 @@ Class SWWMCrashHandler : StaticEventHandler if ( timer == 1 ) { Console.Printf(TEXTCOLOR_GOLD.."Oopsie Woopsie!"..TEXTCOLOR_NORMAL); - S_Sound("crash/glass",CHAN_5|CHAN_UI|CHAN_NOPAUSE,1,ATTN_NONE); - S_Sound("crash/glass",CHAN_6|CHAN_UI|CHAN_NOPAUSE,1,ATTN_NONE); - S_Sound("crash/glass",CHAN_7|CHAN_UI|CHAN_NOPAUSE,1,ATTN_NONE); + S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } else if ( timer == 140 ) { Console.Printf(TEXTCOLOR_GOLD.."Looks like GZDoom made a fucky wucky! owo"..TEXTCOLOR_NORMAL); - S_Sound("crash/curb",CHAN_7|CHAN_UI|CHAN_NOPAUSE,1,ATTN_NONE); + S_StartSound("crash/curb",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } else if ( timer == 350 ) { @@ -88,12 +88,12 @@ Class SWWMBrutalHandler : StaticEventHandler override void UiTick() { if ( !detected ) return; - if ( gamestate == GS_LEVEL ) + if ( (gamestate == GS_LEVEL) || (gamestate == GS_TITLELEVEL) ) { if ( timer == 1 ) { - S_Sound("brutal/ezmodo",CHAN_6|CHAN_UI|CHAN_NOPAUSE,1,ATTN_NONE); - S_Sound("brutal/ezmodo",CHAN_7|CHAN_UI|CHAN_NOPAUSE,1,ATTN_NONE); + S_StartSound("brutal/ezmodo",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + S_StartSound("brutal/ezmodo",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } else if ( timer == 350 ) ThrowAbortException(">Brutal Doom"); timer++; diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index 6e53b9ed7..743f0b6bb 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -1,4 +1,13 @@ // common code goes here +enum ESWWMGZChannels +{ + CHAN_YOUDONEFUCKEDUP = 63200, + CHAN_DEMOVOICE = 63201, + CHAN_FOOTSTEP = 63202, + CHAN_WEAPONEXTRA = 63203, + CHAN_POWERUP = 63204, + CHAN_POWERUPEXTRA = 63205, +}; // Handler responsible for item replacements and whatever else Class SWWMHandler : EventHandler