Merge pull request #1317 from jaih1r0/PB_Staging

spawners / zscripted M1

CVARINFO

@@ -217,6 +217,7 @@ server bool DisablePB_LMG = false;
 server bool DisablePB_MinigunUpgrade = false;
 server bool DisablePB_M2Upgrade = false;
 server bool DisablePB_Unmaker = false; //Why would you want this disabled???
+server bool DisablePB_FlamerUpgrade = false;	//not actually sure wich tier is this
 server int pb_NoUpgrades = 0;
 server int pb_NoPulseCannonUpgrade = 0;
 

DECORATE

@@ -48,7 +48,7 @@ Actor IsTacticalClass : Inventory {} //Fake item to fix the lag.
 #include "actors/Weapons/Slot4/MINIGUN.dec"
 #include "actors/Weapons/Slot5/ROCKETLAUNCHER.dec"
 #include "actors/Weapons/EXPLOSIVES.dec"
-#include "actors/Weapons/Slot6/PLASMA.dec"
+//#include "actors/Weapons/Slot6/PLASMA.dec"
 #include "actors/Weapons/Slot4/MG42.dec"
 
 #include "actors/Weapons/Slot7/RAILGUN.dec"

MODELS/Definitions/MODELDEF.Slot6.txt

@@ -7,7 +7,7 @@ Model PB_M1Plasma
 
 	Frameindex VLAS A 0 0
 }
-
+/*
 Model PB_M1PlasmaPickup
 {
 	Path "MODELS/PBVP/Weapons/Slot6"
@@ -16,4 +16,5 @@ Model PB_M1PlasmaPickup
 	scale 1 1 1.2
 
 	Frameindex VLAS A 0 0
-}
+}
+*/

ZSCRIPT.zc

@@ -214,6 +214,7 @@ const MAXITERATIONS = 32676;
 
 #include "zscript/Weapons/Slot2/Revolver.zs"
 #include "zscript/Weapons/Slot3/Shotgun.zs"
+#include "zscript/Weapons/Slot7/PlasmaM1.zs"
 
 //Spawners
 #include "zscript/Spawner/PB_SpawnerBase.zc"

actors/Items/SpecialPowerups.dec

@@ -1,4 +1,4 @@
-Actor UpgradeSpawner
+/*Actor UpgradeSpawner
 {
 	//$Title Random Upgrade Spawner
 	//$Category Powerups
@@ -71,14 +71,14 @@ Actor UpgradeSpawner
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleRifleUpgrade", 0, 0, 0, 0)//Check if Upgrades are disabled
 		TNT1 A 0 A_SpawnItemEx("RifleUpgrade",0,0,0,0,0,0,0,288)
 		Stop
-	/*	
-	SpawnPB_UnmakerUpgrade:
+
+	//SpawnPB_UnmakerUpgrade:
 		TNT1 A 0
 		TNT1 A 1 ACS_NamedExecuteAlways("PBUpgradeChecker_UnmakerUpgrade", 0, 0, 0, 0)//Check if already having existing upgrades
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleUnmakerUpgrade", 0, 0, 0, 0)//Check if Upgrades are disabled
 		TNT1 A 0 A_SpawnItemEx("PB_Unmaker",0,0,0,0,0,0,0,288)
 		Stop
-	*/
+
 	SpawnM2Upgrade:
 		TNT1 A 0
 		TNT1 A 1 ACS_NamedExecuteAlways("PBUpgradeChecker_M2Upgrade", 0, 0, 0, 0)//Check if already having existing upgrades
@@ -94,6 +94,7 @@ Actor UpgradeSpawner
 		Stop
 	}
 }
+*/
 
 ACTOR ExplosivesCrate: CustomInventory
 {

actors/Weapons/DROPABLES.dec

@@ -377,7 +377,7 @@ ACTOR DropedPlasma
 
 	Death:
 		TNT1 AA 1
-        TNT1 A 0 A_SpawnItemEx("PB_M1PlasmaPickup",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_NOCHECKPOSITION | 288)
+        TNT1 A 0 A_SpawnItemEx("PB_M1Plasma",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_NOCHECKPOSITION | 288)
         Stop
 
     }

zscript/PBHandler.zc

@@ -340,6 +340,85 @@ class PB_EventHandler : EventHandler
 		}
 	}
 
