diff --git a/credits.txt b/credits.txt index aea483a0a..06115b514 100644 --- a/credits.txt +++ b/credits.txt @@ -41,5 +41,6 @@ Most of the work here is original, but there are some notable exceptions: - Extra gib anims for vanilla monsters: * Ryan Cordell (Demon, Cacodemon, Revenant, Archvile) * Amuscaria (Baron of Hell, Hell Knight) + * Blox (Arachnotron, Mancubus) - SiFi270 (Less mean-spirited Keen replacement) - Widescreen version of Hexen finale screens by Nash. diff --git a/language.def_menu b/language.def_menu index 8090a8ab0..b5f49361d 100644 --- a/language.def_menu +++ b/language.def_menu @@ -376,6 +376,7 @@ SWWM_CDEV2 = "Self-proclaimed ZScript Magician"; SWWM_CASSETS = "Additional Assets:"; SWWM_ASSBARONS = "XDeath Sprites for Hell Nobles"; SWWM_ASSOTHERS = "XDeath Sprites for Demon, Cacodemon, Revenant, Archvile"; +SWWM_ASSEXTRA = "XDeath Sprites for Arachnotron, Mancubus"; SWWM_ASSKEEN = "Less Mean-Spirited Keen Replacement"; SWWM_CMUSIC = "Music Tracks Used:"; SWWM_CFANART = "Intermission Fanart:"; diff --git a/language.es_menu b/language.es_menu index 2858dfbc1..07850c77f 100644 --- a/language.es_menu +++ b/language.es_menu @@ -373,6 +373,7 @@ SWWM_CDEV2 = "Autoproclamada Maga de ZScript"; SWWM_CASSETS = "Assets Adicionales:"; SWWM_ASSBARONS = "Sprites de XDeath para Nobles del Infierno"; SWWM_ASSOTHERS = "Sprites de XDeath para Demonio, Cacodemonio, Renacido, Archvile"; +SWWM_ASSEXTRA = "Sprites de XDeath para Aracnotrón, Mancubus"; SWWM_ASSKEEN = "Reemplazo Menos Vil de Keen"; SWWM_CMUSIC = "Música Usada:"; SWWM_CFANART = "Fanart de Intermisión:"; diff --git a/language.version b/language.version index faa4f5eec..af8e82f02 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r540 \cu(Sun 13 Jun 18:05:52 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r540 \cu(2021-06-13 18:05:52)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r541 \cu(Sun 13 Jun 18:49:43 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r541 \cu(2021-06-13 18:49:43)\c-"; diff --git a/sprites/xdeaths/BO2XA0.png b/sprites/xdeaths/BO2XA0.png index af0fb46be..d2485ceb4 100644 Binary files a/sprites/xdeaths/BO2XA0.png and b/sprites/xdeaths/BO2XA0.png differ diff --git a/sprites/xdeaths/BO2XB0.png b/sprites/xdeaths/BO2XB0.png index 382ccc6d7..49109694e 100644 Binary files a/sprites/xdeaths/BO2XB0.png and b/sprites/xdeaths/BO2XB0.png differ diff --git a/sprites/xdeaths/BO2XC0.png b/sprites/xdeaths/BO2XC0.png index fe944a2ea..dd15ab67e 100644 Binary files a/sprites/xdeaths/BO2XC0.png and b/sprites/xdeaths/BO2XC0.png differ diff --git a/sprites/xdeaths/BO2XD0.png b/sprites/xdeaths/BO2XD0.png index c710ff2e5..c624f4368 100644 Binary files a/sprites/xdeaths/BO2XD0.png and b/sprites/xdeaths/BO2XD0.png differ diff --git a/sprites/xdeaths/BO2XE0.png b/sprites/xdeaths/BO2XE0.png index 640e28bc3..ed96fc61e 100644 Binary files a/sprites/xdeaths/BO2XE0.png and b/sprites/xdeaths/BO2XE0.png differ diff --git a/sprites/xdeaths/BO2XF0.png b/sprites/xdeaths/BO2XF0.png index dab39d8f0..f9f13c6c6 100644 Binary files a/sprites/xdeaths/BO2XF0.png and b/sprites/xdeaths/BO2XF0.png differ diff --git a/sprites/xdeaths/BO2XG0.png b/sprites/xdeaths/BO2XG0.png index b7093112b..abc44cc8c 100644 Binary files a/sprites/xdeaths/BO2XG0.png and b/sprites/xdeaths/BO2XG0.png differ diff --git a/sprites/xdeaths/BO2XH0.png b/sprites/xdeaths/BO2XH0.png index fc23972c6..21432f454 100644 Binary files a/sprites/xdeaths/BO2XH0.png and b/sprites/xdeaths/BO2XH0.png differ diff --git a/sprites/xdeaths/BO2XI0.png b/sprites/xdeaths/BO2XI0.png index 89555a032..528baf30c 100644 Binary files a/sprites/xdeaths/BO2XI0.png and b/sprites/xdeaths/BO2XI0.png differ diff --git a/sprites/xdeaths/BOSXA0.png b/sprites/xdeaths/BOSXA0.png index 42b30d844..6c5eabc81 100644 Binary files a/sprites/xdeaths/BOSXA0.png and b/sprites/xdeaths/BOSXA0.png differ diff --git a/sprites/xdeaths/BOSXB0.png b/sprites/xdeaths/BOSXB0.png index 998794a71..3d0dd1831 100644 Binary files a/sprites/xdeaths/BOSXB0.png and b/sprites/xdeaths/BOSXB0.png differ diff --git a/sprites/xdeaths/BOSXC0.png b/sprites/xdeaths/BOSXC0.png index 1415cbb65..af0da3a69 100644 Binary files a/sprites/xdeaths/BOSXC0.png and b/sprites/xdeaths/BOSXC0.png differ diff --git a/sprites/xdeaths/BOSXD0.png b/sprites/xdeaths/BOSXD0.png index dde892a31..1026ee024 100644 Binary files a/sprites/xdeaths/BOSXD0.png and b/sprites/xdeaths/BOSXD0.png differ diff --git a/sprites/xdeaths/BOSXE0.png b/sprites/xdeaths/BOSXE0.png index e3e7ff5b3..0e65bca92 100644 Binary files a/sprites/xdeaths/BOSXE0.png and b/sprites/xdeaths/BOSXE0.png differ diff --git a/sprites/xdeaths/BOSXF0.png b/sprites/xdeaths/BOSXF0.png index 5e505946a..8607fde74 100644 Binary files a/sprites/xdeaths/BOSXF0.png and b/sprites/xdeaths/BOSXF0.png differ diff --git a/sprites/xdeaths/BOSXG0.png b/sprites/xdeaths/BOSXG0.png index 3d395df42..09528a10b 100644 Binary files a/sprites/xdeaths/BOSXG0.png and b/sprites/xdeaths/BOSXG0.png differ diff --git a/sprites/xdeaths/BOSXH0.png b/sprites/xdeaths/BOSXH0.png index 1c446fdb9..099b8203b 100644 Binary files a/sprites/xdeaths/BOSXH0.png and b/sprites/xdeaths/BOSXH0.png differ diff --git a/sprites/xdeaths/BOSXI0.png b/sprites/xdeaths/BOSXI0.png index 5f7ba7e51..dc20fa348 100644 Binary files a/sprites/xdeaths/BOSXI0.png and b/sprites/xdeaths/BOSXI0.png differ diff --git a/sprites/xdeaths/BSPXA0.png b/sprites/xdeaths/BSPXA0.png new file mode 100644 index 000000000..1b615800d Binary files /dev/null and b/sprites/xdeaths/BSPXA0.png differ diff --git a/sprites/xdeaths/BSPXB0.png b/sprites/xdeaths/BSPXB0.png new file mode 100644 index 000000000..f8a0e3603 Binary files /dev/null and b/sprites/xdeaths/BSPXB0.png differ diff --git a/sprites/xdeaths/BSPXC0.png b/sprites/xdeaths/BSPXC0.png new file mode 100644 index 000000000..9d00b264a Binary files /dev/null and b/sprites/xdeaths/BSPXC0.png differ diff --git a/sprites/xdeaths/BSPXD0.png b/sprites/xdeaths/BSPXD0.png new file mode 100644 index 000000000..7e39e7348 Binary files /dev/null and b/sprites/xdeaths/BSPXD0.png differ diff --git a/sprites/xdeaths/BSPXE0.png b/sprites/xdeaths/BSPXE0.png new file mode 100644 index 000000000..5de401250 Binary files /dev/null and b/sprites/xdeaths/BSPXE0.png differ diff --git a/sprites/xdeaths/BSPXF0.png b/sprites/xdeaths/BSPXF0.png new file mode 100644 index 000000000..bdbd51387 Binary files /dev/null and b/sprites/xdeaths/BSPXF0.png differ diff --git a/sprites/xdeaths/BSPXG0.png b/sprites/xdeaths/BSPXG0.png new file mode 100644 index 000000000..a4d7bf974 Binary files /dev/null and b/sprites/xdeaths/BSPXG0.png differ diff --git a/sprites/xdeaths/BSPXH0.png b/sprites/xdeaths/BSPXH0.png new file mode 100644 index 000000000..addfa0565 Binary files /dev/null and b/sprites/xdeaths/BSPXH0.png differ diff --git a/sprites/xdeaths/BSPXI0.png b/sprites/xdeaths/BSPXI0.png new file mode 100644 index 000000000..5f9d53f54 Binary files /dev/null and b/sprites/xdeaths/BSPXI0.png differ diff --git a/sprites/xdeaths/CACXA0.png b/sprites/xdeaths/CACXA0.png index 761385572..5e125b03d 100644 Binary files a/sprites/xdeaths/CACXA0.png and b/sprites/xdeaths/CACXA0.png differ diff --git a/sprites/xdeaths/CACXB0.png b/sprites/xdeaths/CACXB0.png index b5b733adb..f4a756bdd 100644 Binary files a/sprites/xdeaths/CACXB0.png and b/sprites/xdeaths/CACXB0.png differ diff --git a/sprites/xdeaths/CACXC0.png b/sprites/xdeaths/CACXC0.png index a73fd80ae..235ee17aa 100644 Binary files a/sprites/xdeaths/CACXC0.png and b/sprites/xdeaths/CACXC0.png differ diff --git a/sprites/xdeaths/CACXD0.png b/sprites/xdeaths/CACXD0.png index 7d81c80b8..65b11d69d 100644 Binary files a/sprites/xdeaths/CACXD0.png and b/sprites/xdeaths/CACXD0.png differ diff --git a/sprites/xdeaths/CACXE0.png b/sprites/xdeaths/CACXE0.png index f2113f930..bb1aac976 100644 Binary files a/sprites/xdeaths/CACXE0.png and b/sprites/xdeaths/CACXE0.png differ diff --git a/sprites/xdeaths/CACXF0.png b/sprites/xdeaths/CACXF0.png index ce105e798..cdaad02c1 100644 Binary files a/sprites/xdeaths/CACXF0.png and b/sprites/xdeaths/CACXF0.png differ diff --git a/sprites/xdeaths/CACXG0.png b/sprites/xdeaths/CACXG0.png index bcbf20ca5..7402b8530 100644 Binary files a/sprites/xdeaths/CACXG0.png and b/sprites/xdeaths/CACXG0.png differ diff --git a/sprites/xdeaths/CACXH0.png b/sprites/xdeaths/CACXH0.png index 003a0b625..f497941ff 100644 Binary files a/sprites/xdeaths/CACXH0.png and b/sprites/xdeaths/CACXH0.png differ diff --git a/sprites/xdeaths/FATXA0.png b/sprites/xdeaths/FATXA0.png new file mode 100644 index 000000000..a9da0d890 Binary files /dev/null and b/sprites/xdeaths/FATXA0.png differ diff --git a/sprites/xdeaths/FATXB0.png b/sprites/xdeaths/FATXB0.png new file mode 100644 index 000000000..1ef21fdea Binary files /dev/null and b/sprites/xdeaths/FATXB0.png differ diff --git a/sprites/xdeaths/FATXC0.png b/sprites/xdeaths/FATXC0.png new file mode 100644 index 000000000..b391fba6e Binary files /dev/null and b/sprites/xdeaths/FATXC0.png differ diff --git a/sprites/xdeaths/FATXD0.png b/sprites/xdeaths/FATXD0.png new file mode 100644 index 000000000..387657158 Binary files /dev/null and b/sprites/xdeaths/FATXD0.png differ diff --git a/sprites/xdeaths/FATXE0.png b/sprites/xdeaths/FATXE0.png new file mode 100644 index 000000000..978c37bb3 Binary files /dev/null and b/sprites/xdeaths/FATXE0.png differ diff --git a/sprites/xdeaths/FATXF0.png b/sprites/xdeaths/FATXF0.png new file mode 100644 index 000000000..bd589177b Binary files /dev/null and b/sprites/xdeaths/FATXF0.png differ diff --git a/sprites/xdeaths/REVXA0.png b/sprites/xdeaths/REVXA0.png index 863c43872..99cef5566 100644 Binary files a/sprites/xdeaths/REVXA0.png and b/sprites/xdeaths/REVXA0.png differ diff --git a/sprites/xdeaths/REVXB0.png b/sprites/xdeaths/REVXB0.png index c38b9be14..235eba78c 100644 Binary files a/sprites/xdeaths/REVXB0.png and b/sprites/xdeaths/REVXB0.png differ diff --git a/sprites/xdeaths/REVXC0.png b/sprites/xdeaths/REVXC0.png index 56dde65f8..1f9fe10a9 100644 Binary files a/sprites/xdeaths/REVXC0.png and b/sprites/xdeaths/REVXC0.png differ diff --git a/sprites/xdeaths/REVXD0.png b/sprites/xdeaths/REVXD0.png index e6b25a616..7066dbb1f 100644 Binary files a/sprites/xdeaths/REVXD0.png and b/sprites/xdeaths/REVXD0.png differ diff --git a/sprites/xdeaths/REVXE0.png b/sprites/xdeaths/REVXE0.png index ef851aef7..8e63f5425 100644 Binary files a/sprites/xdeaths/REVXE0.png and b/sprites/xdeaths/REVXE0.png differ diff --git a/sprites/xdeaths/REVXF0.png b/sprites/xdeaths/REVXF0.png index 1d011439e..8842cc3c3 100644 Binary files a/sprites/xdeaths/REVXF0.png and b/sprites/xdeaths/REVXF0.png differ diff --git a/sprites/xdeaths/SARXA0.png b/sprites/xdeaths/SARXA0.png index d9fa2b115..bc54e5acd 100644 Binary files a/sprites/xdeaths/SARXA0.png and b/sprites/xdeaths/SARXA0.png differ diff --git a/sprites/xdeaths/SARXB0.png b/sprites/xdeaths/SARXB0.png index fdffc9cca..db5921647 100644 Binary files a/sprites/xdeaths/SARXB0.png and b/sprites/xdeaths/SARXB0.png differ diff --git a/sprites/xdeaths/SARXC0.png b/sprites/xdeaths/SARXC0.png index 725935771..19761d113 100644 Binary files a/sprites/xdeaths/SARXC0.png and b/sprites/xdeaths/SARXC0.png differ diff --git a/sprites/xdeaths/SARXD0.png b/sprites/xdeaths/SARXD0.png index d2767c630..55a44b3cc 100644 Binary files a/sprites/xdeaths/SARXD0.png and b/sprites/xdeaths/SARXD0.png differ diff --git a/sprites/xdeaths/SARXE0.png b/sprites/xdeaths/SARXE0.png index 5ba640f25..4aa073354 100644 Binary files a/sprites/xdeaths/SARXE0.png and b/sprites/xdeaths/SARXE0.png differ diff --git a/sprites/xdeaths/SARXF0.png b/sprites/xdeaths/SARXF0.png index 1ad6a389c..bdc8f6940 100644 Binary files a/sprites/xdeaths/SARXF0.png and b/sprites/xdeaths/SARXF0.png differ diff --git a/sprites/xdeaths/SARXG0.png b/sprites/xdeaths/SARXG0.png index cf4661332..96d0c9246 100644 Binary files a/sprites/xdeaths/SARXG0.png and b/sprites/xdeaths/SARXG0.png differ diff --git a/sprites/xdeaths/VILXA0.png b/sprites/xdeaths/VILXA0.png index 553040b0a..85251bee0 100644 Binary files a/sprites/xdeaths/VILXA0.png and b/sprites/xdeaths/VILXA0.png differ diff --git a/sprites/xdeaths/VILXB0.png b/sprites/xdeaths/VILXB0.png index b19c65d47..614ef7c1a 100644 Binary files a/sprites/xdeaths/VILXB0.png and b/sprites/xdeaths/VILXB0.png differ diff --git a/sprites/xdeaths/VILXC0.png b/sprites/xdeaths/VILXC0.png index 98b1f6674..e866e2310 100644 Binary files a/sprites/xdeaths/VILXC0.png and b/sprites/xdeaths/VILXC0.png differ diff --git a/sprites/xdeaths/VILXD0.png b/sprites/xdeaths/VILXD0.png index 266a5df4f..28c1f9f42 100644 Binary files a/sprites/xdeaths/VILXD0.png and b/sprites/xdeaths/VILXD0.png differ diff --git a/sprites/xdeaths/VILXE0.png b/sprites/xdeaths/VILXE0.png index 5d65b92cd..aaea2e9ae 100644 Binary files a/sprites/xdeaths/VILXE0.png and b/sprites/xdeaths/VILXE0.png differ diff --git a/sprites/xdeaths/VILXF0.png b/sprites/xdeaths/VILXF0.png index fabeec087..614b63cd7 100644 Binary files a/sprites/xdeaths/VILXF0.png and b/sprites/xdeaths/VILXF0.png differ diff --git a/sprites/xdeaths/VILXG0.png b/sprites/xdeaths/VILXG0.png index 601adc855..99eb87fcb 100644 Binary files a/sprites/xdeaths/VILXG0.png and b/sprites/xdeaths/VILXG0.png differ diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index 086ea67c3..996eb48e2 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -18,7 +18,7 @@ extend Class SWWMHandler bool gotgibbed = (!e.Thing.bDONTGIB && ((e.Inflictor && e.Inflictor.bEXTREMEDEATH) || (e.DamageSource && e.DamageSource.bEXTREMEDEATH) || (e.DamageType == 'Extreme') || (e.Thing.Health < gibhealth)) && (!e.Inflictor || !e.Inflictor.bNOEXTREMEDEATH) && (!e.DamageSource || !e.DamageSource.bNOEXTREMEDEATH)); bool forcegibbed = false; // force gib availability for some vanilla Doom monsters - if ( gotgibbed && ((e.Thing.GetClass() == "Demon") || (e.Thing.GetClass() == "Spectre") || (e.Thing.GetClass() == "HellKnight") || (e.Thing.GetClass() == "BaronOfHell") || (e.Thing.GetClass() == "Cacodemon") || (e.Thing.GetClass() == "Revenant") || (e.Thing.GetClass() == "Archvile")) ) + if ( gotgibbed && ((e.Thing.GetClass() == "Demon") || (e.Thing.GetClass() == "Spectre") || (e.Thing.GetClass() == "HellKnight") || (e.Thing.GetClass() == "BaronOfHell") || (e.Thing.GetClass() == "Cacodemon") || (e.Thing.GetClass() == "Revenant") || (e.Thing.GetClass() == "Archvile") || (e.Thing.GetClass() == "Fatso") || (e.Thing.GetClass() == "Arachnotron")) ) forcegibbed = true; if ( !e.Thing.FindState("XDeath",true) && !e.Thing.FindState("Death.Extreme",true) && !forcegibbed ) gotgibbed = false; diff --git a/zscript/handler/swwm_handler_worldthings.zsc b/zscript/handler/swwm_handler_worldthings.zsc index 8ca1efeb0..380b2aa4c 100644 --- a/zscript/handler/swwm_handler_worldthings.zsc +++ b/zscript/handler/swwm_handler_worldthings.zsc @@ -145,6 +145,10 @@ extend Class SWWMHandler ExtraGibDeaths.GibThis(e.Thing,"BonerXDeath"); else if ( e.Thing.GetClass() == "Archvile" ) ExtraGibDeaths.GibThis(e.Thing,"VileXDeath"); + else if ( e.Thing.GetClass() == "Arachnotron" ) + ExtraGibDeaths.GibThis(e.Thing,"ArachXDeath"); + else if ( e.Thing.GetClass() == "Fatso" ) + ExtraGibDeaths.GibThis(e.Thing,"FatsoXDeath"); if ( profiling ) worldthingdied_ms += MSTime()-curms; } diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc index 6ca17ac2e..f657ca113 100644 --- a/zscript/menu/swwm_credits.zsc +++ b/zscript/menu/swwm_credits.zsc @@ -165,6 +165,7 @@ Class SWWMCreditsMenu : GenericMenu cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"From Software","Dark Souls\nDark Souls II\nDark Souls III")); cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Amuscaria","$SWWM_ASSBARONS")); cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Ryan Cordell","$SWWM_ASSOTHERS")); + cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Blox","$SWWM_ASSEXTRA")); cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"SiFi270","$SWWM_ASSKEEN")); cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Nash","WidePix")); cmusic.Push(new("SWWMCreditsEntry").Init(sfnt,"Teque","Traumatic State\nDragony\nHidden Tune #242\nHypercardish 1.1")); diff --git a/zscript/swwm_blod.zsc b/zscript/swwm_blod.zsc index 85cfd09fd..8a5d8ca60 100644 --- a/zscript/swwm_blod.zsc +++ b/zscript/swwm_blod.zsc @@ -717,6 +717,23 @@ Class ExtraGibDeaths : Actor VILX DEF 5; VILX G -1; Stop; + ArachXDeath: + BSPX A 5; + BSPX A 5 A_XScream(); + BSPX B 8 A_NoBlocking(); + BSPX C 6; + BSPX DE 6 BRIGHT; + BSPX F 5 BRIGHT; + BSPX GH 4 BRIGHT; + BSPX I -1 A_BossDeath(); + Stop; + FatsoXDeath: + FATX A 5; + FATX B 5 A_XScream(); + FATX C 5 A_NoBlocking(); + FATX DE 5; + FATX F -1 A_BossDeath(); + Stop; } }