diff --git a/credits.txt b/credits.txt index 6b8629107..c2b26d46c 100644 --- a/credits.txt +++ b/credits.txt @@ -25,6 +25,7 @@ Most of the work here is original, but there are some notable exceptions: - Kinsie's Test Map theme, "Hypercardish 1.1", ALSO TOO by Teque (seems nice for such an use I guess). - Clear theme, "Solitary Apprehension", by BouncyTEM (made specifically for the mod). - The crash handler uses a short clip of the Curb Your Enthusiasm theme. + - The anti-BD script uses art by Mauzy and music by Surasshu. - Tewi font by lucy (https://github.com/lucy/tewi-font). Modified to add gradients and drop shadow. - Miniwi font by Josuah Demangeon (http://josuah.net). Modified to add gradients and drop shadow. - EB Garamond font by Octavio Pardo et al (https://github.com/octaviopardo/EBGaramond12). Rendered to texture atlas with outline. diff --git a/gldefs/bdscreen.txt b/gldefs/bdscreen.txt index 4e9fed688..72c61b53b 100644 --- a/gldefs/bdscreen.txt +++ b/gldefs/bdscreen.txt @@ -1,340 +1,44 @@ -Material Texture "graphics/BDScreen/BDSCR001.jpg" +Material Texture "graphics/BDScreen/BOYKISS0.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR002.jpg" +Material Texture "graphics/BDScreen/BOYKISS1.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR003.jpg" +Material Texture "graphics/BDScreen/BOYKISS2.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR004.jpg" +Material Texture "graphics/BDScreen/BOYKISS3.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR005.jpg" +Material Texture "graphics/BDScreen/BOYKISS4.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR006.jpg" +Material Texture "graphics/BDScreen/BOYKISS5.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR007.jpg" +Material Texture "graphics/BDScreen/BOYKISS6.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR008.jpg" +Material Texture "graphics/BDScreen/BOYKISS7.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR009.jpg" +Material Texture "graphics/BDScreen/BOYKISS8.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR010.jpg" +Material Texture "graphics/BDScreen/BOYKISS9.png" { Shader "shaders/glsl/Oversample.fp" } -Material Texture "graphics/BDScreen/BDSCR011.jpg" +Material Texture "graphics/BDScreen/BOYKISSR.png" { - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR012.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR013.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR014.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR015.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR016.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR017.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR018.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR019.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR020.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR021.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR022.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR023.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR024.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR025.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR026.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR027.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR028.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR029.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR030.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR031.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR032.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR033.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR034.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR035.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR036.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR037.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR038.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR039.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR040.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR041.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR042.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR043.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR044.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR045.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR046.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR047.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR048.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR049.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR050.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR051.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR052.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR053.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR054.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR055.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR056.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR057.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR058.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR059.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR060.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR061.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR062.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR063.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR064.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR065.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR066.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR067.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR068.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR069.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR070.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR071.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR072.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR073.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR074.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR075.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR076.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR077.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR078.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR079.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR080.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR081.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR082.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR083.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR084.jpg" -{ - Shader "shaders/glsl/Oversample.fp" -} -Material Texture "graphics/BDScreen/BDSCR085.jpg" -{ - Shader "shaders/glsl/Oversample.fp" + Shader "shaders/glsl/Bilinear.fp" } diff --git a/graphics/BDScreen/BDSCR001.jpg b/graphics/BDScreen/BDSCR001.jpg deleted file mode 100644 index 4a7423766..000000000 Binary files a/graphics/BDScreen/BDSCR001.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR002.jpg b/graphics/BDScreen/BDSCR002.jpg deleted file mode 100644 index b59277b7e..000000000 Binary files a/graphics/BDScreen/BDSCR002.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR003.jpg b/graphics/BDScreen/BDSCR003.jpg deleted file mode 100644 index 7a00bafcf..000000000 Binary files a/graphics/BDScreen/BDSCR003.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR004.jpg b/graphics/BDScreen/BDSCR004.jpg deleted file mode 100644 index 722df107a..000000000 Binary files a/graphics/BDScreen/BDSCR004.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR005.jpg b/graphics/BDScreen/BDSCR005.jpg deleted file mode 100644 index 2db538e36..000000000 Binary files a/graphics/BDScreen/BDSCR005.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR006.jpg b/graphics/BDScreen/BDSCR006.jpg deleted file mode 100644 index be4c40a0c..000000000 Binary files a/graphics/BDScreen/BDSCR006.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR007.jpg b/graphics/BDScreen/BDSCR007.jpg deleted file mode 100644 index cea554d16..000000000 Binary files a/graphics/BDScreen/BDSCR007.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR008.jpg b/graphics/BDScreen/BDSCR008.jpg deleted file mode 100644 index 9d58a525f..000000000 Binary files a/graphics/BDScreen/BDSCR008.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR009.jpg b/graphics/BDScreen/BDSCR009.jpg deleted file mode 100644 index e3f8a8763..000000000 Binary files a/graphics/BDScreen/BDSCR009.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR010.jpg b/graphics/BDScreen/BDSCR010.jpg deleted file mode 100644 index 5763da9fd..000000000 Binary files a/graphics/BDScreen/BDSCR010.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR011.jpg b/graphics/BDScreen/BDSCR011.jpg deleted file mode 100644 index db7377ca3..000000000 Binary files a/graphics/BDScreen/BDSCR011.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR012.jpg b/graphics/BDScreen/BDSCR012.jpg deleted file mode 100644 index 840ea94c5..000000000 Binary files a/graphics/BDScreen/BDSCR012.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR013.jpg b/graphics/BDScreen/BDSCR013.jpg deleted file mode 100644 index 7564f84e1..000000000 Binary files a/graphics/BDScreen/BDSCR013.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR014.jpg b/graphics/BDScreen/BDSCR014.jpg deleted file mode 100644 index 774324348..000000000 Binary files a/graphics/BDScreen/BDSCR014.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR015.jpg b/graphics/BDScreen/BDSCR015.jpg deleted file mode 100644 index bf2acdc62..000000000 Binary files a/graphics/BDScreen/BDSCR015.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR016.jpg b/graphics/BDScreen/BDSCR016.jpg deleted file mode 100644 index 7456cb0fb..000000000 Binary files a/graphics/BDScreen/BDSCR016.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR017.jpg b/graphics/BDScreen/BDSCR017.jpg deleted file mode 100644 index c771956c4..000000000 Binary files a/graphics/BDScreen/BDSCR017.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR018.jpg b/graphics/BDScreen/BDSCR018.jpg deleted file mode 100644 index 7fed094d1..000000000 Binary files a/graphics/BDScreen/BDSCR018.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR019.jpg b/graphics/BDScreen/BDSCR019.jpg deleted file mode 100644 index 3bbf5a205..000000000 Binary files a/graphics/BDScreen/BDSCR019.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR020.jpg b/graphics/BDScreen/BDSCR020.jpg deleted file mode 100644 index 382edfa08..000000000 Binary files a/graphics/BDScreen/BDSCR020.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR021.jpg b/graphics/BDScreen/BDSCR021.jpg deleted file mode 100644 index 1abac2266..000000000 Binary files a/graphics/BDScreen/BDSCR021.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR022.jpg b/graphics/BDScreen/BDSCR022.jpg deleted file mode 100644 index d06bc0fe1..000000000 Binary files a/graphics/BDScreen/BDSCR022.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR023.jpg b/graphics/BDScreen/BDSCR023.jpg deleted file mode 100644 index 7ff787c77..000000000 Binary files a/graphics/BDScreen/BDSCR023.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR024.jpg b/graphics/BDScreen/BDSCR024.jpg deleted file mode 100644 index bce754476..000000000 Binary files a/graphics/BDScreen/BDSCR024.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR025.jpg b/graphics/BDScreen/BDSCR025.jpg deleted file mode 100644 index ec0609324..000000000 Binary files a/graphics/BDScreen/BDSCR025.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR026.jpg b/graphics/BDScreen/BDSCR026.jpg deleted file mode 100644 index c52af46ea..000000000 Binary files a/graphics/BDScreen/BDSCR026.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR027.jpg b/graphics/BDScreen/BDSCR027.jpg deleted file mode 100644 index 2832cd003..000000000 Binary files a/graphics/BDScreen/BDSCR027.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR028.jpg b/graphics/BDScreen/BDSCR028.jpg deleted file mode 100644 index 67cb47b92..000000000 Binary files a/graphics/BDScreen/BDSCR028.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR029.jpg b/graphics/BDScreen/BDSCR029.jpg deleted file mode 100644 index 344d6e885..000000000 Binary files a/graphics/BDScreen/BDSCR029.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR030.jpg b/graphics/BDScreen/BDSCR030.jpg deleted file mode 100644 index fa00f244e..000000000 Binary files a/graphics/BDScreen/BDSCR030.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR031.jpg b/graphics/BDScreen/BDSCR031.jpg deleted file mode 100644 index 5816febed..000000000 Binary files a/graphics/BDScreen/BDSCR031.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR032.jpg b/graphics/BDScreen/BDSCR032.jpg deleted file mode 100644 index 42091c658..000000000 Binary files a/graphics/BDScreen/BDSCR032.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR033.jpg b/graphics/BDScreen/BDSCR033.jpg deleted file mode 100644 index 9771cb2d6..000000000 Binary files a/graphics/BDScreen/BDSCR033.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR034.jpg b/graphics/BDScreen/BDSCR034.jpg deleted file mode 100644 index 66df67b3c..000000000 Binary files a/graphics/BDScreen/BDSCR034.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR035.jpg b/graphics/BDScreen/BDSCR035.jpg deleted file mode 100644 index 82f325ae7..000000000 Binary files a/graphics/BDScreen/BDSCR035.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR036.jpg b/graphics/BDScreen/BDSCR036.jpg deleted file mode 100644 index 329d89619..000000000 Binary files a/graphics/BDScreen/BDSCR036.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR037.jpg b/graphics/BDScreen/BDSCR037.jpg deleted file mode 100644 index 034f191b9..000000000 Binary files a/graphics/BDScreen/BDSCR037.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR038.jpg b/graphics/BDScreen/BDSCR038.jpg deleted file mode 100644 index 506e0f1cc..000000000 Binary files a/graphics/BDScreen/BDSCR038.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR039.jpg b/graphics/BDScreen/BDSCR039.jpg deleted file mode 100644 index 191473e7c..000000000 Binary files a/graphics/BDScreen/BDSCR039.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR040.jpg b/graphics/BDScreen/BDSCR040.jpg deleted file mode 100644 index 40f39d5d4..000000000 Binary files a/graphics/BDScreen/BDSCR040.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR041.jpg b/graphics/BDScreen/BDSCR041.jpg deleted file mode 100644 index cdbd18417..000000000 Binary files a/graphics/BDScreen/BDSCR041.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR042.jpg b/graphics/BDScreen/BDSCR042.jpg deleted file mode 100644 index 69cb449dc..000000000 Binary files a/graphics/BDScreen/BDSCR042.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR043.jpg b/graphics/BDScreen/BDSCR043.jpg deleted file mode 100644 index a0cd82127..000000000 Binary files a/graphics/BDScreen/BDSCR043.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR044.jpg b/graphics/BDScreen/BDSCR044.jpg deleted file mode 100644 index 13ca4b0a6..000000000 Binary files a/graphics/BDScreen/BDSCR044.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR045.jpg b/graphics/BDScreen/BDSCR045.jpg deleted file mode 100644 index 6c4596611..000000000 Binary files a/graphics/BDScreen/BDSCR045.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR046.jpg b/graphics/BDScreen/BDSCR046.jpg deleted file mode 100644 index 6dad62bdc..000000000 Binary files a/graphics/BDScreen/BDSCR046.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR047.jpg b/graphics/BDScreen/BDSCR047.jpg deleted file mode 100644 index d619748d9..000000000 Binary files a/graphics/BDScreen/BDSCR047.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR048.jpg b/graphics/BDScreen/BDSCR048.jpg deleted file mode 100644 index 6c079b383..000000000 Binary files a/graphics/BDScreen/BDSCR048.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR049.jpg b/graphics/BDScreen/BDSCR049.jpg deleted file mode 100644 index a833a0847..000000000 Binary files a/graphics/BDScreen/BDSCR049.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR050.jpg b/graphics/BDScreen/BDSCR050.jpg deleted file mode 100644 index afe8b0d75..000000000 Binary files a/graphics/BDScreen/BDSCR050.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR051.jpg b/graphics/BDScreen/BDSCR051.jpg deleted file mode 100644 index 5b57bf159..000000000 Binary files a/graphics/BDScreen/BDSCR051.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR052.jpg b/graphics/BDScreen/BDSCR052.jpg deleted file mode 100644 index c34036ae5..000000000 Binary files a/graphics/BDScreen/BDSCR052.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR053.jpg b/graphics/BDScreen/BDSCR053.jpg deleted file mode 100644 index 5362b61de..000000000 Binary files a/graphics/BDScreen/BDSCR053.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR054.jpg b/graphics/BDScreen/BDSCR054.jpg deleted file mode 100644 index f0bbae901..000000000 Binary files a/graphics/BDScreen/BDSCR054.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR055.jpg b/graphics/BDScreen/BDSCR055.jpg deleted file mode 100644 index 7ccaf1631..000000000 Binary files a/graphics/BDScreen/BDSCR055.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR056.jpg b/graphics/BDScreen/BDSCR056.jpg deleted file mode 100644 index b5a5eae94..000000000 Binary files a/graphics/BDScreen/BDSCR056.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR057.jpg b/graphics/BDScreen/BDSCR057.jpg deleted file mode 100644 index 7e11669dc..000000000 Binary files a/graphics/BDScreen/BDSCR057.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR058.jpg b/graphics/BDScreen/BDSCR058.jpg deleted file mode 100644 index 37c75c39a..000000000 Binary files a/graphics/BDScreen/BDSCR058.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR059.jpg b/graphics/BDScreen/BDSCR059.jpg deleted file mode 100644 index 200e4860b..000000000 Binary files a/graphics/BDScreen/BDSCR059.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR060.jpg b/graphics/BDScreen/BDSCR060.jpg deleted file mode 100644 index 18c8a52c4..000000000 Binary files a/graphics/BDScreen/BDSCR060.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR061.jpg b/graphics/BDScreen/BDSCR061.jpg deleted file mode 100644 index 93a518d74..000000000 Binary files a/graphics/BDScreen/BDSCR061.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR062.jpg b/graphics/BDScreen/BDSCR062.jpg deleted file mode 100644 index 4b45118d6..000000000 Binary files a/graphics/BDScreen/BDSCR062.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR063.jpg b/graphics/BDScreen/BDSCR063.jpg deleted file mode 100644 index 72f5a8a26..000000000 Binary files a/graphics/BDScreen/BDSCR063.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR064.jpg b/graphics/BDScreen/BDSCR064.jpg deleted file mode 100644 index ec2223322..000000000 Binary files a/graphics/BDScreen/BDSCR064.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR065.jpg b/graphics/BDScreen/BDSCR065.jpg deleted file mode 100644 index f75ced626..000000000 Binary files a/graphics/BDScreen/BDSCR065.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR066.jpg b/graphics/BDScreen/BDSCR066.jpg deleted file mode 100644 index 8108288e2..000000000 Binary files a/graphics/BDScreen/BDSCR066.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR067.jpg b/graphics/BDScreen/BDSCR067.jpg deleted file mode 100644 index 8dfc3606c..000000000 Binary files a/graphics/BDScreen/BDSCR067.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR068.jpg b/graphics/BDScreen/BDSCR068.jpg deleted file mode 100644 index 8df7d005b..000000000 Binary files a/graphics/BDScreen/BDSCR068.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR069.jpg b/graphics/BDScreen/BDSCR069.jpg deleted file mode 100644 index aeb072856..000000000 Binary files a/graphics/BDScreen/BDSCR069.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR070.jpg b/graphics/BDScreen/BDSCR070.jpg deleted file mode 100644 index 312432dbb..000000000 Binary files a/graphics/BDScreen/BDSCR070.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR071.jpg b/graphics/BDScreen/BDSCR071.jpg deleted file mode 100644 index 509b552fc..000000000 Binary files a/graphics/BDScreen/BDSCR071.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR072.jpg b/graphics/BDScreen/BDSCR072.jpg deleted file mode 100644 index 5f0574d0c..000000000 Binary files a/graphics/BDScreen/BDSCR072.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR073.jpg b/graphics/BDScreen/BDSCR073.jpg deleted file mode 100644 index ddb73ff58..000000000 Binary files a/graphics/BDScreen/BDSCR073.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR074.jpg b/graphics/BDScreen/BDSCR074.jpg deleted file mode 100644 index 60145a7ab..000000000 Binary files a/graphics/BDScreen/BDSCR074.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR075.jpg b/graphics/BDScreen/BDSCR075.jpg deleted file mode 100644 index af3fa6b12..000000000 Binary files a/graphics/BDScreen/BDSCR075.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR076.jpg b/graphics/BDScreen/BDSCR076.jpg deleted file mode 100644 index d40095190..000000000 Binary files a/graphics/BDScreen/BDSCR076.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR077.jpg b/graphics/BDScreen/BDSCR077.jpg deleted file mode 100644 index f0d783331..000000000 Binary files a/graphics/BDScreen/BDSCR077.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR078.jpg b/graphics/BDScreen/BDSCR078.jpg deleted file mode 100644 index 3d5fe0375..000000000 Binary files a/graphics/BDScreen/BDSCR078.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR079.jpg b/graphics/BDScreen/BDSCR079.jpg deleted file mode 100644 index c2d4d1212..000000000 Binary files a/graphics/BDScreen/BDSCR079.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR080.jpg b/graphics/BDScreen/BDSCR080.jpg deleted file mode 100644 index 1b39c6e10..000000000 Binary files a/graphics/BDScreen/BDSCR080.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR081.jpg b/graphics/BDScreen/BDSCR081.jpg deleted file mode 100644 index cd4329f2c..000000000 Binary files a/graphics/BDScreen/BDSCR081.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR082.jpg b/graphics/BDScreen/BDSCR082.jpg deleted file mode 100644 index 49d11e2d6..000000000 Binary files a/graphics/BDScreen/BDSCR082.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR083.jpg b/graphics/BDScreen/BDSCR083.jpg deleted file mode 100644 index df6fdd9d9..000000000 Binary files a/graphics/BDScreen/BDSCR083.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR084.jpg b/graphics/BDScreen/BDSCR084.jpg deleted file mode 100644 index cca378679..000000000 Binary files a/graphics/BDScreen/BDSCR084.jpg and /dev/null differ diff --git a/graphics/BDScreen/BDSCR085.jpg b/graphics/BDScreen/BDSCR085.jpg deleted file mode 100644 index b62ea7299..000000000 Binary files a/graphics/BDScreen/BDSCR085.jpg and /dev/null differ diff --git a/graphics/BDScreen/BOYKISS0.png b/graphics/BDScreen/BOYKISS0.png new file mode 100644 index 000000000..de4e171aa Binary files /dev/null and b/graphics/BDScreen/BOYKISS0.png differ diff --git a/graphics/BDScreen/BOYKISS1.png b/graphics/BDScreen/BOYKISS1.png new file mode 100644 index 000000000..36b525a8d Binary files /dev/null and b/graphics/BDScreen/BOYKISS1.png differ diff --git a/graphics/BDScreen/BOYKISS2.png b/graphics/BDScreen/BOYKISS2.png new file mode 100644 index 000000000..d58cf2993 Binary files /dev/null and b/graphics/BDScreen/BOYKISS2.png differ diff --git a/graphics/BDScreen/BOYKISS3.png b/graphics/BDScreen/BOYKISS3.png new file mode 100644 index 000000000..64e8267cf Binary files /dev/null and b/graphics/BDScreen/BOYKISS3.png differ diff --git a/graphics/BDScreen/BOYKISS4.png b/graphics/BDScreen/BOYKISS4.png new file mode 100644 index 000000000..dada807a5 Binary files /dev/null and b/graphics/BDScreen/BOYKISS4.png differ diff --git a/graphics/BDScreen/BOYKISS5.png b/graphics/BDScreen/BOYKISS5.png new file mode 100644 index 000000000..854de4fd9 Binary files /dev/null and b/graphics/BDScreen/BOYKISS5.png differ diff --git a/graphics/BDScreen/BOYKISS6.png b/graphics/BDScreen/BOYKISS6.png new file mode 100644 index 000000000..da7a186d9 Binary files /dev/null and b/graphics/BDScreen/BOYKISS6.png differ diff --git a/graphics/BDScreen/BOYKISS7.png b/graphics/BDScreen/BOYKISS7.png new file mode 100644 index 000000000..1c4c43d3f Binary files /dev/null and b/graphics/BDScreen/BOYKISS7.png differ diff --git a/graphics/BDScreen/BOYKISS8.png b/graphics/BDScreen/BOYKISS8.png new file mode 100644 index 000000000..5a6ed83eb Binary files /dev/null and b/graphics/BDScreen/BOYKISS8.png differ diff --git a/graphics/BDScreen/BOYKISS9.png b/graphics/BDScreen/BOYKISS9.png new file mode 100644 index 000000000..79bada1e8 Binary files /dev/null and b/graphics/BDScreen/BOYKISS9.png differ diff --git a/graphics/BDScreen/BOYKISSR.png b/graphics/BDScreen/BOYKISSR.png new file mode 100644 index 000000000..d1bbafb73 Binary files /dev/null and b/graphics/BDScreen/BOYKISSR.png differ diff --git a/language.version b/language.version index 13d291323..94e0d9676 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r838 \cu(Sat 29 Jul 14:44:34 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r838 \cu(2023-07-29 14:44:34)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r925 \cu(Sat 29 Jul 18:00:28 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r925 \cu(2023-07-29 18:00:28)\c-"; diff --git a/music/thepenis.it b/music/thepenis.it new file mode 100644 index 000000000..2f109a6fe Binary files /dev/null and b/music/thepenis.it differ diff --git a/sndinfo.base b/sndinfo.base index ffb00001f..89682ce15 100644 --- a/sndinfo.base +++ b/sndinfo.base @@ -28,7 +28,6 @@ $random title/explo { title/explo1 title/explo2 title/explo3 title/explo4 } $limit title/explo 64 title/thump = "sounds/TitleThump.ogg" $limit title/thump 16 -brutal/bdscreen = "sounds/BDSCREEN.ogg" misc/secret = "sounds/CTF5.ogg" misc/keytry = "sounds/LOCKDOOR.ogg" diff --git a/sounds/BDSCREEN.ogg b/sounds/BDSCREEN.ogg deleted file mode 100644 index 1ee5d4440..000000000 Binary files a/sounds/BDSCREEN.ogg and /dev/null differ diff --git a/zscript/compat/swwm_shame.zsc b/zscript/compat/swwm_shame.zsc index 72ecd32c5..588675b8d 100644 --- a/zscript/compat/swwm_shame.zsc +++ b/zscript/compat/swwm_shame.zsc @@ -13,10 +13,14 @@ Class SWWMBrutalHandler : StaticEventHandler { ui int timer; - ui TextureID scr[85]; + ui Font fnt; + ui TextureID boydance[10], boykiss; + ui int boyframe, boystate, boyloop1, boyloop2, boytimer; bool detected; String which, whichshort; + const BOYTICRATE = 5; + override void OnRegister() { // check for brutal doom @@ -66,21 +70,134 @@ Class SWWMBrutalHandler : StaticEventHandler timer = 0; return; } - if ( timer == 35 ) + if ( timer == 70 ) { - S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); - S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + boykiss = TexMan.CheckForTexture("graphics/BDScreen/BOYKISSR.png"); + fnt = Font.GetFont("TewiFontOutline"); + S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1.,ATTN_NONE); + S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1.,ATTN_NONE); + S_ChangeMusic("",force:true); + Console.PrintfEx(PRINT_HIGH|PRINT_NONOTIFY,"\n\n\cjYou like playing \cg"..which.."\cj don't you?\c-\n\n\n"); } else if ( timer == 140 ) { - for ( int i=0; i<85; i++ ) - scr[i] = TexMan.CheckForTexture(String.Format("graphics/BDScreen/BDSCR%03d.jpg",i+1)); - S_ChangeMusic("",force:true); - S_StartSound("brutal/bdscreen",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); - S_StartSound("brutal/bdscreen",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + for ( int i=0; i<10; i++ ) + boydance[i] = TexMan.CheckForTexture(String.Format("graphics/BDScreen/BOYKISS%d.png",i)); + S_ChangeMusic("music/thepenis.it",force:true); } - else if ( timer == 484 ) ThrowAbortException("This manual abort is for your own safety"); + else if ( timer == 2100 ) ThrowAbortException("This manual abort is for your own safety"); timer++; + if ( timer >= 105 ) + { + boytimer++; + switch ( boystate ) + { + case 0: // up + boyframe = 0; + if ( !(boytimer%BOYTICRATE) ) + boystate = 1; + break; + case 1: // down + boyframe = 1; + if ( !(boytimer%BOYTICRATE) ) + { + if ( boyloop1 >= 2 ) + { + boyloop1 = 0; + boystate = 2; + } + else + { + boyloop1++; + boystate = 0; + } + } + break; + case 2: // turn A + boyframe = 2; + if ( !(boytimer%BOYTICRATE) ) + boystate = 3; + break; + case 3: // turn B + boyframe = 3; + if ( !(boytimer%BOYTICRATE) ) + boystate = 4; + break; + case 4: // down + boyframe = 4; + if ( !(boytimer%BOYTICRATE) ) + boystate = 5; + break; + case 5: // up + boyframe = 5; + if ( !(boytimer%BOYTICRATE) ) + { + if ( boyloop1 >= 2 ) + { + boyloop1 = 0; + boystate = 6; + } + else + { + boyloop1++; + boystate = 4; + } + } + break; + case 6: // turn B + boyframe = 3; + if ( !(boytimer%BOYTICRATE) ) + boystate = 7; + break; + case 7: // turn A + boyframe = 2; + if ( !(boytimer%BOYTICRATE) ) + { + if ( boyloop2 >= 2 ) + { + boyloop2 = 0; + boystate = 8; + } + else + { + boyloop2++; + boystate = 0; + } + } + break; + case 8: // spin left + boyframe = 6; + if ( !(boytimer%BOYTICRATE) ) + boystate = 9; + break; + case 9: // spin back + boyframe = 7; + if ( !(boytimer%BOYTICRATE) ) + boystate = 10; + break; + case 10: // spin right + boyframe = 8; + if ( !(boytimer%BOYTICRATE) ) + boystate = 11; + break; + case 11: // spin front + boyframe = 9; + if ( !(boytimer%BOYTICRATE) ) + { + if ( boyloop1 >= 2 ) + { + boyloop1 = 0; + boystate = 0; + } + else + { + boyloop1++; + boystate = 8; + } + } + break; + } + } } override void WorldTick() @@ -92,16 +209,24 @@ Class SWWMBrutalHandler : StaticEventHandler override void RenderOverlay( RenderEvent e ) { if ( !detected ) return; - if ( timer < 35 ) return; - Screen.Dim("Black",clamp(((timer+e.fractic)-35.)/70.,0.,1.),0,0,Screen.GetWidth(),Screen.GetHeight()); - if ( timer < 140 ) + Screen.Dim("White",clamp((timer+e.fractic)/70.,0.,1.),0,0,Screen.GetWidth(),Screen.GetHeight()); + if ( timer < 70 ) return; + String str = "You like playing \cg"..which.."\c- don't you?"; + int boxh = fnt?((fnt.GetHeight()+16)*CleanYFac):0; + double scl = (Screen.GetHeight()-boxh)/2048.; + if ( boykiss.IsValid() ) Screen.DrawTexture(boykiss,false,Screen.GetWidth()/2,(Screen.GetHeight()-boxh)/2,DTA_CenterOffset,true,DTA_ScaleX,scl,DTA_ScaleY,scl); + if ( fnt ) { - String str = "Can I run this with \cg"..which.."\c-?"; - Screen.DrawText(bigfont,Font.CR_WHITE,(Screen.GetWidth()-bigfont.StringWidth(str)*CleanXFac_1)/2,(Screen.GetHeight()-bigfont.GetHeight()*CleanYFac_1)/2,str,DTA_CleanNoMove_1,true); - return; + Screen.Dim("Black",.8,0,Screen.GetHeight()-boxh,Screen.GetWidth(),boxh); + Screen.DrawText(fnt,Font.CR_WHITE,(Screen.GetWidth()-fnt.StringWidth(str)*CleanXFac)/2,Screen.GetHeight()-(boxh-8*CleanYFac),str,DTA_CleanNoMove,true); + } + if ( timer < 140 ) return; + if ( boydance[boyframe].IsValid() ) + { + Screen.DrawTexture(boydance[boyframe],false,112*CleanXFac_1,192*CleanYFac_1,DTA_CleanNoMove_1,true); + Screen.DrawTexture(boydance[boyframe],false,Screen.GetWidth()-112*CleanXFac_1,192*CleanYFac_1,DTA_CleanNoMove_1,true); + Screen.DrawTexture(boydance[boyframe],false,112*CleanXFac_1,Screen.GetHeight()-(boxh+32*CleanYFac_1),DTA_CleanNoMove_1,true); + Screen.DrawTexture(boydance[boyframe],false,Screen.GetWidth()-112*CleanXFac_1,Screen.GetHeight()-(boxh+32*CleanYFac_1),DTA_CleanNoMove_1,true); } - int frameno = clamp((timer-140)/4,0,84); - double scl = max(floor(Screen.GetWidth()/320.),1.); - Screen.DrawTexture(scr[frameno],false,(Screen.GetWidth()-320*scl)/2,(Screen.GetHeight()-132*scl)/2,DTA_ScaleX,scl,DTA_ScaleY,scl); } }