+
+	override void CheckReplacement (ReplaceEvent e)
+	{
+		switch(e.replacee.getclassname())
+		{
+			//
+			//	Weapons
+			//
+			case 'Pistol':				e.replacement = 'PBPistolSpawner';				break;
+			case 'Shotgun':				e.replacement = 'PBShotgunSpawner';				break;
+			case 'SuperShotgun':		e.replacement = 'PBSSGSpawner';					break;
+			case 'Chaingun':			e.replacement = 'PBChaingunSpawner';			break;
+			case 'RocketLauncher':		e.replacement = 'PBRocketLauncherSpawner';		break;
+			case 'PlasmaRifle':			e.replacement = 'PBPlasmaRifleSpawner';			break;
+			case 'BFG9000':				e.replacement = 'PBBFGSpawner';					break;
+			case 'Chainsaw':			e.replacement = 'PBChainSawSpawner';			break;
+
+			//
+			//	Ammo
+			//
+			case 'Clip':				e.replacement = 'PBClipSpawner';				break;
+			case 'ClipBox':				e.replacement = 'PBClipBoxSpawner';				break;
+			case 'Shell':				e.replacement = 'PBShellSpawner';				break;
+			case 'Shellbox':			e.replacement = 'PBShellboxSpawner';			break;
+			case 'RocketAmmo':			e.replacement = 'PBRocketSpawner';				break;
+			case 'RocketBox':			e.replacement = 'PBRocketBoxSpawner';			break;
+			case 'Cell':				e.replacement = 'PBCellSpawner';				break;
+			case 'CellPack':			e.replacement = 'PBCellPackSpawner';			break;
+
+			case 'Backpack':			e.replacement = 'PBBackpackSpawner';			break;
+
+			//
+			//	Health & Armor
+			//
+			case 'HealthBonus':			e.replacement = 'PBHPBonusSpawner';				break;
+			case 'Stimpack':			e.replacement = 'PBStimSpawner';				break;
+			case 'Medikit':				e.replacement = 'PBMedikitSpawner';				break;
+
+			case 'ArmorBonus':			e.replacement = 'PBAPBonusSpawner';				break;
+			case 'GreenArmor':			e.replacement = 'PBGreenSpawner';				break;
+			case 'BlueArmor':			e.replacement = 'PBBlueSpawner';				break;
+
+			//
+			//	Powerups
+			//
+			case 'invulnerabilitysphere':		e.replacement = 'PB_InvulSpawner';			break;
+			case 'radsuit':						e.replacement = 'PB_RadSuitSpawner';		break;
+			case 'blursphere':					e.replacement = 'PB_BlurSpawner';			break;
+			case 'infrared':					e.replacement = 'PB_InfraRedSpawner';		break;
+			case 'soulsphere':					e.replacement = 'PB_SoulSphereSpawner';		break;
+			case 'megasphere':					e.replacement = 'PB_MegaSpawner';			break;
+			case 'Berserk':						e.replacement = 'PB_BerserkSpawner';		break;
+			case 'AllMap':						e.replacement = 'PB_AllMapSpawner';			break;
+
+			//
+			//	Monsters
+			//
+			case 'ZombieMan':				e.replacement = 'PBZombieManSpawner';			break;
+			case 'ShotgunGuy':				e.replacement = 'PBShotgunGuySpawner';			break;
+			case 'DoomImp':					e.replacement = 'PBImpSpawner';					break;
+			case 'Demon':					e.replacement = 'PBPinkySpawner';				break;
+			case 'Spectre':					e.replacement = 'PBSpectreSpawner';				break;
+			case 'ChaingunGuy':				e.replacement = 'PBChainGunGuySpawner';			break;
+			case 'Cacodemon':				e.replacement = 'PBCacoDemonSpawner';			break;
+			case 'HellKnight':				e.replacement = 'PBHKSpawner';					break;
+			case 'Arachnotron':				e.replacement = 'PBArachnotronSpawner';			break;
+			case 'BaronOfHell':				e.replacement = 'PBBOHSpawner';					break;
+			case 'Revenant':				e.replacement = 'PBRevSpawner';					break;
+			case 'LostSoul':				e.replacement = 'PBLSSpawner';					break;
+			case 'PainElemental':			e.replacement = 'PBPESpawner';					break;
+			case 'ArchVile':				e.replacement = 'PBArchVileSpawner';			break;
+			case 'Fatso':					e.replacement = 'PBMancubusSpawner';			break;
+			case 'Cyberdemon':				e.replacement = 'PBCyberDemonSpawner';			break;
+			case 'SpiderMastermind':		e.replacement = 'PBSpiderMasterMindSpawner';	break;
+			case 'WolfensteinSS':			e.replacement = 'EvilNaziSpawner';				break;
+
+		}
+	}
+
 	//
 	// for correct special level monster handling
 	//

zscript/Spawner/Ammo/PB_CellPackSpawner.zc

@@ -1,4 +1,4 @@
-Class PBCellPackSpawner : PB_SpawnerBase replaces CellPack
+Class PBCellPackSpawner : PB_SpawnerBase //replaces CellPack
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Ammo/PB_CellSpawner.zc

