diff --git a/gldefs.misc b/gldefs.misc index 7b8802564..eb688218c 100644 --- a/gldefs.misc +++ b/gldefs.misc @@ -122,6 +122,46 @@ HardwareShader Texture "graphics/M_DEMOCHAN_PUSHER.png" { Shader "shaders/glsl/Bilinear.fp" } +HardwareShader Texture "graphics/M_DEMOCHAN_DAB.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_DOUBLEV.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_HEALTH.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_LOVE.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_RAGEKIT.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_SANDWICH.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_SHELLS.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_SKULL.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_THONK.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} +HardwareShader Texture "graphics/M_DEMOCHAN_THUMBUP.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} HardwareShader Texture "graphics/UnSXLogo.png" { Shader "shaders/glsl/Bilinear.fp" diff --git a/graphics/M_DEMOCHAN_DAB.png b/graphics/M_DEMOCHAN_DAB.png new file mode 100644 index 000000000..5123a2e77 Binary files /dev/null and b/graphics/M_DEMOCHAN_DAB.png differ diff --git a/graphics/M_DEMOCHAN_DOUBLEV.png b/graphics/M_DEMOCHAN_DOUBLEV.png new file mode 100644 index 000000000..8dd7b3a91 Binary files /dev/null and b/graphics/M_DEMOCHAN_DOUBLEV.png differ diff --git a/graphics/M_DEMOCHAN_HEALTH.png b/graphics/M_DEMOCHAN_HEALTH.png new file mode 100644 index 000000000..7903abc05 Binary files /dev/null and b/graphics/M_DEMOCHAN_HEALTH.png differ diff --git a/graphics/M_DEMOCHAN_LOVE.png b/graphics/M_DEMOCHAN_LOVE.png new file mode 100644 index 000000000..24fda0536 Binary files /dev/null and b/graphics/M_DEMOCHAN_LOVE.png differ diff --git a/graphics/M_DEMOCHAN_RAGEKIT.png b/graphics/M_DEMOCHAN_RAGEKIT.png new file mode 100644 index 000000000..112e61b5a Binary files /dev/null and b/graphics/M_DEMOCHAN_RAGEKIT.png differ diff --git a/graphics/M_DEMOCHAN_SANDWICH.png b/graphics/M_DEMOCHAN_SANDWICH.png new file mode 100644 index 000000000..780499ab2 Binary files /dev/null and b/graphics/M_DEMOCHAN_SANDWICH.png differ diff --git a/graphics/M_DEMOCHAN_SHELLS.png b/graphics/M_DEMOCHAN_SHELLS.png new file mode 100644 index 000000000..037ec4acd Binary files /dev/null and b/graphics/M_DEMOCHAN_SHELLS.png differ diff --git a/graphics/M_DEMOCHAN_SKULL.png b/graphics/M_DEMOCHAN_SKULL.png new file mode 100644 index 000000000..17f2719be Binary files /dev/null and b/graphics/M_DEMOCHAN_SKULL.png differ diff --git a/graphics/M_DEMOCHAN_THONK.png b/graphics/M_DEMOCHAN_THONK.png new file mode 100644 index 000000000..d64e56e45 Binary files /dev/null and b/graphics/M_DEMOCHAN_THONK.png differ diff --git a/graphics/M_DEMOCHAN_THUMBUP.png b/graphics/M_DEMOCHAN_THUMBUP.png new file mode 100644 index 000000000..713d4d8f0 Binary files /dev/null and b/graphics/M_DEMOCHAN_THUMBUP.png differ diff --git a/language.def_menu b/language.def_menu index 5326e9253..da886aa95 100644 --- a/language.def_menu +++ b/language.def_menu @@ -418,7 +418,7 @@ TOOLTIP_SWWM_MM_THINGCOLOR_VIPITEM = "Color for very important items."; TOOLTIP_SWWM_MM_THINGCOLOR_SHOOTABLE = "Color for things that can be damaged."; TOOLTIP_SWWM_MM_THINGCOLOR_MISSILE = "Color for projectiles."; // main menu poses (do not localize) -SWWM_NMENUPOSE = "11"; +SWWM_NMENUPOSE = "21"; SWWM_MENUPOSE1 = "graphics/M_DEMOCHAN_DEEPIMPACT.png"; SWWM_MENUPOSE2 = "graphics/M_DEMOCHAN_EXPLOGUN.png"; SWWM_MENUPOSE3 = "graphics/M_DEMOCHAN_SPREADGUN.png"; @@ -430,6 +430,16 @@ SWWM_MENUPOSE8 = "graphics/M_DEMOCHAN_SILVERBULLET.png"; SWWM_MENUPOSE9 = "graphics/M_DEMOCHAN_CANDYGUN.png"; SWWM_MENUPOSE10 = "graphics/M_DEMOCHAN_YNYKRON.png"; SWWM_MENUPOSE11 = "graphics/M_DEMOCHAN_PUSHER.png"; +SWWM_MENUPOSE12 = "graphics/M_DEMOCHAN_DAB.png"; +SWWM_MENUPOSE13 = "graphics/M_DEMOCHAN_DOUBLEV.png"; +SWWM_MENUPOSE14 = "graphics/M_DEMOCHAN_HEALTH.png"; +SWWM_MENUPOSE15 = "graphics/M_DEMOCHAN_LOVE.png"; +SWWM_MENUPOSE16 = "graphics/M_DEMOCHAN_RAGEKIT.png"; +SWWM_MENUPOSE17 = "graphics/M_DEMOCHAN_SANDWICH.png"; +SWWM_MENUPOSE18 = "graphics/M_DEMOCHAN_SHELLS.png"; +SWWM_MENUPOSE19 = "graphics/M_DEMOCHAN_SKULL.png"; +SWWM_MENUPOSE20 = "graphics/M_DEMOCHAN_THONK.png"; +SWWM_MENUPOSE21 = "graphics/M_DEMOCHAN_THUMBUP.png"; // credits SWWM_MCREDS = "DEMOLITIONIST Credits"; SWWM_CSTITLE = "UnSX Side Story: Demolitionist"; diff --git a/language.version b/language.version index e9e7e1705..21f97c0ca 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r113 \cu(Sat 15 Jan 17:10:06 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.2pre r113 \cu(2022-01-15 17:10:06)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r114 \cu(Sat 15 Jan 23:29:53 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.2pre r114 \cu(2022-01-15 23:29:53)\c-"; diff --git a/zmapinfo.txt b/zmapinfo.txt index c4b0c0cde..fd5652292 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -76,6 +76,7 @@ GameInfo "SWWMRedSkullGesture", "SWWMBlueSkullGesture", "SWWMYellowSkullGesture", + "SWWMPurpleSkullGesture", "SWWMGreenKeyGesture", "SWWMBlueKeyGesture", "SWWMYellowKeyGesture", @@ -87,20 +88,12 @@ GameInfo "FrispyCornGesture", "SayaBeanGesture", "MothPlushyGesture", - "AA12ModelGesture", - "CactusHegeGesture", - "TastyHoagieGesture", - "IbukiMilkGesture", - "BRCAlbumGesture", "DemoPlushGesture", - "ManarokouGesture", - "LithiumNovelGesture", "KirinCummiesGesture", "MilkBreadsGesture", "KirinMangaGesture", - "KirinPlushGesture", - "PsykkonovexxGesture" - // preload intro textures + "KirinPlushGesture" + // preload intro and menu textures PrecacheTextures = "graphics/SWWMGZLogo.png", "graphics/SWWMGZLogo_Layer1.png", "graphics/SWWMGZLogo_Layer2.png", @@ -108,6 +101,14 @@ GameInfo "graphics/SWWMGZLogo_Layer4.png", "graphics/SWWMGZLogo_Layer5.png", "graphics/SWWMGZLogo_Layer6.png", + "graphics/M_SWWM.png", + "graphics/M_SWWM_Layer1.png", + "graphics/M_SWWM_Layer2.png", + "graphics/M_SWWM_Layer3.png", + "graphics/M_SWWM_Layer4.png", + "graphics/M_SWWM_Layer5.png", + "graphics/M_SWWM_Layer6.png", + "graphics/M_DEMOCHAN.png", "graphics/NewLogo.png", "graphics/NewLogo_Grad.png", "graphics/NewLogo_Layer1.png", @@ -126,7 +127,29 @@ GameInfo "graphics/NewLogo_Letter10.png", "graphics/NewLogo_Letter11.png", "graphics/NewLogo_Letter12.png", - "graphics/NewLogo_Letter13.png" + "graphics/NewLogo_Letter13.png", + "graphics/M_DEMOLITIONIST.png", + "graphics/M_DEMOCHAN_BIOSPARK.png", + "graphics/M_DEMOCHAN_CANDYGUN.png", + "graphics/M_DEMOCHAN_DEEPIMPACT.png", + "graphics/M_DEMOCHAN_EVISCERATOR.png", + "graphics/M_DEMOCHAN_EXPLOGUN.png", + "graphics/M_DEMOCHAN_HELLBLAZER.png", + "graphics/M_DEMOCHAN_PUSHER.png", + "graphics/M_DEMOCHAN_SILVERBULLET.png", + "graphics/M_DEMOCHAN_SPREADGUN.png", + "graphics/M_DEMOCHAN_WALLBUSTER.png", + "graphics/M_DEMOCHAN_YNYKRON.png", + "graphics/M_DEMOCHAN_DAB.png", + "graphics/M_DEMOCHAN_DOUBLEV.png", + "graphics/M_DEMOCHAN_HEALTH.png", + "graphics/M_DEMOCHAN_LOVE.png", + "graphics/M_DEMOCHAN_RAGEKIT.png", + "graphics/M_DEMOCHAN_SANDWICH.png", + "graphics/M_DEMOCHAN_SHELLS.png", + "graphics/M_DEMOCHAN_SKULL.png", + "graphics/M_DEMOCHAN_THONK.png", + "graphics/M_DEMOCHAN_THUMBUP.png" } ClearSkills diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc index 21e646423..9f422059e 100644 --- a/zscript/menu/swwm_menus.zsc +++ b/zscript/menu/swwm_menus.zsc @@ -342,7 +342,10 @@ Class SWWMMainMenu : SWWMCleanMenu override void Drawer() { double frametime = (MSTime()-prevms)/1000.; - double theta = clamp(2.*frametime,0.,1.); // naive, but whatever + double theta; + // naive, but whatever + if ( swwm_oldlogo ) theta = clamp(2.*frametime,0.,1.); + else theta = clamp(4.*frametime,0.,1.); if ( prevms ) demopos = demopos*(1.-theta)-40*theta; double alph = clamp(1.-(demopos/100),0.,1.); if ( !swwm_oldlogo )