From e204bdba7e50e3a553d2277470366c0ac10eb2cf Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 22 Feb 2014 01:54:40 +0000 Subject: [PATCH] dehacked: Add ZDoom obituaries. When playing in ZDoom-based ports, a message is shown when the player dies which depends on the monster that killed them or (in deathmatch) the weapon they were killed with. Because ZDoom uses obituaries that mention the Doom weapons and monsters, override so that Freedoom is internally consistent when playing using these ports. --- lumps/fraggle/freedm.bex | 50 ++++++++++++++++++++++++++++++++++++++ lumps/fraggle/freedoom.bex | 50 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/lumps/fraggle/freedm.bex b/lumps/fraggle/freedm.bex index 972055b5..ca86bad5 100644 --- a/lumps/fraggle/freedm.bex +++ b/lumps/fraggle/freedm.bex @@ -318,3 +318,53 @@ C6TEXT = You've found the second secret level.\n\nHope you like green. #STARTUP4 #STARTUP5 #SAVEGAMENAME +# Obituary texts, for ZDoom-based ports. +OB_STEALTHBABY=%o thought %g saw a Small Technospider. +OB_STEALTHVILE=%o thought %g saw an Flame Bringer. +OB_STEALTHBARON=%o thought %g saw a Pain Lord. +OB_STEALTHCACO=%o thought %g saw an Orb Monster. +OB_STEALTHCHAINGUY=%o thought %g saw a Minigun Zombie. +OB_STEALTHDEMON=%o thought %g saw a Worm. +OB_STEALTHKNIGHT=%o thought %g saw a Pain Bringer. +OB_STEALTHIMP=%o thought %g saw an Serpent. +OB_STEALTHFATSO=%o thought %g saw a Combat Slug. +OB_STEALTHUNDEAD=%o thought %g saw a Dark Soldier. +OB_STEALTHSHOTGUY=%o thought %g saw a Shotgun Zombie. +OB_STEALTHZOMBIE=%o thought %g saw a Zombie. +OB_UNDEADHIT=%o was punched by a Dark Soldier. +OB_IMPHIT=%o was slashed by a Serpent. +OB_CACOHIT=%o got too close to an Orb Monster. +OB_DEMONHIT=%o was bitten by a Worm. +OB_SPECTREHIT=%o was eaten by a Stealth Worm. +OB_BARONHIT=%o was torn open by a Pain Lord. +OB_KNIGHTHIT=%o was gutted by a Pain Bringer. +OB_ZOMBIE=%o was killed by a Zombie. +OB_SHOTGUY=%o was gunned down by a Shotgun Zombie. +OB_VILE=%o was incinerated by a Flame Bringer. +OB_UNDEAD=%o couldn't evade the Dark Soldier's fireball. +OB_FATSO=%o was blasted by a Combat Slug. +OB_CHAINGUY=%o was perforated by a Minigun Zombie. +OB_SKULL=%o was slammed by a Deadflare. +OB_IMP=%o was burned by an Serpent. +OB_CACO=%o was smitten by an Orb Monster. +OB_BARON=%o was bruised by a Pain Lord. +OB_KNIGHT=%o was splayed by a Pain Bringer. +OB_SPIDER=%o stood in awe of the Large Technospider. +OB_BABY=%o let a Small Technospider get %h. +OB_CYBORG=%o was splattered by an Assault Tripod. +OB_WOLFSS=%o met a Sailor. +OB_MPFIST=%o punched %k to death. +OB_MPCHAINSAW=%o was shredded by %k's angle grinder. +OB_MPPISTOL=%o was tickled by %k's handgun. +OB_MPSHOTGUN=%o chewed on %k's boomstick. +OB_MPSSHOTGUN=%k swapped two barrels upside %o's head. +OB_MPCHAINGUN=%o was perforated by %k's minigun. +OB_MPROCKET=%o was mutilated by %k's missile. +OB_MPR_SPLASH=%o couldn't dodge %k's missile. +OB_MPPLASMARIFLE=%o swallowed too much of %k's polaric energy. +OB_MPBFG_BOOM=%o was splintered by %k's SKAG. +OB_MPBFG_SPLASH=%o couldn't hide from %k's SKAG. +OB_MPTELEFRAG=%o stood where %k was teleporting. +OB_RAILGUN=%o was railed by %k. +OB_MPBFG_MBF=%o was burned by %k's SKAG. + diff --git a/lumps/fraggle/freedoom.bex b/lumps/fraggle/freedoom.bex index d0751687..4c49f97f 100644 --- a/lumps/fraggle/freedoom.bex +++ b/lumps/fraggle/freedoom.bex @@ -322,3 +322,53 @@ C6TEXT = You place your hand on the strange\nyellow column, and quickly remember #STARTUP4 #STARTUP5 #SAVEGAMENAME +# Obituary texts, for ZDoom-based ports. +OB_STEALTHBABY=%o thought %g saw a Small Technospider. +OB_STEALTHVILE=%o thought %g saw an Flame Bringer. +OB_STEALTHBARON=%o thought %g saw a Pain Lord. +OB_STEALTHCACO=%o thought %g saw an Orb Monster. +OB_STEALTHCHAINGUY=%o thought %g saw a Minigun Zombie. +OB_STEALTHDEMON=%o thought %g saw a Worm. +OB_STEALTHKNIGHT=%o thought %g saw a Pain Bringer. +OB_STEALTHIMP=%o thought %g saw an Serpent. +OB_STEALTHFATSO=%o thought %g saw a Combat Slug. +OB_STEALTHUNDEAD=%o thought %g saw a Dark Soldier. +OB_STEALTHSHOTGUY=%o thought %g saw a Shotgun Zombie. +OB_STEALTHZOMBIE=%o thought %g saw a Zombie. +OB_UNDEADHIT=%o was punched by a Dark Soldier. +OB_IMPHIT=%o was slashed by a Serpent. +OB_CACOHIT=%o got too close to an Orb Monster. +OB_DEMONHIT=%o was bitten by a Worm. +OB_SPECTREHIT=%o was eaten by a Stealth Worm. +OB_BARONHIT=%o was torn open by a Pain Lord. +OB_KNIGHTHIT=%o was gutted by a Pain Bringer. +OB_ZOMBIE=%o was killed by a Zombie. +OB_SHOTGUY=%o was gunned down by a Shotgun Zombie. +OB_VILE=%o was incinerated by a Flame Bringer. +OB_UNDEAD=%o couldn't evade the Dark Soldier's fireball. +OB_FATSO=%o was blasted by a Combat Slug. +OB_CHAINGUY=%o was perforated by a Minigun Zombie. +OB_SKULL=%o was slammed by a Deadflare. +OB_IMP=%o was burned by an Serpent. +OB_CACO=%o was smitten by an Orb Monster. +OB_BARON=%o was bruised by a Pain Lord. +OB_KNIGHT=%o was splayed by a Pain Bringer. +OB_SPIDER=%o stood in awe of the Large Technospider. +OB_BABY=%o let a Small Technospider get %h. +OB_CYBORG=%o was splattered by an Assault Tripod. +OB_WOLFSS=%o met a Sailor. +OB_MPFIST=%o punched %k to death. +OB_MPCHAINSAW=%o was shredded by %k's angle grinder. +OB_MPPISTOL=%o was tickled by %k's handgun. +OB_MPSHOTGUN=%o chewed on %k's boomstick. +OB_MPSSHOTGUN=%k swapped two barrels upside %o's head. +OB_MPCHAINGUN=%o was perforated by %k's minigun. +OB_MPROCKET=%o was mutilated by %k's missile. +OB_MPR_SPLASH=%o couldn't dodge %k's missile. +OB_MPPLASMARIFLE=%o swallowed too much of %k's polaric energy. +OB_MPBFG_BOOM=%o was splintered by %k's SKAG. +OB_MPBFG_SPLASH=%o couldn't hide from %k's SKAG. +OB_MPTELEFRAG=%o stood where %k was teleporting. +OB_RAILGUN=%o was railed by %k. +OB_MPBFG_MBF=%o was burned by %k's SKAG. +