@@ -1,4 +1,4 @@
-Class PBCellSpawner : PB_SpawnerBase replaces Cell
+Class PBCellSpawner : PB_SpawnerBase //replaces Cell
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Ammo/PB_MagBoxSpawner.zc

@@ -1,4 +1,4 @@
-Class PBClipBoxSpawner : PB_SpawnerBase replaces ClipBox
+Class PBClipBoxSpawner : PB_SpawnerBase //replaces ClipBox
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Ammo/PB_MagSpawner.zc

@@ -1,4 +1,4 @@
-Class PBClipSpawner : PB_SpawnerBase replaces Clip
+Class PBClipSpawner : PB_SpawnerBase //replaces Clip
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Ammo/PB_PackSpawner.zc

@@ -1,4 +1,4 @@
-Class PBBackpackSpawner : PB_SpawnerBase replaces Backpack
+Class PBBackpackSpawner : PB_SpawnerBase //replaces Backpack
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;
@@ -81,4 +81,74 @@ class PB_PackSpawnerT4 : PB_AmmoSpawner
 	{
 		Dropitem "UpgradeSpawner", 255, 4;
 	}
-}
+}
+
+
+
+
+Class UpgradeSpawner : Actor
+{
+	//$Title Random Upgrade Spawner
+	//$Category Powerups
+	//$Sprite UDBG=0
+	default
+	{
+		Scale 0.2; //So the editor sprites isn't massive.
+		-COUNTITEM;
+		+DONTGIB;
+
+	}
+	States
+	{
+		Spawn:
+			TNT1 A 0;
+			TNT1 A 0 A_jumpif(pb_NoUpgrades,"Null");
+			TNT1 A 0 A_Jump(256, "SpawnFlamerUpgrade", "SpawnLMG", "SpawnQuadSSG", "SpawnPB_AutoshotgunUpgrade", "SpawnPB_MinigunUpgrade", "SpawnDragonBreathUpgrade", "SpawnPB_UnmakerUpgrade", "SpawnM2Upgrade", "SpawnDeagle", "SpawnRifleUpgrade");
+
+		SpawnFlamerUpgrade:
+			TNT1 A 0 A_jumpif(DisablePB_FlamerUpgrade,"SpawnLMG");
+			TNT1 A 0 A_SpawnItemEx("PB_FlamethrowerUpgrade",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnLMG:
+			TNT1 A 0 A_jumpif(DisablePB_LMG,"SpawnQuadSSG");
+			TNT1 A 0 A_SpawnItemEx("PB_LMG",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnQuadSSG:
+			TNT1 A 0 A_jumpif(DisablePB_QuadSG,"SpawnPB_AutoshotgunUpgrade");
+			TNT1 A 0 A_SpawnItemEx("PB_QuadSG",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnPB_AutoshotgunUpgrade:
+			TNT1 A 0 A_jumpif(DisablePB_AutoshotgunUpgrade,"SpawnPB_MinigunUpgrade");
+			TNT1 A 0 A_SpawnItemEx("PB_AutoshotgunUpgrade",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnPB_MinigunUpgrade:
+			TNT1 A 0 A_jumpif(DisablePB_MinigunUpgrade,"SpawnDragonBreathUpgrade");
+			TNT1 A 0 A_SpawnItemEx("PB_MinigunUpgrade",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnDragonBreathUpgrade:
+			TNT1 A 0 A_jumpif(DisablePB_SGMagazine,"SpawnRifleUpgrade");
+			TNT1 A 0 A_SpawnItemEx("PB_SGMagazine",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnRifleUpgrade:
+			TNT1 A 0 A_jumpif(DisableRifleUpgrade,"SpawnM2Upgrade");
+			TNT1 A 0 A_SpawnItemEx("RifleUpgrade",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnM2Upgrade:
+			TNT1 A 0 A_jumpif(DisablePB_M2Upgrade,"SpawnDeagle");
+			TNT1 A 0 A_SpawnItemEx("PB_M2Upgrade",0,0,0,0,0,0,0,288);
+			Stop;
+
+		SpawnDeagle:
+			TNT1 A 0 A_jumpif(DisablePB_Deagle,"Null");
+			TNT1 A 0 A_SpawnItemEx("PB_Deagle",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid);
+			Stop;
+
+	}
+}

zscript/Spawner/Ammo/PB_RocketSpawner.zc

@@ -1,4 +1,4 @@
-Class PBRocketSpawner : PB_SpawnerBase replaces RocketAmmo
+Class PBRocketSpawner : PB_SpawnerBase //replaces RocketAmmo
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Ammo/PB_RocketboxSpawner.zc

@@ -1,4 +1,4 @@
-Class PBRocketBoxSpawner : PB_SpawnerBase replaces RocketBox
+Class PBRocketBoxSpawner : PB_SpawnerBase //replaces RocketBox
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Ammo/PB_ShellSpawner.zc

@@ -1,4 +1,4 @@
-Class PBShellSpawner : PB_SpawnerBase replaces Shell
+Class PBShellSpawner : PB_SpawnerBase //replaces Shell
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Ammo/PB_ShellboxSpawner.zc

@@ -1,4 +1,4 @@
-Class PBShellboxSpawner : PB_SpawnerBase replaces Shellbox
+Class PBShellboxSpawner : PB_SpawnerBase //replaces Shellbox
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Items/PB_APBonusSpawner.zc

@@ -1,4 +1,4 @@
-Class PBAPBonusSpawner : PB_SpawnerBase replaces ArmorBonus
+Class PBAPBonusSpawner : PB_SpawnerBase //replaces ArmorBonus
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Items/PB_BlueSpawner.zc

@@ -1,4 +1,4 @@
-Class PBBlueSpawner : PB_SpawnerBase replaces BlueArmor
+Class PBBlueSpawner : PB_SpawnerBase //replaces BlueArmor
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Items/PB_GreenSpawner.zc

@@ -1,4 +1,4 @@
-Class PBGreenSpawner : PB_SpawnerBase replaces GreenArmor
+Class PBGreenSpawner : PB_SpawnerBase //replaces GreenArmor
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Items/PB_HPBonusSpawner.zc

@@ -1,4 +1,4 @@
-Class PBHPBonusSpawner : PB_SpawnerBase replaces HealthBonus
+Class PBHPBonusSpawner : PB_SpawnerBase //replaces HealthBonus
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Items/PB_MedkitSpawner.zc

@@ -1,4 +1,4 @@
-Class PBMedikitSpawner : PB_SpawnerBase replaces Medikit
+Class PBMedikitSpawner : PB_SpawnerBase //replaces Medikit
 {
 	//Int WeaponHasBeenSpawned;
     //Actor ptr;

zscript/Spawner/Items/PB_PowerUpsSpawner.zs

@@ -1,4 +1,4 @@
-Class PB_InvulSpawner : PB_SpawnerBase replaces invulnerabilitysphere
+Class PB_InvulSpawner : PB_SpawnerBase //replaces invulnerabilitysphere
 {
 	default
 	{
@@ -70,7 +70,7 @@ class PB_InvulSpawnerT4 : PB_PowerUpSpawner
 /// 
 //
 
-Class PB_RadSuitSpawner : PB_SpawnerBase replaces radsuit
+Class PB_RadSuitSpawner : PB_SpawnerBase //replaces radsuit
 {
 	default
 	{
@@ -142,7 +142,7 @@ class PB_RadSuitSpawnerT4 : PB_PowerUpSpawner
 //PB_BlurSphere
 
 
-Class PB_BlurSpawner : PB_SpawnerBase replaces blursphere
+Class PB_BlurSpawner : PB_SpawnerBase //replaces blursphere
 {
 	default
 	{
@@ -212,7 +212,7 @@ class PB_BlurSpawnerT4 : PB_PowerUpSpawner
 // infrared
 //
 
-Class PB_InfraRedSpawner : PB_SpawnerBase replaces infrared
+Class PB_InfraRedSpawner : PB_SpawnerBase //replaces infrared
 {
 	default
 	{
@@ -283,7 +283,7 @@ class PB_InfraRedSpawnerT4 : PB_PowerUpSpawner
 //
 //
 
-Class PB_SoulSphereSpawner : PB_SpawnerBase replaces soulsphere
+Class PB_SoulSphereSpawner : PB_SpawnerBase //replaces soulsphere
 {
 	default
 	{
@@ -353,7 +353,7 @@ class PB_SoulSphereSpawnerT4 : PB_PowerUpSpawner
 //
 // 
 
-Class PB_MegaSpawner : PB_SpawnerBase replaces megasphere
+Class PB_MegaSpawner : PB_SpawnerBase //replaces megasphere
 {
 	default
 	{
@@ -423,7 +423,7 @@ class PB_MegaSpawnerT4 : PB_PowerUpSpawner
 // Berserk
 //
 
-Class PB_BerserkSpawner : PB_SpawnerBase replaces Berserk
+Class PB_BerserkSpawner : PB_SpawnerBase //replaces Berserk
 {
 	default
 	{
@@ -493,7 +493,7 @@ class PB_BerserkSpawnerT4 : PB_PowerUpSpawner
 //	allmap
 //
 
-Class PB_AllMapSpawner : PB_SpawnerBase replaces AllMap
+Class PB_AllMapSpawner : PB_SpawnerBase //replaces AllMap
 {
 	default
 	{