Bump zscript ver to 4.14.1, plus a whole lot of stuff.
- Try to get rid of all implicit casts from string to name, color or class. - Use FindClass where needed. - Used a map in a case where a dictionary was unneeded. - Use new bounce flags where needed. - Replace Legacy of Rust weapons/ammo.
This commit is contained in:
parent
ceae806b68
commit
80db58b0d0
128 changed files with 3074 additions and 3088 deletions
|
|
@ -6,203 +6,203 @@ extend Class SWWMHandler
|
|||
|
||||
private Class<Actor> GetDRLAReplacee( Class<Actor> a )
|
||||
{
|
||||
static const String refpool[] =
|
||||
static const Name refpool[] =
|
||||
{
|
||||
"Zombieman",
|
||||
"Shotgunguy",
|
||||
"Chaingunguy",
|
||||
"DoomImp",
|
||||
"Demon",
|
||||
"Spectre",
|
||||
"LostSoul",
|
||||
"Cacodemon",
|
||||
"HellKnight",
|
||||
"BaronOfHell",
|
||||
"Arachnotron",
|
||||
"PainElemental",
|
||||
"Revenant",
|
||||
"Fatso",
|
||||
"Archvile",
|
||||
"Cyberdemon",
|
||||
"SpiderMastermind",
|
||||
"BossEye",
|
||||
"BossBrain"
|
||||
'Zombieman',
|
||||
'Shotgunguy',
|
||||
'Chaingunguy',
|
||||
'DoomImp',
|
||||
'Demon',
|
||||
'Spectre',
|
||||
'LostSoul',
|
||||
'Cacodemon',
|
||||
'HellKnight',
|
||||
'BaronOfHell',
|
||||
'Arachnotron',
|
||||
'PainElemental',
|
||||
'Revenant',
|
||||
'Fatso',
|
||||
'Archvile',
|
||||
'Cyberdemon',
|
||||
'SpiderMastermind',
|
||||
'BossEye',
|
||||
'BossBrain'
|
||||
};
|
||||
static const String babypool[] =
|
||||
static const Name babypool[] =
|
||||
{
|
||||
"RLFormerHumanPistol",
|
||||
"RLFormerSergeantShotgun",
|
||||
"RLFormerCommandoChaingun",
|
||||
"RLImp",
|
||||
"RLDemon",
|
||||
"RLSpectre",
|
||||
"RLLostSoul",
|
||||
"RLCacodemon",
|
||||
"RLHellKnight",
|
||||
"RLBaronOfHell",
|
||||
"RLArachnotron",
|
||||
"RLPainElemental",
|
||||
"RLRevenant",
|
||||
"RLMancubus",
|
||||
"RLArchvile",
|
||||
"RLCyberdemon",
|
||||
"RLSpiderMastermindVariantSpawner",
|
||||
"RLEasyBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanPistol',
|
||||
'RLFormerSergeantShotgun',
|
||||
'RLFormerCommandoChaingun',
|
||||
'RLImp',
|
||||
'RLDemon',
|
||||
'RLSpectre',
|
||||
'RLLostSoul',
|
||||
'RLCacodemon',
|
||||
'RLHellKnight',
|
||||
'RLBaronOfHell',
|
||||
'RLArachnotron',
|
||||
'RLPainElemental',
|
||||
'RLRevenant',
|
||||
'RLMancubus',
|
||||
'RLArchvile',
|
||||
'RLCyberdemon',
|
||||
'RLSpiderMastermindVariantSpawner',
|
||||
'RLEasyBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String easypool[] =
|
||||
static const Name easypool[] =
|
||||
{
|
||||
"RLFormerHumanNoArmageddonSpawner",
|
||||
"RLFormerSergeantNoArmageddonSpawner",
|
||||
"RLFormerCommandoNoArmageddonSpawner",
|
||||
"RLImpNoArmageddonSpawner",
|
||||
"RLDemonNoArmageddonSpawner",
|
||||
"RLSpectreNoArmageddonSpawner",
|
||||
"RLLostSoulNoArmageddonSpawner",
|
||||
"RLCacodemonNoArmageddonSpawner",
|
||||
"RLHellKnightNoArmageddonSpawner",
|
||||
"RLBaronOfHellNoArmageddonSpawner",
|
||||
"RLArachnotronNoArmageddonSpawner",
|
||||
"RLPainElementalNoArmageddonSpawner",
|
||||
"RLRevenantNoArmageddonSpawner",
|
||||
"RLMancubusNoArmageddonSpawner",
|
||||
"RLArchvileNoArmageddonSpawner",
|
||||
"RLCyberdemonNoArmageddonSpawner",
|
||||
"RLSpiderMastermindNoArmageddonSpawner",
|
||||
"RLBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanNoArmageddonSpawner',
|
||||
'RLFormerSergeantNoArmageddonSpawner',
|
||||
'RLFormerCommandoNoArmageddonSpawner',
|
||||
'RLImpNoArmageddonSpawner',
|
||||
'RLDemonNoArmageddonSpawner',
|
||||
'RLSpectreNoArmageddonSpawner',
|
||||
'RLLostSoulNoArmageddonSpawner',
|
||||
'RLCacodemonNoArmageddonSpawner',
|
||||
'RLHellKnightNoArmageddonSpawner',
|
||||
'RLBaronOfHellNoArmageddonSpawner',
|
||||
'RLArachnotronNoArmageddonSpawner',
|
||||
'RLPainElementalNoArmageddonSpawner',
|
||||
'RLRevenantNoArmageddonSpawner',
|
||||
'RLMancubusNoArmageddonSpawner',
|
||||
'RLArchvileNoArmageddonSpawner',
|
||||
'RLCyberdemonNoArmageddonSpawner',
|
||||
'RLSpiderMastermindNoArmageddonSpawner',
|
||||
'RLBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String normalpool[] =
|
||||
static const Name normalpool[] =
|
||||
{
|
||||
"RLFormerHumanNoArmageddonSpawner",
|
||||
"RLFormerSergeantNoArmageddonSpawner",
|
||||
"RLFormerCommandoNoArmageddonSpawner",
|
||||
"RLImpNoArmageddonSpawner",
|
||||
"RLDemonNoArmageddonSpawner",
|
||||
"RLSpectreNoArmageddonSpawner",
|
||||
"RLLostSoulNoArmageddonSpawner",
|
||||
"RLCacodemonNoArmageddonSpawner",
|
||||
"RLHellKnightNoArmageddonSpawner",
|
||||
"RLBaronOfHellNoArmageddonSpawner",
|
||||
"RLArachnotronNoArmageddonSpawner",
|
||||
"RLPainElementalNoArmageddonSpawner",
|
||||
"RLRevenantNoArmageddonSpawner",
|
||||
"RLMancubusNoArmageddonSpawner",
|
||||
"RLArchvileNoArmageddonSpawner",
|
||||
"RLCyberdemonNoArmageddonSpawner",
|
||||
"RLSpiderMastermindNoArmageddonSpawner",
|
||||
"RLBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanNoArmageddonSpawner',
|
||||
'RLFormerSergeantNoArmageddonSpawner',
|
||||
'RLFormerCommandoNoArmageddonSpawner',
|
||||
'RLImpNoArmageddonSpawner',
|
||||
'RLDemonNoArmageddonSpawner',
|
||||
'RLSpectreNoArmageddonSpawner',
|
||||
'RLLostSoulNoArmageddonSpawner',
|
||||
'RLCacodemonNoArmageddonSpawner',
|
||||
'RLHellKnightNoArmageddonSpawner',
|
||||
'RLBaronOfHellNoArmageddonSpawner',
|
||||
'RLArachnotronNoArmageddonSpawner',
|
||||
'RLPainElementalNoArmageddonSpawner',
|
||||
'RLRevenantNoArmageddonSpawner',
|
||||
'RLMancubusNoArmageddonSpawner',
|
||||
'RLArchvileNoArmageddonSpawner',
|
||||
'RLCyberdemonNoArmageddonSpawner',
|
||||
'RLSpiderMastermindNoArmageddonSpawner',
|
||||
'RLBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String hardpool[] =
|
||||
static const Name hardpool[] =
|
||||
{
|
||||
"RLFormerHumanSpawner",
|
||||
"RLFormerSergeantSpawner",
|
||||
"RLFormerCommandoSpawner",
|
||||
"RLImpSpawner",
|
||||
"RLDemonSpawner",
|
||||
"RLSpectreSpawner",
|
||||
"RLLostSoulSpawner",
|
||||
"RLCacodemonSpawner",
|
||||
"RLHellKnightSpawner",
|
||||
"RLBaronOfHellSpawner",
|
||||
"RLArachnotronSpawner",
|
||||
"RLPainElementalSpawner",
|
||||
"RLRevenantSpawner",
|
||||
"RLMancubusSpawner",
|
||||
"RLArchvileSpawner",
|
||||
"RLCyberdemonSpawner",
|
||||
"RLSpiderMastermindSpawner",
|
||||
"RLUVBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanSpawner',
|
||||
'RLFormerSergeantSpawner',
|
||||
'RLFormerCommandoSpawner',
|
||||
'RLImpSpawner',
|
||||
'RLDemonSpawner',
|
||||
'RLSpectreSpawner',
|
||||
'RLLostSoulSpawner',
|
||||
'RLCacodemonSpawner',
|
||||
'RLHellKnightSpawner',
|
||||
'RLBaronOfHellSpawner',
|
||||
'RLArachnotronSpawner',
|
||||
'RLPainElementalSpawner',
|
||||
'RLRevenantSpawner',
|
||||
'RLMancubusSpawner',
|
||||
'RLArchvileSpawner',
|
||||
'RLCyberdemonSpawner',
|
||||
'RLSpiderMastermindSpawner',
|
||||
'RLUVBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String nightmarepool[] =
|
||||
static const Name nightmarepool[] =
|
||||
{
|
||||
"RLEliteFormerHumanSpawner",
|
||||
"RLEliteFormerSergeantSpawner",
|
||||
"RLEliteFormerCommandoSpawner",
|
||||
"RLNightmareImp",
|
||||
"RLNightmareDemon",
|
||||
"RLNightmareSpectre",
|
||||
"RLNightmareLostSoul",
|
||||
"RLNightmareCacodemon",
|
||||
"RLNightmareHellKnight",
|
||||
"RLNightmareBaronOfHell",
|
||||
"RLNightmareArachnotron",
|
||||
"RLNightmarePainElemental",
|
||||
"RLNightmareRevenant",
|
||||
"RLNightmareMancubus",
|
||||
"RLNightmareArchvile",
|
||||
"RLNightmareCyberdemonSpawner",
|
||||
"RLNightmareSpiderMastermindSpawner",
|
||||
"RLNightmareBossEye",
|
||||
"RLNightmareBossBrain"
|
||||
'RLEliteFormerHumanSpawner',
|
||||
'RLEliteFormerSergeantSpawner',
|
||||
'RLEliteFormerCommandoSpawner',
|
||||
'RLNightmareImp',
|
||||
'RLNightmareDemon',
|
||||
'RLNightmareSpectre',
|
||||
'RLNightmareLostSoul',
|
||||
'RLNightmareCacodemon',
|
||||
'RLNightmareHellKnight',
|
||||
'RLNightmareBaronOfHell',
|
||||
'RLNightmareArachnotron',
|
||||
'RLNightmarePainElemental',
|
||||
'RLNightmareRevenant',
|
||||
'RLNightmareMancubus',
|
||||
'RLNightmareArchvile',
|
||||
'RLNightmareCyberdemonSpawner',
|
||||
'RLNightmareSpiderMastermindSpawner',
|
||||
'RLNightmareBossEye',
|
||||
'RLNightmareBossBrain'
|
||||
};
|
||||
static const String technophobiapool[] =
|
||||
static const Name technophobiapool[] =
|
||||
{
|
||||
"RLFormerCyborgBattleRifle",
|
||||
"RLFormerCyborgBattleRifle",
|
||||
"RLFormerCyborgBattleRifle",
|
||||
"RLCyberneticImp",
|
||||
"RLCyberneticDemon",
|
||||
"RLCyberneticSpectre",
|
||||
"RLCyberneticLostSoul",
|
||||
"RLCacodemon",
|
||||
"RLCyberneticHellKnight",
|
||||
"RLCyberneticBaronOfHell",
|
||||
"RLCyberneticArachnotron",
|
||||
"RLCyberneticPainElemental",
|
||||
"RLCyberneticRevenant",
|
||||
"RLCyberneticMancubus",
|
||||
"RLCyberneticArchvile",
|
||||
"RLCyberneticCyberdemonSpawner",
|
||||
"RLCyberneticSpiderMastermindSpawner",
|
||||
"RLTechnophobiaBossEye",
|
||||
"RLTechnophobiaBossBrain"
|
||||
'RLFormerCyborgBattleRifle',
|
||||
'RLFormerCyborgBattleRifle',
|
||||
'RLFormerCyborgBattleRifle',
|
||||
'RLCyberneticImp',
|
||||
'RLCyberneticDemon',
|
||||
'RLCyberneticSpectre',
|
||||
'RLCyberneticLostSoul',
|
||||
'RLCacodemon',
|
||||
'RLCyberneticHellKnight',
|
||||
'RLCyberneticBaronOfHell',
|
||||
'RLCyberneticArachnotron',
|
||||
'RLCyberneticPainElemental',
|
||||
'RLCyberneticRevenant',
|
||||
'RLCyberneticMancubus',
|
||||
'RLCyberneticArchvile',
|
||||
'RLCyberneticCyberdemonSpawner',
|
||||
'RLCyberneticSpiderMastermindSpawner',
|
||||
'RLTechnophobiaBossEye',
|
||||
'RLTechnophobiaBossBrain'
|
||||
};
|
||||
static const String armageddonpool[] =
|
||||
static const Name armageddonpool[] =
|
||||
{
|
||||
"RLFormerAssaultTrooper",
|
||||
"RLFormerOverwatch",
|
||||
"RLFormerShocktrooper",
|
||||
"RLArmageddonImp",
|
||||
"RLArmageddonDemon",
|
||||
"RLArmageddonSpectreSpawner",
|
||||
"RLTheHungrySpawner",
|
||||
"RLArmageddonCacodemon",
|
||||
"RLArmageddonHellKnightSpawner",
|
||||
"RLArmageddonBaronOfHell",
|
||||
"RLArmageddonArachnotron",
|
||||
"RLArmageddonPainElemental",
|
||||
"RLArmageddonRevenant",
|
||||
"RLArmageddonMancubus",
|
||||
"RLArmageddonArchvileSpawner",
|
||||
"RLArmageddonCyberdemonSpawner",
|
||||
"RLArmageddonSpiderMastermindSpawner",
|
||||
"RLArmageddonBossEye",
|
||||
"RLArmageddonBossBrain"
|
||||
'RLFormerAssaultTrooper',
|
||||
'RLFormerOverwatch',
|
||||
'RLFormerShocktrooper',
|
||||
'RLArmageddonImp',
|
||||
'RLArmageddonDemon',
|
||||
'RLArmageddonSpectreSpawner',
|
||||
'RLTheHungrySpawner',
|
||||
'RLArmageddonCacodemon',
|
||||
'RLArmageddonHellKnightSpawner',
|
||||
'RLArmageddonBaronOfHell',
|
||||
'RLArmageddonArachnotron',
|
||||
'RLArmageddonPainElemental',
|
||||
'RLArmageddonRevenant',
|
||||
'RLArmageddonMancubus',
|
||||
'RLArmageddonArchvileSpawner',
|
||||
'RLArmageddonCyberdemonSpawner',
|
||||
'RLArmageddonSpiderMastermindSpawner',
|
||||
'RLArmageddonBossEye',
|
||||
'RLArmageddonBossBrain'
|
||||
};
|
||||
static const String adaptivepool[] =
|
||||
static const Name adaptivepool[] =
|
||||
{
|
||||
"RLAdaptiveFormerHuman",
|
||||
"RLAdaptiveFormerSergeant",
|
||||
"RLAdaptiveFormerCommando",
|
||||
"RLAdaptiveImp",
|
||||
"RLAdaptiveDemon",
|
||||
"RLAdaptiveSpectre",
|
||||
"RLAdaptiveLostSoul",
|
||||
"RLAdaptiveCacodemon",
|
||||
"RLAdaptiveHellKnight",
|
||||
"RLAdaptiveBaronOfHell",
|
||||
"RLAdaptiveArachnotron",
|
||||
"RLAdaptivePainElemental",
|
||||
"RLAdaptiveRevenant",
|
||||
"RLAdaptiveMancubus",
|
||||
"RLAdaptiveArchvile",
|
||||
"RLAdaptiveCyberdemon",
|
||||
"RLAdaptiveSpiderMastermind",
|
||||
"RLUVBossEye",
|
||||
"RLBossBrain"
|
||||
'RLAdaptiveFormerHuman',
|
||||
'RLAdaptiveFormerSergeant',
|
||||
'RLAdaptiveFormerCommando',
|
||||
'RLAdaptiveImp',
|
||||
'RLAdaptiveDemon',
|
||||
'RLAdaptiveSpectre',
|
||||
'RLAdaptiveLostSoul',
|
||||
'RLAdaptiveCacodemon',
|
||||
'RLAdaptiveHellKnight',
|
||||
'RLAdaptiveBaronOfHell',
|
||||
'RLAdaptiveArachnotron',
|
||||
'RLAdaptivePainElemental',
|
||||
'RLAdaptiveRevenant',
|
||||
'RLAdaptiveMancubus',
|
||||
'RLAdaptiveArchvile',
|
||||
'RLAdaptiveCyberdemon',
|
||||
'RLAdaptiveSpiderMastermind',
|
||||
'RLUVBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
switch ( swwm_drlaskill )
|
||||
{
|
||||
|
|
@ -269,37 +269,37 @@ extend Class SWWMHandler
|
|||
|
||||
private Class<Actor> GetLOBReplacee( Class<Actor> a )
|
||||
{
|
||||
static const String refpool[] =
|
||||
static const Name refpool[] =
|
||||
{
|
||||
"Zombieman",
|
||||
"Shotgunguy",
|
||||
"Chaingunguy",
|
||||
"DoomImp",
|
||||
"Demon",
|
||||
"Spectre",
|
||||
"Cacodemon",
|
||||
"HellKnight",
|
||||
"BaronOfHell",
|
||||
"Revenant",
|
||||
"Fatso",
|
||||
"Arachnotron",
|
||||
"Archvile"
|
||||
'Zombieman',
|
||||
'Shotgunguy',
|
||||
'Chaingunguy',
|
||||
'DoomImp',
|
||||
'Demon',
|
||||
'Spectre',
|
||||
'Cacodemon',
|
||||
'HellKnight',
|
||||
'BaronOfHell',
|
||||
'Revenant',
|
||||
'Fatso',
|
||||
'Arachnotron',
|
||||
'Archvile'
|
||||
};
|
||||
static const String reppool[] =
|
||||
static const Name reppool[] =
|
||||
{
|
||||
"LOBZombieman",
|
||||
"LOBShotgunguy",
|
||||
"LOBChaingunguy",
|
||||
"LOBDoomImp",
|
||||
"LOBDemon",
|
||||
"LOBSpectre",
|
||||
"LOBCacodemon",
|
||||
"LOBHellKnight",
|
||||
"LOBBaronOfHell",
|
||||
"LOBRevenant",
|
||||
"LOBFatso",
|
||||
"LOBArachnotron",
|
||||
"LOBArchvile"
|
||||
'LOBZombieman',
|
||||
'LOBShotgunguy',
|
||||
'LOBChaingunguy',
|
||||
'LOBDoomImp',
|
||||
'LOBDemon',
|
||||
'LOBSpectre',
|
||||
'LOBCacodemon',
|
||||
'LOBHellKnight',
|
||||
'LOBBaronOfHell',
|
||||
'LOBRevenant',
|
||||
'LOBFatso',
|
||||
'LOBArachnotron',
|
||||
'LOBArchvile'
|
||||
};
|
||||
for ( int i=0; i<13; i++ )
|
||||
{
|
||||
|
|
@ -315,7 +315,7 @@ extend Class SWWMHandler
|
|||
// these are all needed so boss deaths work
|
||||
if ( e.Replacement is 'DSparilHax' )
|
||||
e.Replacee = 'Sorcerer2';
|
||||
// LOB "double death" stuff
|
||||
// LOB 'double death' stuff
|
||||
if ( haslegionofbones && swwm_lobdoubled )
|
||||
{
|
||||
let rep = GetLOBReplacee(e.Replacement);
|
||||
|
|
@ -339,203 +339,203 @@ extend Class SWWMHandler
|
|||
|
||||
private Class<Actor> GetDRLAReplacement( Class<Actor> a )
|
||||
{
|
||||
static const String refpool[] =
|
||||
static const Name refpool[] =
|
||||
{
|
||||
"Zombieman",
|
||||
"Shotgunguy",
|
||||
"Chaingunguy",
|
||||
"DoomImp",
|
||||
"Demon",
|
||||
"Spectre",
|
||||
"LostSoul",
|
||||
"Cacodemon",
|
||||
"HellKnight",
|
||||
"BaronOfHell",
|
||||
"Arachnotron",
|
||||
"PainElemental",
|
||||
"Revenant",
|
||||
"Fatso",
|
||||
"Archvile",
|
||||
"Cyberdemon",
|
||||
"SpiderMastermind",
|
||||
"BossEye",
|
||||
"BossBrain"
|
||||
'Zombieman',
|
||||
'Shotgunguy',
|
||||
'Chaingunguy',
|
||||
'DoomImp',
|
||||
'Demon',
|
||||
'Spectre',
|
||||
'LostSoul',
|
||||
'Cacodemon',
|
||||
'HellKnight',
|
||||
'BaronOfHell',
|
||||
'Arachnotron',
|
||||
'PainElemental',
|
||||
'Revenant',
|
||||
'Fatso',
|
||||
'Archvile',
|
||||
'Cyberdemon',
|
||||
'SpiderMastermind',
|
||||
'BossEye',
|
||||
'BossBrain'
|
||||
};
|
||||
static const String babypool[] =
|
||||
static const Name babypool[] =
|
||||
{
|
||||
"RLFormerHumanPistol",
|
||||
"RLFormerSergeantShotgun",
|
||||
"RLFormerCommandoChaingun",
|
||||
"RLImp",
|
||||
"RLDemon",
|
||||
"RLSpectre",
|
||||
"RLLostSoul",
|
||||
"RLCacodemon",
|
||||
"RLHellKnight",
|
||||
"RLBaronOfHell",
|
||||
"RLArachnotron",
|
||||
"RLPainElemental",
|
||||
"RLRevenant",
|
||||
"RLMancubus",
|
||||
"RLArchvile",
|
||||
"RLCyberdemon",
|
||||
"RLSpiderMastermindVariantSpawner",
|
||||
"RLEasyBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanPistol',
|
||||
'RLFormerSergeantShotgun',
|
||||
'RLFormerCommandoChaingun',
|
||||
'RLImp',
|
||||
'RLDemon',
|
||||
'RLSpectre',
|
||||
'RLLostSoul',
|
||||
'RLCacodemon',
|
||||
'RLHellKnight',
|
||||
'RLBaronOfHell',
|
||||
'RLArachnotron',
|
||||
'RLPainElemental',
|
||||
'RLRevenant',
|
||||
'RLMancubus',
|
||||
'RLArchvile',
|
||||
'RLCyberdemon',
|
||||
'RLSpiderMastermindVariantSpawner',
|
||||
'RLEasyBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String easypool[] =
|
||||
static const Name easypool[] =
|
||||
{
|
||||
"RLFormerHumanNoArmageddonSpawner",
|
||||
"RLFormerSergeantNoArmageddonSpawner",
|
||||
"RLFormerCommandoNoArmageddonSpawner",
|
||||
"RLImpNoArmageddonSpawner",
|
||||
"RLDemonNoArmageddonSpawner",
|
||||
"RLSpectreNoArmageddonSpawner",
|
||||
"RLLostSoulNoArmageddonSpawner",
|
||||
"RLCacodemonNoArmageddonSpawner",
|
||||
"RLHellKnightNoArmageddonSpawner",
|
||||
"RLBaronOfHellNoArmageddonSpawner",
|
||||
"RLArachnotronNoArmageddonSpawner",
|
||||
"RLPainElementalNoArmageddonSpawner",
|
||||
"RLRevenantNoArmageddonSpawner",
|
||||
"RLMancubusNoArmageddonSpawner",
|
||||
"RLArchvileNoArmageddonSpawner",
|
||||
"RLCyberdemonNoArmageddonSpawner",
|
||||
"RLSpiderMastermindNoArmageddonSpawner",
|
||||
"RLBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanNoArmageddonSpawner',
|
||||
'RLFormerSergeantNoArmageddonSpawner',
|
||||
'RLFormerCommandoNoArmageddonSpawner',
|
||||
'RLImpNoArmageddonSpawner',
|
||||
'RLDemonNoArmageddonSpawner',
|
||||
'RLSpectreNoArmageddonSpawner',
|
||||
'RLLostSoulNoArmageddonSpawner',
|
||||
'RLCacodemonNoArmageddonSpawner',
|
||||
'RLHellKnightNoArmageddonSpawner',
|
||||
'RLBaronOfHellNoArmageddonSpawner',
|
||||
'RLArachnotronNoArmageddonSpawner',
|
||||
'RLPainElementalNoArmageddonSpawner',
|
||||
'RLRevenantNoArmageddonSpawner',
|
||||
'RLMancubusNoArmageddonSpawner',
|
||||
'RLArchvileNoArmageddonSpawner',
|
||||
'RLCyberdemonNoArmageddonSpawner',
|
||||
'RLSpiderMastermindNoArmageddonSpawner',
|
||||
'RLBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String normalpool[] =
|
||||
static const Name normalpool[] =
|
||||
{
|
||||
"RLFormerHumanNoArmageddonSpawner",
|
||||
"RLFormerSergeantNoArmageddonSpawner",
|
||||
"RLFormerCommandoNoArmageddonSpawner",
|
||||
"RLImpNoArmageddonSpawner",
|
||||
"RLDemonNoArmageddonSpawner",
|
||||
"RLSpectreNoArmageddonSpawner",
|
||||
"RLLostSoulNoArmageddonSpawner",
|
||||
"RLCacodemonNoArmageddonSpawner",
|
||||
"RLHellKnightNoArmageddonSpawner",
|
||||
"RLBaronOfHellNoArmageddonSpawner",
|
||||
"RLArachnotronNoArmageddonSpawner",
|
||||
"RLPainElementalNoArmageddonSpawner",
|
||||
"RLRevenantNoArmageddonSpawner",
|
||||
"RLMancubusNoArmageddonSpawner",
|
||||
"RLArchvileNoArmageddonSpawner",
|
||||
"RLCyberdemonNoArmageddonSpawner",
|
||||
"RLSpiderMastermindNoArmageddonSpawner",
|
||||
"RLBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanNoArmageddonSpawner',
|
||||
'RLFormerSergeantNoArmageddonSpawner',
|
||||
'RLFormerCommandoNoArmageddonSpawner',
|
||||
'RLImpNoArmageddonSpawner',
|
||||
'RLDemonNoArmageddonSpawner',
|
||||
'RLSpectreNoArmageddonSpawner',
|
||||
'RLLostSoulNoArmageddonSpawner',
|
||||
'RLCacodemonNoArmageddonSpawner',
|
||||
'RLHellKnightNoArmageddonSpawner',
|
||||
'RLBaronOfHellNoArmageddonSpawner',
|
||||
'RLArachnotronNoArmageddonSpawner',
|
||||
'RLPainElementalNoArmageddonSpawner',
|
||||
'RLRevenantNoArmageddonSpawner',
|
||||
'RLMancubusNoArmageddonSpawner',
|
||||
'RLArchvileNoArmageddonSpawner',
|
||||
'RLCyberdemonNoArmageddonSpawner',
|
||||
'RLSpiderMastermindNoArmageddonSpawner',
|
||||
'RLBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String hardpool[] =
|
||||
static const Name hardpool[] =
|
||||
{
|
||||
"RLFormerHumanSpawner",
|
||||
"RLFormerSergeantSpawner",
|
||||
"RLFormerCommandoSpawner",
|
||||
"RLImpSpawner",
|
||||
"RLDemonSpawner",
|
||||
"RLSpectreSpawner",
|
||||
"RLLostSoulSpawner",
|
||||
"RLCacodemonSpawner",
|
||||
"RLHellKnightSpawner",
|
||||
"RLBaronOfHellSpawner",
|
||||
"RLArachnotronSpawner",
|
||||
"RLPainElementalSpawner",
|
||||
"RLRevenantSpawner",
|
||||
"RLMancubusSpawner",
|
||||
"RLArchvileSpawner",
|
||||
"RLCyberdemonSpawner",
|
||||
"RLSpiderMastermindSpawner",
|
||||
"RLUVBossEye",
|
||||
"RLBossBrain"
|
||||
'RLFormerHumanSpawner',
|
||||
'RLFormerSergeantSpawner',
|
||||
'RLFormerCommandoSpawner',
|
||||
'RLImpSpawner',
|
||||
'RLDemonSpawner',
|
||||
'RLSpectreSpawner',
|
||||
'RLLostSoulSpawner',
|
||||
'RLCacodemonSpawner',
|
||||
'RLHellKnightSpawner',
|
||||
'RLBaronOfHellSpawner',
|
||||
'RLArachnotronSpawner',
|
||||
'RLPainElementalSpawner',
|
||||
'RLRevenantSpawner',
|
||||
'RLMancubusSpawner',
|
||||
'RLArchvileSpawner',
|
||||
'RLCyberdemonSpawner',
|
||||
'RLSpiderMastermindSpawner',
|
||||
'RLUVBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
static const String nightmarepool[] =
|
||||
static const Name nightmarepool[] =
|
||||
{
|
||||
"RLEliteFormerHumanSpawner",
|
||||
"RLEliteFormerSergeantSpawner",
|
||||
"RLEliteFormerCommandoSpawner",
|
||||
"RLNightmareImp",
|
||||
"RLNightmareDemon",
|
||||
"RLNightmareSpectre",
|
||||
"RLNightmareLostSoul",
|
||||
"RLNightmareCacodemon",
|
||||
"RLNightmareHellKnight",
|
||||
"RLNightmareBaronOfHell",
|
||||
"RLNightmareArachnotron",
|
||||
"RLNightmarePainElemental",
|
||||
"RLNightmareRevenant",
|
||||
"RLNightmareMancubus",
|
||||
"RLNightmareArchvile",
|
||||
"RLNightmareCyberdemonSpawner",
|
||||
"RLNightmareSpiderMastermindSpawner",
|
||||
"RLNightmareBossEye",
|
||||
"RLNightmareBossBrain"
|
||||
'RLEliteFormerHumanSpawner',
|
||||
'RLEliteFormerSergeantSpawner',
|
||||
'RLEliteFormerCommandoSpawner',
|
||||
'RLNightmareImp',
|
||||
'RLNightmareDemon',
|
||||
'RLNightmareSpectre',
|
||||
'RLNightmareLostSoul',
|
||||
'RLNightmareCacodemon',
|
||||
'RLNightmareHellKnight',
|
||||
'RLNightmareBaronOfHell',
|
||||
'RLNightmareArachnotron',
|
||||
'RLNightmarePainElemental',
|
||||
'RLNightmareRevenant',
|
||||
'RLNightmareMancubus',
|
||||
'RLNightmareArchvile',
|
||||
'RLNightmareCyberdemonSpawner',
|
||||
'RLNightmareSpiderMastermindSpawner',
|
||||
'RLNightmareBossEye',
|
||||
'RLNightmareBossBrain'
|
||||
};
|
||||
static const String technophobiapool[] =
|
||||
static const Name technophobiapool[] =
|
||||
{
|
||||
"RLFormerCyborgBattleRifle",
|
||||
"RLFormerCyborgBattleRifle",
|
||||
"RLFormerCyborgBattleRifle",
|
||||
"RLCyberneticImp",
|
||||
"RLCyberneticDemon",
|
||||
"RLCyberneticSpectre",
|
||||
"RLCyberneticLostSoul",
|
||||
"RLCacodemon",
|
||||
"RLCyberneticHellKnight",
|
||||
"RLCyberneticBaronOfHell",
|
||||
"RLCyberneticArachnotron",
|
||||
"RLCyberneticPainElemental",
|
||||
"RLCyberneticRevenant",
|
||||
"RLCyberneticMancubus",
|
||||
"RLCyberneticArchvile",
|
||||
"RLCyberneticCyberdemonSpawner",
|
||||
"RLCyberneticSpiderMastermindSpawner",
|
||||
"RLTechnophobiaBossEye",
|
||||
"RLTechnophobiaBossBrain"
|
||||
'RLFormerCyborgBattleRifle',
|
||||
'RLFormerCyborgBattleRifle',
|
||||
'RLFormerCyborgBattleRifle',
|
||||
'RLCyberneticImp',
|
||||
'RLCyberneticDemon',
|
||||
'RLCyberneticSpectre',
|
||||
'RLCyberneticLostSoul',
|
||||
'RLCacodemon',
|
||||
'RLCyberneticHellKnight',
|
||||
'RLCyberneticBaronOfHell',
|
||||
'RLCyberneticArachnotron',
|
||||
'RLCyberneticPainElemental',
|
||||
'RLCyberneticRevenant',
|
||||
'RLCyberneticMancubus',
|
||||
'RLCyberneticArchvile',
|
||||
'RLCyberneticCyberdemonSpawner',
|
||||
'RLCyberneticSpiderMastermindSpawner',
|
||||
'RLTechnophobiaBossEye',
|
||||
'RLTechnophobiaBossBrain'
|
||||
};
|
||||
static const String armageddonpool[] =
|
||||
static const Name armageddonpool[] =
|
||||
{
|
||||
"RLFormerAssaultTrooper",
|
||||
"RLFormerOverwatch",
|
||||
"RLFormerShocktrooper",
|
||||
"RLArmageddonImp",
|
||||
"RLArmageddonDemon",
|
||||
"RLArmageddonSpectreSpawner",
|
||||
"RLTheHungrySpawner",
|
||||
"RLArmageddonCacodemon",
|
||||
"RLArmageddonHellKnightSpawner",
|
||||
"RLArmageddonBaronOfHell",
|
||||
"RLArmageddonArachnotron",
|
||||
"RLArmageddonPainElemental",
|
||||
"RLArmageddonRevenant",
|
||||
"RLArmageddonMancubus",
|
||||
"RLArmageddonArchvileSpawner",
|
||||
"RLArmageddonCyberdemonSpawner",
|
||||
"RLArmageddonSpiderMastermindSpawner",
|
||||
"RLArmageddonBossEye",
|
||||
"RLArmageddonBossBrain"
|
||||
'RLFormerAssaultTrooper',
|
||||
'RLFormerOverwatch',
|
||||
'RLFormerShocktrooper',
|
||||
'RLArmageddonImp',
|
||||
'RLArmageddonDemon',
|
||||
'RLArmageddonSpectreSpawner',
|
||||
'RLTheHungrySpawner',
|
||||
'RLArmageddonCacodemon',
|
||||
'RLArmageddonHellKnightSpawner',
|
||||
'RLArmageddonBaronOfHell',
|
||||
'RLArmageddonArachnotron',
|
||||
'RLArmageddonPainElemental',
|
||||
'RLArmageddonRevenant',
|
||||
'RLArmageddonMancubus',
|
||||
'RLArmageddonArchvileSpawner',
|
||||
'RLArmageddonCyberdemonSpawner',
|
||||
'RLArmageddonSpiderMastermindSpawner',
|
||||
'RLArmageddonBossEye',
|
||||
'RLArmageddonBossBrain'
|
||||
};
|
||||
static const String adaptivepool[] =
|
||||
static const Name adaptivepool[] =
|
||||
{
|
||||
"RLAdaptiveFormerHuman",
|
||||
"RLAdaptiveFormerSergeant",
|
||||
"RLAdaptiveFormerCommando",
|
||||
"RLAdaptiveImp",
|
||||
"RLAdaptiveDemon",
|
||||
"RLAdaptiveSpectre",
|
||||
"RLAdaptiveLostSoul",
|
||||
"RLAdaptiveCacodemon",
|
||||
"RLAdaptiveHellKnight",
|
||||
"RLAdaptiveBaronOfHell",
|
||||
"RLAdaptiveArachnotron",
|
||||
"RLAdaptivePainElemental",
|
||||
"RLAdaptiveRevenant",
|
||||
"RLAdaptiveMancubus",
|
||||
"RLAdaptiveArchvile",
|
||||
"RLAdaptiveCyberdemon",
|
||||
"RLAdaptiveSpiderMastermind",
|
||||
"RLUVBossEye",
|
||||
"RLBossBrain"
|
||||
'RLAdaptiveFormerHuman',
|
||||
'RLAdaptiveFormerSergeant',
|
||||
'RLAdaptiveFormerCommando',
|
||||
'RLAdaptiveImp',
|
||||
'RLAdaptiveDemon',
|
||||
'RLAdaptiveSpectre',
|
||||
'RLAdaptiveLostSoul',
|
||||
'RLAdaptiveCacodemon',
|
||||
'RLAdaptiveHellKnight',
|
||||
'RLAdaptiveBaronOfHell',
|
||||
'RLAdaptiveArachnotron',
|
||||
'RLAdaptivePainElemental',
|
||||
'RLAdaptiveRevenant',
|
||||
'RLAdaptiveMancubus',
|
||||
'RLAdaptiveArchvile',
|
||||
'RLAdaptiveCyberdemon',
|
||||
'RLAdaptiveSpiderMastermind',
|
||||
'RLUVBossEye',
|
||||
'RLBossBrain'
|
||||
};
|
||||
switch ( swwm_drlaskill )
|
||||
{
|
||||
|
|
@ -602,37 +602,37 @@ extend Class SWWMHandler
|
|||
|
||||
private Class<Actor> GetLOBReplacement( Class<Actor> a )
|
||||
{
|
||||
static const String refpool[] =
|
||||
static const Name refpool[] =
|
||||
{
|
||||
"Zombieman",
|
||||
"Shotgunguy",
|
||||
"Chaingunguy",
|
||||
"DoomImp",
|
||||
"Demon",
|
||||
"Spectre",
|
||||
"Cacodemon",
|
||||
"HellKnight",
|
||||
"BaronOfHell",
|
||||
"Revenant",
|
||||
"Fatso",
|
||||
"Arachnotron",
|
||||
"Archvile"
|
||||
'Zombieman',
|
||||
'Shotgunguy',
|
||||
'Chaingunguy',
|
||||
'DoomImp',
|
||||
'Demon',
|
||||
'Spectre',
|
||||
'Cacodemon',
|
||||
'HellKnight',
|
||||
'BaronOfHell',
|
||||
'Revenant',
|
||||
'Fatso',
|
||||
'Arachnotron',
|
||||
'Archvile'
|
||||
};
|
||||
static const String reppool[] =
|
||||
static const Name reppool[] =
|
||||
{
|
||||
"LOBZombieman",
|
||||
"LOBShotgunguy",
|
||||
"LOBChaingunguy",
|
||||
"LOBDoomImp",
|
||||
"LOBDemon",
|
||||
"LOBSpectre",
|
||||
"LOBCacodemon",
|
||||
"LOBHellKnight",
|
||||
"LOBBaronOfHell",
|
||||
"LOBRevenant",
|
||||
"LOBFatso",
|
||||
"LOBArachnotron",
|
||||
"LOBArchvile"
|
||||
'LOBZombieman',
|
||||
'LOBShotgunguy',
|
||||
'LOBChaingunguy',
|
||||
'LOBDoomImp',
|
||||
'LOBDemon',
|
||||
'LOBSpectre',
|
||||
'LOBCacodemon',
|
||||
'LOBHellKnight',
|
||||
'LOBBaronOfHell',
|
||||
'LOBRevenant',
|
||||
'LOBFatso',
|
||||
'LOBArachnotron',
|
||||
'LOBArchvile'
|
||||
};
|
||||
for ( int i=0; i<13; i++ )
|
||||
{
|
||||
|
|
@ -663,7 +663,7 @@ extend Class SWWMHandler
|
|||
return;
|
||||
}
|
||||
}
|
||||
// LOB "double death" stuff
|
||||
// LOB 'double death' stuff
|
||||
if ( haslegionofbones && swwm_lobdoubled )
|
||||
{
|
||||
let rep = GetLOBReplacement(e.Replacee);
|
||||
|
|
@ -729,10 +729,10 @@ extend Class SWWMHandler
|
|||
else if ( e.Replacee is 'Crossbow' ) e.Replacement = SWWMUtility.PickDoomSlot3();
|
||||
else if ( (e.Replacee is 'Chaingun') || (e.Replacee is 'Blaster') || (e.Replacee is 'FWeaponPiece3') ) e.Replacement = SWWMUtility.PickSWWMSlot5();
|
||||
else if ( (e.Replacee is 'RocketLauncher') || (e.Replacee is 'PhoenixRod') || (e.Replacee is 'FWeapHammer') ) e.Replacement = SWWMUtility.PickSWWMSlot6();
|
||||
else if ( (e.Replacee is 'PlasmaRifle') || (e.Replacee is 'SkullRod') ) e.Replacement = SWWMUtility.PickDoomSlot6();
|
||||
else if ( (e.Replacee is 'PlasmaRifle') || (e.Replacee is 'ID24Incinerator') || (e.Replacee is 'SkullRod') ) e.Replacement = SWWMUtility.PickDoomSlot6();
|
||||
else if ( e.Replacee is 'CWeapFlame' ) e.Replacement = SWWMUtility.PickSWWMSlot7();
|
||||
else if ( e.Replacee is 'MWeapLightning' ) e.Replacement = SWWMUtility.PickSWWMSlot8();
|
||||
else if ( (e.Replacee is 'BFG9000') || (e.Replacee is 'Mace') ) e.Replacement = SWWMUtility.PickDoomSlot7();
|
||||
else if ( (e.Replacee is 'BFG9000') || (e.Replacee is 'ID24CalamityBlade') || (e.Replacee is 'Mace') ) e.Replacement = SWWMUtility.PickDoomSlot7();
|
||||
else if ( e.Replacee is 'CWeaponPiece2' ) e.Replacement = SWWMUtility.PickSWWMSlot9();
|
||||
else if ( e.Replacee is 'MWeaponPiece1' ) e.Replacement = SWWMUtility.PickSWWMSlot0();
|
||||
else if ( (e.Replacee is 'ShellBox') || (e.Replacee is 'CrossbowHefty') ) e.Replacement = 'SWWMShellAmmoBig';
|
||||
|
|
@ -743,8 +743,8 @@ extend Class SWWMHandler
|
|||
else if ( e.Replacee is 'BlasterAmmo' ) e.Replacement = 'SWWMBlastAmmoSmall';
|
||||
else if ( (e.Replacee is 'RocketBox') || (e.Replacee is 'PhoenixRodHefty') || (e.Replacee is 'MaceHefty') ) e.Replacement = 'SWWMRocketAmmoBig';
|
||||
else if ( (e.Replacee is 'RocketAmmo') || (e.Replacee is 'PhoenixRodAmmo') || (e.Replacee is 'MaceAmmo') ) e.Replacement = 'SWWMRocketAmmoSmall';
|
||||
else if ( (e.Replacee is 'CellPack') || (e.Replacee is 'SkullRodHefty') ) e.Replacement = 'SWWMCellAmmoBig';
|
||||
else if ( (e.Replacee is 'Cell') || (e.Replacee is 'SkullRodAmmo') ) e.Replacement = 'SWWMCellAmmoSmall';
|
||||
else if ( (e.Replacee is 'CellPack') || (e.Replacee is 'ID24FuelTank') || (e.Replacee is 'SkullRodHefty') ) e.Replacement = 'SWWMCellAmmoBig';
|
||||
else if ( (e.Replacee is 'Cell') || (e.Replacee is 'ID24Fuel') || (e.Replacee is 'SkullRodAmmo') ) e.Replacement = 'SWWMCellAmmoSmall';
|
||||
else if ( e.Replacee is 'Mana1' ) e.Replacement = 'FabricatorTier1';
|
||||
else if ( e.Replacee is 'Mana2' ) e.Replacement = 'FabricatorTier2';
|
||||
else if ( e.Replacee is 'Mana3' ) e.Replacement = 'FabricatorTier3';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue