1
0
Fork 0

Pandemonia 2.4.1 + Anarchy 1.1.1 monsters.

This commit is contained in:
Marisa the Magician 2023-10-10 16:30:15 +02:00
parent b7fb1cd927
commit 33b1f7e667
4 changed files with 346 additions and 258 deletions

View File

@ -2,7 +2,6 @@ This repository contains compatibility patches for various monster packs that ad
- [Colourful Hell](https://forum.zdoom.org/viewtopic.php?t=47980) (Lots of fancy monsters in a variety of color-based rarities)
- [DRLA Monsters](https://forum.zdoom.org/viewtopic.php?t=37044) (Featuring a pain elemental that can make you telefrag yourself)
- [LEGION](https://forum.zdoom.org/viewtopic.php?t=76032) (Meant for the Hearts of Demons series, but still worth checking out)
- [Legion of Bones](https://forum.zdoom.org/viewtopic.php?t=65583) (They've got a bone to pick with you)
- [Malefactors](https://combine-kegan.itch.io/combined-arms) (My legs are OK)
- [Project Malice](https://github.com/TheBlueSavior/Project-Malice) (Creepy-ass monsters)

View File

@ -1,242 +0,0 @@
version "4.10"
// NOTE: This patch is currently unfinished
Class LegionFunTagService : Service
{
override String GetString( String request, String stringarg, int intarg, double doublearg, object objectarg )
{
if ( request != "GetFunTag" ) return "";
switch ( objectarg.GetClassName() )
{
case 'LEG_Arachnodrone':
return "Very Brainy Boye";
case 'LEG_Brain':
return "Brainy Boye";
case 'LEG_BoltVile':
return "Shockmaster";
case 'LEG_IceVile':
return "Frostilicus";
case 'LEG_Archvile':
return "Lanky Martian";
case 'LEG_Wizard':
return "Foreskin Sorcerer";
case 'LEG_BaronMage':
return "Yer a Wizard Harry";
case 'LEG_BruiserDemon':
return "Cruisin' for a Bruisin'";
case 'LEG_CyberBaron':
return "Goatinator";
case 'LEG_DarkBaron':
return "Goth Baron";
case 'LEG_IceBaron':
return "Ice To See You";
case 'LEG_BaronOfHell':
return "Bullshit Noble";
case 'LEG_PyroBaron':
return "Hot Stuff Coming";
case 'LEG_Broodmother':
return "Your Mom";
case 'BabyCaco':
return "Babby Tomato";
case 'LEG_CacoLich':
return "Flying Lychee";
case 'LEG_IceCaco':
return "Frosty Tomato";
case 'LEG_FireCaco':
return "Spicy Tomato";
case 'LEG_Cacodemon':
return "Angry Tomato";
case 'LEG_CyberDemon':
return "Demonic Shit Brickhouse";
case 'LEG_CyberKnight':
return "Discount Goatinator";
case 'LEG_HellKnight':
return "Discount Noble";
case 'LEG_Labolas':
return "TheBalls";
case 'LEG_COM_LMG':
return "Dakka Cum Mango";
case 'LEG_COM_AR':
return "Ass-Salt Cum Mango";
case 'LEG_COM_SMG':
return "Smeeg Cum Mango";
case 'LEG_COM_Shotgun':
return "Shotty Cum Mango";
case 'LEG_BOSS_CYBORGCOM':
return "The Cummest of Mangos";
case 'LEG_FAC_LMG':
return "Dakka Fuckulty";
case 'LEG_FAC_Pistol':
return "Piss Shot Fuckulty";
case 'LEG_FAC_AR':
return "Ass-Salt Fuckulty";
case 'LEG_FAC_SMG':
return "Smeeg Fuckulty";
case 'LEG_FAC_Shotgun':
return "Shotty Fuckulty";
case 'LEG_SOL_LMG':
return "Dakka Soul Dyer";
case 'LEG_SOL_AR':
return "Ass-Salt Soul Dyer";
case 'LEG_SOL_SMG':
return "Smeeg Soul Dyer";
case 'LEG_SOL_Shotgun':
return "Shotty Soul Dyer";
case 'LEG_Boss_CyborgScout':
return "The Soulest of Dyers";
case 'LEG_Unwilling':
return "Pissant";
case 'LEG_Zombie_1':
return "Zombo";
case 'LEG_Zombie_2':
return "Zimzoom";
case 'LEG_Zombie_3':
return "Zombango";
case 'LEG_CyberImp':
return "Borg Ass";
case 'LEG_DarkImp':
return "Dork Imp";
case 'LEG_DarkImp2':
return "Bork Imp";
case 'LEG_DarkImp3':
return "100% Black Imp";
case 'LEG_DarkImp4':
return "Double Dank";
case 'LEG_Harvester':
return "Something Something Combine Harvester";
case 'LEG_IceImp':
return "Ice Ice Baby";
case 'LEG_IceImp2':
return "Cold Boy";
case 'LEG_IceImp3':
return "Frosties";
case 'LEG_IceImp4':
return "Ice and Nice";
case 'LEG_BOSS_ImpMage':
return "Spiky Dick-Ass Mage";
case 'LEG_Imp':
return "Twink";
case 'LEG_Imp2':
return "Hump";
case 'LEG_Imp3':
return "Lank";
case 'LEG_Imp4':
return "Double Twink";
case 'LEG_BoltSoul':
return "Zaphead";
case 'LEG_IceSoul':
return "Coolhead";
case 'LEG_LostSoul':
return "Hothead";
case 'LEG_DamnedSoulBolt':
return "Dang Zaphead";
case 'LEG_DamnedSoulIce':
return "Dang Coolhead";
case 'LEG_DamnedSoul':
return "Dang Hothead";
case 'LEG_ColdFatso':
return "Frozen Fats";
case 'LEG_DarkFatso':
return "Burned Fats";
case 'LEG_Fatso':
return "Fat Bastard";
case 'LEG_AgonyElemental':
return "Absolute Garbage";
case 'LEG_PainElemental':
return "Piece of Shit";
case 'LEG_CyberPinky':
return "Mecha-Gorilla";
case 'LEG_DarkPinky':
return "Angry Dog";
case 'LEG_Pinky':
return "Pink Ass";
case 'LEG_Pinky2':
return "Pissed Off Babuin";
case 'LEG_Spectre':
return "Stinky";
case 'LEG_NakedRevenant':
return "NAKED BONER???";
case 'LEG_Revenant':
return "Boner Boi";
case 'LEG_HeavyBonerLikeMineHeheheheheheh':
return "Armored Boner";
case 'LEG_ParaRev':
return "THEY FLY NOW";
case 'LEG_SpiderMastermind':
return "Nerd Supreme";
}
return "";
}
}
Class LegionMergeMonsterService : Service
{
override String GetString( String request, String stringarg, int intarg, double doublearg, object objectarg )
{
if ( request != "MergeMonster" ) return "";
Class<Actor> cls = stringarg;
if ( !cls ) return "";
switch ( cls.GetClassName() )
{
case 'LEG_BruiserDemon':
case 'LEG_IceBaron':
// same tag
return 'LEG_BaronOfHell';
case 'LEG_IceCaco':
case 'LEG_FireCaco':
case 'BabyCaco':
// as long as these monsters' tags remain identical, not much we can do
return 'LEG_Cacodemon';
case 'LEG_Zombie_2':
case 'LEG_Zombie_3':
return 'LEG_Zombie_1';
case 'LEG_FAC_SMG':
case 'LEG_FAC_Shotgun':
case 'LEG_FAC_AR':
case 'LEG_FAC_LMG':
return 'LEG_FAC_Pistol';
case 'LEG_SOL_Shotgun':
case 'LEG_SOL_AR':
case 'LEG_SOL_LMG':
return 'LEG_SOL_SMG';
case 'LEG_COM_Shotgun':
case 'LEG_COM_AR':
case 'LEG_COM_LMG':
return 'LEG_COM_SMG';
case 'LEG_DarkImp':
case 'LEG_DarkImp2':
case 'LEG_DarkImp3':
case 'LEG_DarkImp4':
case 'LEG_Imp2':
case 'LEG_Imp3':
case 'LEG_Imp4':
case 'LEG_IceImp':
case 'LEG_IceImp2':
case 'LEG_IceImp3':
case 'LEG_IceImp4':
return 'LEG_Imp';
case 'LEG_BoltSoul':
case 'LEG_IceSoul':
case 'LEG_DamnedSoul':
case 'LEG_DamnedSoulBolt':
case 'LEG_DamnedSoulIce':
// same deal as the cacos
return 'LEG_LostSoul';
case 'LEG_DarkFatso':
// this is starting to become a pattern
return 'LEG_Fatso';
case 'LEG_AgonyElemental':
return 'LEG_PainElemental';
case 'LEG_Pinky2':
case 'LEG_Spectre':
case 'LEG_DarkPinky':
case 'LEG_CyberPinky':
return 'LEG_Pinky';
case 'LEG_HeavyBonerLikeMineHeheheheheheh': // bruh
case 'LEG_NakedRevenant': // ah! naked boner!
return 'LEG_Revenant';
}
return "";
}
}

View File

@ -176,16 +176,6 @@ FN_PANDDEVIL_FUN2="Premium Mipmap";
FN_PANDDEVIL_FUN3="Horned Twink";
FN_PANDDEVIL_FUN4="Upgraded Cheeks";
FN_PANDDEVIL_FUN5="Boy Next Door";
FN_PANDHARVESTER_FUNN="9";
FN_PANDHARVESTER_FUN1="Spooky Cheeks";
FN_PANDHARVESTER_FUN2="Thin Twink";
FN_PANDHARVESTER_FUN3="Combine Harvester";
FN_PANDHARVESTER_FUN4="Hair Vester";
FN_PANDHARVESTER_FUN5="Harbl";
FN_PANDHARVESTER_FUN6="Have A Steer";
FN_PANDHARVESTER_FUN7="Havester";
FN_PANDHARVESTER_FUN8="Mipster";
FN_PANDHARVESTER_FUN9="Hamster";
FN_PANDPLAGUELING_FUNN="7";
FN_PANDPLAGUELING_FUN1="Bugger";
FN_PANDPLAGUELING_FUN2="Snot Twink";
@ -729,6 +719,219 @@ FN_ROASTEROCK_FUN13="General Risetock";
FN_ROASTEROCK_FUN14="General Rockerstocker";
FN_ROASTEROCK_FUN15="That Guy With The Loud Voice";
FN_ROASTEROCK_FUN16="He Roast";
// 2.3 additions
FN_PANDCINDER_FUNN="8";
FN_PANDCINDER_FUN1="Cinderella";
FN_PANDCINDER_FUN2="Tinder";
FN_PANDCINDER_FUN3="Binder";
FN_PANDCINDER_FUN4="Finder";
FN_PANDCINDER_FUN5="High Explosionator";
FN_PANDCINDER_FUN6="Boomer Alert";
FN_PANDCINDER_FUN7="Why Am I Exploding?";
FN_PANDCINDER_FUN8="Nasty Sniper";
FN_PANDPYRO_FUNN="8";
FN_PANDPYRO_FUN1="Fireman";
FN_PANDPYRO_FUN2="Firestarter";
FN_PANDPYRO_FUN3="Twisted Firestarter";
FN_PANDPYRO_FUN4="Wicked Firestarter";
FN_PANDPYRO_FUN5="Fart Starter";
FN_PANDPYRO_FUN6="Flaming Moe's";
FN_PANDPYRO_FUN7="Flaming Homer's";
FN_PANDPYRO_FUN8="Burney";
FN_PANDINFERCOM_FUNN="6";
FN_PANDINFERCOM_FUN1="Burninator";
FN_PANDINFERCOM_FUN2="Infernator";
FN_PANDINFERCOM_FUN3="infer.com";
FN_PANDINFERCOM_FUN4="Furnace Nando";
FN_PANDINFERCOM_FUN5="Fiery Fernando";
FN_PANDINFERCOM_FUN6="Pants On Fire";
FN_PANDCULTIST_FUNN="8";
FN_PANDCULTIST_FUN1="Modern Arts";
FN_PANDCULTIST_FUN2="Fear Books";
FN_PANDCULTIST_FUN3="Marinara";
FN_PANDCULTIST_FUN4="Bollocks";
FN_PANDCULTIST_FUN5="Cultivated";
FN_PANDCULTIST_FUN6="Cultured";
FN_PANDCULTIST_FUN7="Cult Man";
FN_PANDCULTIST_FUN8="Stink Religion";
FN_PANDACOLYTE_FUNN="7";
FN_PANDACOLYTE_FUN1="Stinky Alchemist";
FN_PANDACOLYTE_FUN2="Bad Chemistry";
FN_PANDACOLYTE_FUN3="Al Chemist";
FN_PANDACOLYTE_FUN4="Breaking Bad";
FN_PANDACOLYTE_FUN5="Stinking Bad";
FN_PANDACOLYTE_FUN6="Smeller";
FN_PANDACOLYTE_FUN7="Stink Thrower";
FN_PANDABADDON_FUNN="6";
FN_PANDABADDON_FUN1="A Bad One";
FN_PANDABADDON_FUN2="A Baton";
FN_PANDABADDON_FUN3="Abacus";
FN_PANDABADDON_FUN4="Bad Bone";
FN_PANDABADDON_FUN5="Air Fryer";
FN_PANDABADDON_FUN6="Caco Grill";
FN_PANDCHAOSCACO_FUNN="7";
FN_PANDCHAOSCACO_FUN1="Wretched Chaos Creature";
FN_PANDCHAOSCACO_FUN2="Kill It With Fire";
FN_PANDCHAOSCACO_FUN3="Huge-Ass Fucker";
FN_PANDCHAOSCACO_FUN4="Hell Is This";
FN_PANDCHAOSCACO_FUN5="DO NOT WANT";
FN_PANDCHAOSCACO_FUN6="Screech Creature";
FN_PANDCHAOSCACO_FUN7="Chaotically Ugly";
FN_PANDAUTOMATO_FUNN="6";
FN_PANDAUTOMATO_FUN1="Automato";
FN_PANDAUTOMATO_FUN2="Mechapain";
FN_PANDAUTOMATO_FUN3="Auto Matron";
FN_PANDAUTOMATO_FUN4="Tomatomaton";
FN_PANDAUTOMATO_FUN5="Augmented Shit";
FN_PANDAUTOMATO_FUN6="Augmented Trash";
FN_PANDCYDESTRUCTOR_FUNN="6";
FN_PANDCYDESTRUCTOR_FUN1="Ultimate Goatinator";
FN_PANDCYDESTRUCTOR_FUN2="Augmentation Overload";
FN_PANDCYDESTRUCTOR_FUN3="Armed To The Goat";
FN_PANDCYDESTRUCTOR_FUN4="Guns Guns Guns";
FN_PANDCYDESTRUCTOR_FUN5="Use More Gun";
FN_PANDCYDESTRUCTOR_FUN6="Up Your Arsenal";
FN_PANDAPOLLYON_FUNN="5";
FN_PANDAPOLLYON_FUN1="Apollo Justice";
FN_PANDAPOLLYON_FUN2="Boney Artificer";
FN_PANDAPOLLYON_FUN3="Bombs Away";
FN_PANDAPOLLYON_FUN4="Bomberbone";
FN_PANDAPOLLYON_FUN5="Skelebomber";
FN_PANDCHAOSPYLON_FUNN="9";
FN_PANDCHAOSPYLON_FUN1="Lesser Chaos";
FN_PANDCHAOSPYLON_FUN2="Green Spin";
FN_PANDCHAOSPYLON_FUN3="Pylo";
FN_PANDCHAOSPYLON_FUN4="Pilaf";
FN_PANDCHAOSPYLON_FUN5="Peter";
FN_PANDCHAOSPYLON_FUN6="Python";
FN_PANDCHAOSPYLON_FUN7="Put On";
FN_PANDCHAOSPYLON_FUN8="Budget Chaos";
FN_PANDCHAOSPYLON_FUN9="Chaos Minilith";
FN_PANDARASCORCH_FUNN="5";
FN_PANDARASCORCH_FUN1="Ara Ara";
FN_PANDARASCORCH_FUN2="Scotch";
FN_PANDARASCORCH_FUN3="Torcher";
FN_PANDARASCORCH_FUN4="Toastinator";
FN_PANDARASCORCH_FUN5="Roast Spooder";
FN_PANDDEMOLITRON_FUNN="6";
FN_PANDDEMOLITRON_FUN1="Demo Version";
FN_PANDDEMOLITRON_FUN2="Ammunition";
FN_PANDDEMOLITRON_FUN3="Memetron";
FN_PANDDEMOLITRON_FUN4="Spidertron";
FN_PANDDEMOLITRON_FUN5="Gunned Spooder";
FN_PANDDEMOLITRON_FUN6="Babby Gunner";
FN_PANDCHAOSCYBER_FUNN="8";
FN_PANDCHAOSCYBER_FUN1="Absolutely Heretical";
FN_PANDCHAOSCYBER_FUN2="Bible Thumper";
FN_PANDCHAOSCYBER_FUN3="Holy Shit";
FN_PANDCHAOSCYBER_FUN4="Pope Of Green";
FN_PANDCHAOSCYBER_FUN5="Eclectic Starch";
FN_PANDCHAOSCYBER_FUN6="Ukelele";
FN_PANDCHAOSCYBER_FUN7="Edelgard";
FN_PANDCHAOSCYBER_FUN8="Éclair";
// 2.4 additions
FN_PANDSCOURGEZOMB_FUNN="8";
FN_PANDSCOURGEZOMB_FUN1="Scurvy";
FN_PANDSCOURGEZOMB_FUN2="Scrungus";
FN_PANDSCOURGEZOMB_FUN3="Funny Smeller";
FN_PANDSCOURGEZOMB_FUN4="Stink Commando";
FN_PANDSCOURGEZOMB_FUN5="Farterator";
FN_PANDSCOURGEZOMB_FUN6="Green Cloak";
FN_PANDSCOURGEZOMB_FUN7="Stinky Hood";
FN_PANDSCOURGEZOMB_FUN8="Score Butt";
FN_PANDFLINTSTONE_FUNN="6";
FN_PANDFLINTSTONE_FUN1="Brad Brimstone";
FN_PANDFLINTSTONE_FUN2="Mario 7";
FN_PANDFLINTSTONE_FUN3="Grand Dad";
FN_PANDFLINTSTONE_FUN4="Fleentstones?";
FN_PANDFLINTSTONE_FUN5="Flaming Twink";
FN_PANDFLINTSTONE_FUN6="Hot Cheeks";
FN_PANDCYBIMP_FUNN="6";
FN_PANDCYBIMP_FUN1="My Twink Is Augmented";
FN_PANDCYBIMP_FUN2="Quite Cymple";
FN_PANDCYBIMP_FUN3="Zappy Boy";
FN_PANDCYBIMP_FUN4="Cyberbutt";
FN_PANDCYBIMP_FUN5="Zap Ass";
FN_PANDCYBIMP_FUN6="Processed Mipmap";
FN_PANDSAVAGE_FUNN="5";
FN_PANDSAVAGE_FUN1="Savage";
FN_PANDSAVAGE_FUN2="UNATCO?";
FN_PANDSAVAGE_FUN3="No, Savage";
FN_PANDSAVAGE_FUN4="U-UNATCO?";
FN_PANDSAVAGE_FUN5="Quit Screwing Around";
FN_PANDASCH_FUNN="5";
FN_PANDASCH_FUN1="The Prince";
FN_PANDASCH_FUN2="Prince Goat";
FN_PANDASCH_FUN3="Asching Questions";
FN_PANDASCH_FUN4="Truly An Asch";
FN_PANDASCH_FUN5="Pretty Prince";
// 2.4.1 additions
FN_PANDGLADIATOR_FUNN="7";
FN_PANDGLADIATOR_FUN1="Big Bone";
FN_PANDGLADIATOR_FUN2="Skeletus Maximus";
FN_PANDGLADIATOR_FUN3="Skelator";
FN_PANDGLADIATOR_FUN4="You're Boned";
FN_PANDGLADIATOR_FUN5="Rattle Surprise";
FN_PANDGLADIATOR_FUN6="Catbine Puncher";
FN_PANDGLADIATOR_FUN7="Calciator";
// Anarchy additions
FN_PANDAQUADSHOT_FUNN="8";
FN_PANDAQUADSHOT_FUN1="Quad Shottage";
FN_PANDAQUADSHOT_FUN2="Fourman";
FN_PANDAQUADSHOT_FUN3="Queso";
FN_PANDAQUADSHOT_FUN4="Quasó";
FN_PANDAQUADSHOT_FUN5="Croissant";
FN_PANDAQUADSHOT_FUN6="Cuatro";
FN_PANDAQUADSHOT_FUN7="Four Balls";
FN_PANDAQUADSHOT_FUN8="Four Fun Fan";
FN_PANDAHARVESTER_FUNN="9";
FN_PANDAHARVESTER_FUN1="Spooky Cheeks";
FN_PANDAHARVESTER_FUN2="Thin Twink";
FN_PANDAHARVESTER_FUN3="Combine Harvester";
FN_PANDAHARVESTER_FUN4="Hair Vester";
FN_PANDAHARVESTER_FUN5="Harbl";
FN_PANDAHARVESTER_FUN6="Have A Steer";
FN_PANDAHARVESTER_FUN7="Havester";
FN_PANDAHARVESTER_FUN8="Mipster";
FN_PANDAHARVESTER_FUN9="Hamster";
FN_PANDADARKCYWARD_FUNN="7";
FN_PANDADARKCYWARD_FUN1="Dark Cyberlion";
FN_PANDADARKCYWARD_FUN2="Dark Lionator";
FN_PANDADARKCYWARD_FUN3="The Dark Cybermane";
FN_PANDADARKCYWARD_FUN4="Dark Cyberwarren";
FN_PANDADARKCYWARD_FUN5="Dark Cybergarden";
FN_PANDADARKCYWARD_FUN6="Very Augmented Shields";
FN_PANDADARKCYWARD_FUN7="Dark Den of Cyberwar";
FN_PANDADARKCYDEST_FUN="6";
FN_PANDADARKCYDEST_FUN1="Ultimatum Goatinatum";
FN_PANDADARKCYDEST_FUN2="Augmentation Hyperload";
FN_PANDADARKCYDEST_FUN3="Walking Arsenal";
FN_PANDADARKCYDEST_FUN4="The Gunnest";
FN_PANDADARKCYDEST_FUN5="All Of The Guns";
FN_PANDADARKCYDEST_FUN6="Big Arse Goat";
FN_PANDADARKNIHIL_FUNN="4";
FN_PANDADARKNIHIL_FUN1="Double Trouble In Green";
FN_PANDADARKNIHIL_FUN2="Twice Greened";
FN_PANDADARKNIHIL_FUN3="It's Green Too";
FN_PANDADARKNIHIL_FUN4="OK What The Fuck";
FN_PANDADESOLES_FUNN="8";
FN_PANDADESOLES_FUN1="Dark Soles";
FN_PANDADESOLES_FUN2="The Solator";
FN_PANDADESOLES_FUN3="Désolé";
FN_PANDADESOLES_FUN4="Them Soles";
FN_PANDADESOLES_FUN5="O'Sole Mio";
FN_PANDADESOLES_FUN6="Sunburnt";
FN_PANDADESOLES_FUN7="Extra Crispy";
FN_PANDADESOLES_FUN8="Big Tanned Guy";
// Anarchy bosses
FN_PANDARADICAL_FUNN="7";
FN_PANDARADICAL_FUN1="Dementia";
FN_PANDARADICAL_FUN2="Emmental";
FN_PANDARADICAL_FUN3="The Mental";
FN_PANDARADICAL_FUN4="Rental";
FN_PANDARADICAL_FUN5="Radical Dents";
FN_PANDARADICAL_FUN6="Full Frontal";
FN_PANDARADICAL_FUN7="Wental";
//// boss tags
BT_MYRKURA="Myrkura, Formless Eradicator";
BT_MYRKURA_FUN="Hell Is That Thing";
@ -784,7 +987,6 @@ OBITUARY_SCOUNDREL_MELEE="%o got scandalous.";
OBITUARY_SCOUNDREL="%o received a scandal.";
OBITUARY_DEVIL_MELEE="%o received a delightfully devilish takedown.";
OBITUARY_DEVIL="%o ate a delightfully devilish fireball.";
OBITUARY_HARVESTER="%o got harvested.";
OBITUARY_PLAGUELING_MELEE="%o got a nasty scratch.";
OBITUARY_PLAGUELING="%o ate that nasty goo.";
OBITUARY_CHAOSIMP_MELEE="%o ate green claw.";
@ -887,13 +1089,56 @@ OBITUARY_ERADICATOR="%o got eradicated very radically.";
OBITUARY_DEMOLISHER="%o ate lead and went home to mommy.";
OBITUARY_ARACHNOPHYTE="%o is on fire, very much.";
OBITUARY_SPIDERMASTERSPARK="%o thinks %g has seen that spell somewhere before.";
OBITUARY_CHAOSMONOLITH="%o can't do everything.";
OBITUARY_CHAOSMONOLITH="%o can't do anything.";
OBITUARY_SCYTHE2AFRIT_MELEE="%o was very a-fried very closely.";
OBITUARY_SCYTHE2AFRIT="%o was very a-fried.";
OBITUARY_SCYTHE2MARINE="%o hates speedhack users.";
OBITUARY_EPIC2ALIEN="%o was alienated.";
OBITUARY_MYRKURA="%o was noticed by Myr-senpai.";
OBITUARY_GENERALROASTEROCK="%o was roasted by the roast man himself.";
// 2.3 additions
OBITUARY_CINDERZOMBIE="%o ate exploding boolets.";
OBITUARY_PYROZOMBIE="%o felt quite the warm treatment from a local fireman.";
OBITUARY_INFERNALCOMMANDO="%o got deep-fried in the face.";
OBITUARY_CHAOSCULTIST="%o was introduced to modern arts and fear books.";
OBITUARY_CHAOSACOLYTE="%o was introduced to the dangers of chemistry.";
OBITUARY_ABADDON_MELEE="%o clearly doesn't own an air fryer.";
OBITUARY_ABADDON="%o got badly fried.";
OBITUARY_CHAOSSTALKER_MELEE="%o got stalked very closely.";
OBITUARY_CHAOSSTALKER="%o got stalked.";
OBITUARY_AUTOMATONELEMENTAL_MELEE="%o shouldn't have stuck %h fingers into the machine.";
OBITUARY_AUTOMATONELEMENTAL="%o was destroyed very automatically.";
OBITUARY_CYDESTRUCTOR="%o was destroyed quite cybernetically.";
OBITUARY_APOLLYON_MELEE="%o really ate that entire fist.";
OBITUARY_APOLLYON="%o couldn't evade the aforementioned barrage.";
OBITUARY_CHAOSPYLON="%o got chaotically piled on.";
OBITUARY_ARACHNOSCORCHER="%o really felt the burn of that.";
OBITUARY_DEMOLITRON="%o got taken out like trash.";
OBITUARY_CHAOSECCLESIARCH="%o was taken to church.";
OBITUARY_DARKMASTERMIND="%o got zooted hella hard by a dork brain.";
// 2.4 additions
OBITUARY_SCOURGEZOMBIE="%o caught the zombie's scurvy.";
OBITUARY_BRIMPSTONEIMP_MELEE="%o met the flintstones.";
OBITUARY_BRIMPSTONEIMP="%o ate melty rock.";
OBITUARY_CYBERIMP_MELEE="%o didn't respect that twink's personal space.";
OBITUARY_CYBERIMP="%o got zapped by an augmented twink.";
OBITUARY_ABYSSALSAVAGE_MELEE="%o was savagely pummeled.";
OBITUARY_ABYSSALSAVAGE="%o was savagely attacked.";
OBITUARY_HELLPRINCEASCH_MELEE="%o received a royal smackdown.";
OBITUARY_HELLPRINCEASCH="%o was honorably defeated in a royal duel.";
// 2.4.1 additions
OBITUARY_ANCIENTGLADIATOR_MELEE="%o is not entertained.";
OBITUARY_ANCIENTGLADIATOR="%o truly did not avoid such a gladiatorial wedgie.";
// Anarchy additions
OBITUARY_QUADSHOTGUNZOMBIE="%o ate four times the daily recommended intake of buckshot.";
OBITUARY_HARVESTER="%o got harvested.";
OBITUARY_DARKCYBERWARDEN_MELEE="%o tried to pet the dark cyberlion.";
OBITUARY_DARKCYBERWARDEN="%o god lion'd, darkly and cybernetically.";
OBITUARY_DARKCYDESTRUCTOR="%o embraced a dark cyberdestruction.";
OBITUARY_DARKANNIHILATOR="%o was annihilated quite darkly.";
OBITUARY_DESOLATOR="%o is truly desolated.";
// Anarchy bosses
OBITUARY_ERADICATOR_ANARCHIC="%o experienced a quite demential eradication.";
//// misc
D_PURSE="\cxWARNING:\c- Hostile pursuer in area. Attention is advised.";
D_ROAST="%s has logged in.";

View File

@ -87,9 +87,6 @@ Class PandFunTagService : Service
case 'Devil':
basetag = "PANDDEVIL";
break;
case 'Harvester':
basetag = "PANDHARVESTER";
break;
case 'Plagueling':
basetag = "PANDPLAGUELING";
break;
@ -376,6 +373,95 @@ Class PandFunTagService : Service
case 'GeneralRoasterock':
basetag = "ROASTEROCK";
break;
// 2.3 additions
case 'CinderZombie':
basetag = "PANDCINDER";
break;
case 'PyroZombie':
basetag = "PANDPYRO";
break;
case 'InfernalCommando':
basetag = "PANDINFERCOM";
break;
case 'ChaosCultist':
basetag = "PANDCULTIST";
break;
case 'ChaosAcolyte':
basetag = "PANDACOLYTE";
break;
case 'Abaddon':
basetag = "PANDABADDON";
break;
case 'ChaosStalker':
basetag = "PANDCHAOSCACO";
break;
case 'AutomatonElemental':
basetag = "PANDAUTOMATO";
break;
case 'Cydestructor':
basetag = "PANDCYDESTRUCTOR";
break;
case 'Apollyon':
basetag = "PANDAPOLLYON";
break;
case 'ChaosPylon':
basetag = "PANDCHAOSPYLON";
break;
case 'Arachnoscorcher':
basetag = "PANDARASCORCH";
break;
case 'Demolitron':
basetag = "PANDDEMOLITRON";
break;
case 'ChaosEcclesiarch':
basetag = "PANDCHAOSCYBER";
break;
case 'DarkMastermind':
basetag = "PANDDARKERMIND";
break;
// 2.4 additions
case 'ScourgeZombie':
basetag = "PANDSCOURGEZOMB";
break;
case 'BrimstoneImp':
basetag = "PANDFLINTSTONE";
break;
case 'CyberImp':
basetag = "PANDCYBIMP";
break;
case 'AbyssalSavage':
basetag = "PANDSAVAGE";
break;
case 'HellPrinceAsch':
basetag = "PANDASCH";
break;
// 2.4.1 additions
case 'AncientGladiator':
basetag = "PANDGLADIATOR";
break;
// Anarchy additions
case 'QuadShotgunZombie':
basetag = "PANDAQUADSHOT";
break;
case 'Harvester':
basetag = "PANDAHARVESTER";
break;
case 'DarkCyberwarden':
basetag = "PANDADARKCYWARD";
break;
case 'DarkCydestructor':
basetag = "PANDADARKCYDEST";
break;
case 'DarkAnnihilator':
basetag = "PANDADARKNIHIL";
break;
case 'Desolator':
basetag = "PANDADESOLES";
break;
// Anarchy boss variants
case 'Eradicator_Anarchic':
basetag = "PANDARADICAL";
break;
}
String funtag = "FN_"..basetag.."_FUN";
String lfuntag = StringTable.Localize(funtag,false);