Fixes to the pickup shit, plus some i missed

also added floatbob to the spheres generic cleaned up all the error messages form calling old actors
pa1nki113r · Jun 7, 2023 · 2814140 · 2814140
1 parent 1a1055f
commit 2814140
Show file tree

Hide file tree

Showing 68 changed files with 80 additions and 103 deletions.
diff --git a/BMAP/Armor.txt b/BMAP/Armor.txt
@@ -1,5 +1,3 @@
-//Blue Armor
-brightmap sprite 4RM2A0 { map "Brightmaps/ITEMS/4RM2A0.png" }
 //Health Bonus
 brightmap sprite BON1A0 { map "Brightmaps/ITEMS/BON1A0.png" }
 brightmap sprite BON1B0 { map "Brightmaps/ITEMS/BON1B0.png" }
@@ -12,6 +10,4 @@ brightmap sprite BON1H0 { map "Brightmaps/ITEMS/BON1H0.png" }
 brightmap sprite BON1I0 { map "Brightmaps/ITEMS/BON1I0.png" }
 brightmap sprite BON1J0 { map "Brightmaps/ITEMS/BON1J0.png" }
 //Health Pack
-brightmap sprite M3DIA0 { map "Brightmaps/ITEMS/M3DIA0.png" }
-brightmap sprite MEDPA0 { map "Brightmaps/ITEMS/MEDPA0.png" }
 brightmap sprite ST1MA0 { map "Brightmaps/ITEMS/ST1MA0.png" }
diff --git a/BMAP/Health.txt b/BMAP/Health.txt
@@ -1,6 +1,5 @@
 // Health pickups
 brightmap sprite MEDIA0{map "brightmaps/items/MEDIA0.png"disablefullbright}
-brightmap sprite STIMA0{map "brightmaps/items/STIMA0.png"disablefullbright}
 brightmap sprite PSTRA0{map "brightmaps/items/PSTRA0.png"disablefullbright}
 
 

diff --git a/BMAP/Powerups.txt b/BMAP/Powerups.txt
@@ -1,2 +1,3 @@
-brightmap sprite PVISA0 { map "Brightmaps/ITEMS/PVISA0.png" }
-brightmap sprite PSTRA0 { map "Brightmaps/ITEMS/PSTRA0.png" }
+brightmap sprite PVISA0 { map "Brightmaps/ITEMS/PVISA.png" }
+brightmap sprite PSTRA0 { map "Brightmaps/ITEMS/PSTRA0.png" }
+brightmap sprite SUITA0 { map "Brightmaps/ITEMS/SUITA0.png" }
diff --git a/PBTEST.wad b/PBTEST.wad
diff --git a/SPRITES/ITEMS/Ammo/BROKA0.png b/SPRITES/ITEMS/Ammo/BROKA0.png
diff --git a/SPRITES/ITEMS/Ammo/GSLNA0.png b/SPRITES/ITEMS/Ammo/GSLNA0.png
diff --git a/.../Slot 5/ROCKETLAUNCHER/Rockets/R0CKA0.png → SPRITES/ITEMS/Ammo/R0CKA0.png b/.../Slot 5/ROCKETLAUNCHER/Rockets/R0CKA0.png → SPRITES/ITEMS/Ammo/R0CKA0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAA0.png b/SPRITES/ITEMS/Spheres/MEGAA0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAB0.png b/SPRITES/ITEMS/Spheres/MEGAB0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAC0.png b/SPRITES/ITEMS/Spheres/MEGAC0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAD0.png b/SPRITES/ITEMS/Spheres/MEGAD0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAE0.png b/SPRITES/ITEMS/Spheres/MEGAE0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAF0.png b/SPRITES/ITEMS/Spheres/MEGAF0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAG0.png b/SPRITES/ITEMS/Spheres/MEGAG0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAH0.png b/SPRITES/ITEMS/Spheres/MEGAH0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAI0.png b/SPRITES/ITEMS/Spheres/MEGAI0.png
diff --git a/SPRITES/ITEMS/Spheres/MEGAJ0.png b/SPRITES/ITEMS/Spheres/MEGAJ0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULA0.png b/SPRITES/ITEMS/Spheres/SOULA0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULB0.png b/SPRITES/ITEMS/Spheres/SOULB0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULC0.png b/SPRITES/ITEMS/Spheres/SOULC0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULD0.png b/SPRITES/ITEMS/Spheres/SOULD0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULE0.png b/SPRITES/ITEMS/Spheres/SOULE0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULF0.png b/SPRITES/ITEMS/Spheres/SOULF0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULG0.png b/SPRITES/ITEMS/Spheres/SOULG0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULH0.png b/SPRITES/ITEMS/Spheres/SOULH0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULI0.png b/SPRITES/ITEMS/Spheres/SOULI0.png
diff --git a/SPRITES/ITEMS/Spheres/SOULJ0.png b/SPRITES/ITEMS/Spheres/SOULJ0.png
diff --git a/SPRITES/SFX/DB61A0.png b/SPRITES/SFX/DB61A0.png
diff --git a/SPRITES/SFX/DB61B0.png b/SPRITES/SFX/DB61B0.png
diff --git a/SPRITES/SFX/DB61C0.png b/SPRITES/SFX/DB61C0.png
diff --git a/SPRITES/SFX/DB61D0.png b/SPRITES/SFX/DB61D0.png
diff --git a/SPRITES/SFX/DB61E0.png b/SPRITES/SFX/DB61E0.png
diff --git a/SPRITES/SFX/DB61F0.png b/SPRITES/SFX/DB61F0.png
diff --git a/SPRITES/SFX/DB61G0.png b/SPRITES/SFX/DB61G0.png
diff --git a/SPRITES/SFX/DB61H0.png b/SPRITES/SFX/DB61H0.png
diff --git a/SPRITES/SFX/DB61I0.png b/SPRITES/SFX/DB61I0.png
diff --git a/SPRITES/SFX/DB61J0.png b/SPRITES/SFX/DB61J0.png
diff --git a/SPRITES/SFX/DB61K0.png b/SPRITES/SFX/DB61K0.png
diff --git a/SPRITES/SFX/DB61L0.png b/SPRITES/SFX/DB61L0.png
diff --git a/SPRITES/SFX/DB61M0.png b/SPRITES/SFX/DB61M0.png
diff --git a/SPRITES/SFX/DB61N0.png b/SPRITES/SFX/DB61N0.png
diff --git a/SPRITES/SFX/DB61O0.png b/SPRITES/SFX/DB61O0.png
diff --git a/SPRITES/SFX/DB61P0.png b/SPRITES/SFX/DB61P0.png
diff --git a/SPRITES/SFX/DB61Q0.png b/SPRITES/SFX/DB61Q0.png
diff --git a/SPRITES/SFX/DB61R0.png b/SPRITES/SFX/DB61R0.png
diff --git a/SPRITES/WEAPONS/Misc/GSLNA0.png b/SPRITES/WEAPONS/Misc/GSLNA0.png
diff --git a/SPRITES/WEAPONS/Slot 5/ROCKETLAUNCHER/Rockets/BROKA0.png b/SPRITES/WEAPONS/Slot 5/ROCKETLAUNCHER/Rockets/BROKA0.png
diff --git a/actors/Items/Powerups/SpecialPowerups.dec b/actors/Items/Powerups/SpecialPowerups.dec
@@ -27,7 +27,7 @@ Actor UpgradeSpawner
 	BackpackSpawn:
 		TNT1 A 0
 
-		TNT1 A 0 A_SpawnItemEx("PB_HeavyBackpack",0,0,0,0,0,0,0,288)
+		//TNT1 A 0 A_SpawnItemEx("PB_HeavyBackpack",0,0,0,0,0,0,0,288)
 		Stop
 
 	SpawnLMG:
@@ -88,8 +88,8 @@ Actor UpgradeSpawner
 	SpawnDeagle:
 		TNT1 A 0
 		TNT1 A 1 A_JumpIf(GetCvar("pb_nodeagle"), "BackpackSpawn")
-		TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
-		TNT1 A 0 A_RadiusGive("IsNearRevolver",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 0 A_RadiusGive("IsNearRevolver",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_Deagle",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	}

diff --git a/actors/Monsters/T2-Pinkies/SPECTRE.dec b/actors/Monsters/T2-Pinkies/SPECTRE.dec
@@ -31,7 +31,7 @@ damagefactor "Blood", 0.0 damagefactor "BlueBlood", 0.0 damagefactor "GreenBlood
 	DamageType Eat
 	MaxStepHeight 48
 	MaxDropOffHeight 48
-	DropItem "NewBlurSphere" 2
+	DropItem "PB_BlurSphere" 2
 	RenderStyle Add
     Alpha 0.45
 	Obituary "%o has been sodomized by a Spectre."

diff --git a/actors/Monsters/T2-Pinkies/VOIDSPECTRE.dec b/actors/Monsters/T2-Pinkies/VOIDSPECTRE.dec
@@ -96,7 +96,7 @@ ACTOR PB_VoidSpectre: PB_Demon Replaces Spectre
 	DamageType Eat
 	MaxStepHeight 48
 	MaxDropOffHeight 48
-	DropItem "NewBlurSphere" 3
+	DropItem "PB_BlurSphere" 3
 	Obituary "%o was devoured by a Void Spectre."
 	DropItem "Demonpickup" 100
 	+NOBLOODDECALS

diff --git a/actors/Player/PLAYER.dec b/actors/Player/PLAYER.dec
@@ -521,27 +521,27 @@ ACTOR Doomer : PlayerPawnBase Replaces DoomPlayer
 	//WEAPON SLOTS FOR THIS PLAYER CLASS
 
 	Player.WeaponSlot 1, PB_Axe, PB_Chainsaw , Melee_Attacks
-	Player.WeaponSlot 2, PB_Pistol, PB_Revolver, PB_MP40, PB_SMG 
+	Player.WeaponSlot 2, PB_Pistol, PB_Revolver, PB_SMG, PB_MP40
 	Player.WeaponSlot 3, PB_Shotgun , PB_AutoShotgun, PB_SSG
 	Player.WeaponSlot 4, Rifle, PB_Carbine, PB_ChexRifle
 	Player.WeaponSlot 5, PB_Minigun, PB_Nailgun, PB_MG42
 	Player.WeaponSlot 6, PB_SuperGL , PB_RocketLauncher
 	Player.WeaponSlot 7, PB_M1Plasma, PB_M2Plasma
-	Player.WeaponSlot 8, PB_CryoRifle , PB_Railgun
-	Player.WeaponSlot 9, PB_Unmaker, PB_BFG9000
-	Player.WeaponSlot 0, PB_Flamethrower , Hell_rifle
+	Player.WeaponSlot 8, PB_CryoRifle , PB_Flamethrower
+	Player.WeaponSlot 9, PB_Railgun, PB_BFG9000
+	Player.WeaponSlot 0, Hell_Rifle, PB_Unmaker
 
 	Player.StartItem "PB_PDAWeaponContainer",1
 	Player.StartItem "Rifle"
 	Player.StartItem "PB_Pistol"
 	Player.StartItem "Melee_Attacks"
 	Player.StartItem "CarbineFullAuto"
-	Player.StartItem "NewClip", 90
+	Player.StartItem "PB_HighCalMag", 90
 	Player.StartItem "RifleAmmo", 31
 	Player.StartItem "LeftRifleAmmo", 31
 	Player.StartItem "PrimaryPistolAmmo", 16
 	Player.StartItem "SecondaryPistolAmmo", 16
-	Player.StartItem "PistolBullets", 60
+	Player.StartItem "PB_LowCalMag", 60
 	Player.StartItem "ShotgunAmmo", 9
 	Player.StartItem "AutoShotgunAmmo", 12
 	Player.StartItem "LeftASGAmmo",12
@@ -575,8 +575,8 @@ ACTOR Doomer : PlayerPawnBase Replaces DoomPlayer
 	Player.StartItem "CryoRifleAmmo", 60
 	Player.StartItem "HasBuckShot", 1 //Added for proper SG ammo type sorting
 	Player.StartItem "FragGrenadeSelected", 1
-	Player.StartItem "HandGrenadeAmmo", 3
-	Player.StartItem "MiniHellRocketAmmo", 4
+	Player.StartItem "PB_GrenadeAmmo", 3
+	Player.StartItem "PB_QuickLauncherAmmo", 4
 	Player.StartItem "IsPlayingAsProjectBrutality", 1
 	Player.StartItem "FlamerAmmo", 90
 	Player.JumpZ 7.4
@@ -600,13 +600,15 @@ ACTOR Doomer : PlayerPawnBase Replaces DoomPlayer
 		MARN A 1 
 	StandStill:	
 		MARN A 0
+		/*
 		TNT1 A 0 
 		{
 		if (Height < 54)
 		{
 		A_GiveInventory("IsCrouching",1);
 		}
 		}
+		*/
 		TNT1 A 0 A_Changeflag("NOPAIN", false)
 		TNT1 A 0 A_TakeInventory("DoNotJump",1)
 		TNT1 A 0 A_ChangeFlag("PICKUP", true)

diff --git a/actors/SPAWNERS/WeaponSpawners/BFG9000WeaponSpawners.dec b/actors/SPAWNERS/WeaponSpawners/BFG9000WeaponSpawners.dec
@@ -31,7 +31,7 @@ Actor BFGWeaponSpawner : SpawnerBase replaces BFG9000
 			ReplaceToggle:
 
 			ReplaceVanilla:
-			TNT1 A 1 A_RadiusGive("IsNearBFG", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+			//TNT1 A 1 A_RadiusGive("IsNearBFG", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 			TNT1 A 0 A_SpawnItemEx("PB_BFG9000",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 			Stop
 		SpawnBuzzsaw:

diff --git a/actors/SPAWNERS/WeaponSpawners/ChaingunWeaponSpawners.dec b/actors/SPAWNERS/WeaponSpawners/ChaingunWeaponSpawners.dec
@@ -70,32 +70,32 @@ Actor ChaingunWeaponSpawner Replaces Chaingun
 			TNT1 A 0 A_Jump(256, "SpawnPBMinigun")
 	SpawnLMG:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleLMG",0)	
-		TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_LMG",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)	
 		Stop
 	SpawnHDMR:
 		TNT1 A 1
-		TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("RifleUpgrade",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)	
 		Stop
 	SpawnTriMinigun:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleMinigunUpgrade", 0, 0, 0, 0)
-		TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_MinigunUpgrade",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPBCarbine:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponCarbine",0)
-		TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("DropedCarbine",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPBNailgun:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponPB_Nailgun",0)
-		TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("DroppedPB_Nailgun",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnSMG:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponSMG",0)
-		TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("DropedSMG",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPBMinigun:
@@ -105,7 +105,7 @@ Actor ChaingunWeaponSpawner Replaces Chaingun
 		ReplaceToggle:
 		BackpackSpawn: //For the upgrade spawner because I'm lazy
 		TNT1 A 0 A_SpawnItemEx("DropedMinigun",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
-		TNT1 A 0 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 0 A_RadiusGive("IsNearHighCalWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		Stop
 	SpawnBuzzsaw:
 		TNT1 A 0 A_Jump(150,"SkipNaziCheck")

diff --git a/actors/SPAWNERS/WeaponSpawners/PlasmaRifleWeaponSpawners.dec b/actors/SPAWNERS/WeaponSpawners/PlasmaRifleWeaponSpawners.dec
@@ -72,34 +72,34 @@ Actor PlasmaWeaponSpawner replaces PlasmaRifle
 			TNT1 A 0 A_Jump(256, "SpawnPB_PlasmaRifle")
 	SpawnPB_Railgun:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponRailgun",0)
-		TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_Railgun",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPB_CryoRifle:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponFreezer",0)
-		TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_CryoRifle",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPB_M2Plasma:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponM2Plasma",0)
-		TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("DropedM2Plasma",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPB_LightningGun:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponM2Plasma",0)
-		TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_M2Upgrade",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPB_Flamethrower:
-		TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_Flamethrower",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPB_PlasmaRifle:
 		ReplaceVanilla:
 		ReplaceToggle:
 
 	ReplaceVanilla:
-		TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearPlasmaWeapon", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("DropedPlasma",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	}

diff --git a/actors/SPAWNERS/WeaponSpawners/RocketLauncherWeaponSpawners.dec b/actors/SPAWNERS/WeaponSpawners/RocketLauncherWeaponSpawners.dec
@@ -50,7 +50,7 @@ Actor LauncherWeaponSpawner replaces RocketLauncher
 			TNT1 A 0 A_Jump(256, "SpawnPB_RocketLauncher")
 	SpawnPB_SuperGrenadeLauncher:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponSuperGL",0)
-		TNT1 A 1 A_RadiusGive("IsNearSpecialGrenadeLauncher", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearSpecialGrenadeLauncher", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_SuperGL",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnPB_RocketLauncher:
@@ -59,7 +59,7 @@ Actor LauncherWeaponSpawner replaces RocketLauncher
 
 	ReplaceVanilla:
 		TNT1 A 0 A_SpawnItemEx("PB_RocketLauncher",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
-		TNT1 A 0 A_RadiusGive("IsNearRocketLauncher", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 0 A_RadiusGive("IsNearRocketLauncher", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		Stop
 	SpawnBuzzsaw:
 		TNT1 A 0 A_Jump(190,"SkipNaziCheck")

diff --git a/actors/SPAWNERS/WeaponSpawners/ShotgunWeaponSpawners.dec b/actors/SPAWNERS/WeaponSpawners/ShotgunWeaponSpawners.dec
@@ -68,26 +68,26 @@ Actor ShotgunWeaponSpawner replaces Shotgun
 				return A_Jump(256,1);
 		}
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleDragonBreathUpgrade", 0, 0, 0, 0)//Check if Upgrades are disabled
-		TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_SGMagazine",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop		
 	SpawnASG:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponASG",0)
-		TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("DropedASG",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop		
 	SpawnPB_Revolver:
 		TNT1 A 0 A_JumpIf(GetCvar("pb_nodeagle"), 2)
 		TNT1 A 0 A_Jump(96, "SpawnDeagle")
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponRevolver",0)
-		TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
-		TNT1 A 0 A_RadiusGive("IsNearRevolver",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 0 A_RadiusGive("IsNearRevolver",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("DropedPB_Revolver",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnDeagle:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleWeaponRevolver",0)
-		TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
-		TNT1 A 0 A_RadiusGive("IsNearRevolver",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearLowCalWeapon",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 0 A_RadiusGive("IsNearRevolver",  480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_Deagle",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnNormalShotgun:
@@ -104,7 +104,7 @@ Actor ShotgunWeaponSpawner replaces Shotgun
 				return A_Jump(256,1);
 		}
 		TNT1 A 0 A_SpawnItemEx("PB_Shotgun",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
-		TNT1 A 0 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 0 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		Stop
 	SpawnSSGClass:
 		TNT1 A 1 A_SpawnItemEx("SSGWeaponSpawner",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)

diff --git a/actors/SPAWNERS/WeaponSpawners/SuperShotgunWeaponSpawners.dec b/actors/SPAWNERS/WeaponSpawners/SuperShotgunWeaponSpawners.dec
@@ -44,12 +44,12 @@ Actor SSGWeaponSpawner replaces SuperShotgun
 			TNT1 A 0 A_Jump(256,"SpawnSSG")	
 	SpawnQuadSSG:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleQuadSSG", 0, 0, 0, 0)
-		TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_QuadSG",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop	
 	SpawnASGDrumMag:
 		TNT1 A 1 ACS_NamedExecuteAlways("ToggleAutoshotgunUpgrade", 0, 0, 0, 0)
-		TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 1 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		TNT1 A 0 A_SpawnItemEx("PB_AutoshotgunUpgrade",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
 		Stop
 	SpawnSSG:
@@ -59,7 +59,7 @@ Actor SSGWeaponSpawner replaces SuperShotgun
 
 	ReplaceVanilla:
 		TNT1 A 0 A_SpawnItemEx("DropedPB_SSG",0,0,0,0,0,0,0,SXF_TRANSFERSPECIAL | SXF_TRANSFERAMBUSHFLAG | SXF_TRANSFERPOINTERS | 288,0,tid)
-		TNT1 A 0 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
+		//TNT1 A 0 A_RadiusGive("IsNearShotgun", 480, RGF_GIVESELF | RGF_CUBE | RGF_MONSTERS | RGF_ITEMS | RGF_NOSIGHT, 1)
 		Stop		
 	}
 }
diff --git a/actors/Weapons/Slot6/PLASMA.dec b/actors/Weapons/Slot6/PLASMA.dec
@@ -62,13 +62,13 @@ ACTOR PB_M1PlasmaPickup : PB_UpgradeItem
 // the M1 Plasma pickup from happen if the ammo count is full.
 	Pickup:
 		TNT1 A 0 {
-			if(CountInv("PB_Cell") == 300 && CountInv("PB_M1Plasma") >=3 && CountInv("GotAPack") < 1 && CountInv("GotAPack_h") < 1) {
+			if(CountInv("PB_Cell") == 300 && CountInv("PB_M1Plasma") >=3  ) {
 				return state("FullAmmo");
 				}
-			else if(CountInv("PB_Cell") == 600 && CountInv("PB_M1Plasma") >=3 && CountInv("GotAPack") >= 1 && CountInv("GotAPack_h") < 1) {
+			else if(CountInv("PB_Cell") == 600 && CountInv("PB_M1Plasma") >=3  ) {
 				return state("FullAmmo");
 				}
-			else if(CountInv("PB_Cell") == 800 && CountInv("PB_M1Plasma") >=3 && CountInv("GotAPack") >= 1 && CountInv("GotAPack_h") >= 1) {
+			else if(CountInv("PB_Cell") == 800 && CountInv("PB_M1Plasma") >=3  ) {
 				return state("FullAmmo");
 				}
 				return state("");

diff --git a/actors/Weapons/Slot7/RAILGUN.dec b/actors/Weapons/Slot7/RAILGUN.dec
@@ -68,7 +68,7 @@ ACTOR PB_Railgun : PB_Weapon
 	Weapon.AmmoType2 "RailgunAmmo"
 	Obituary "%o was pierced by %k's Railgun."
     Inventory.PickupSound "PLSDRAW"
-	Inventory.Pickupmessage "You got the UAC-MKIII Railgun! (Slot 8)"
+	Inventory.Pickupmessage "You got the UAC-MKIII Railgun! (Slot 9)"
 	+WEAPON.NOAUTOAIM
     +WEAPON.NOAUTOFIRE
 	+WEAPON.NOALERT

diff --git a/actors/Weapons/Slot9/Flamethrower.dec b/actors/Weapons/Slot9/Flamethrower.dec
@@ -179,7 +179,7 @@ Actor PB_FlamethrowerUpgrade : CustomInventory
 +INVENTORY.ALWAYSPICKUP
 Inventory.PickupSound "FLMDRAW"
 Scale 0.5
-Inventory.PickupMessage "You got the UAC-M3 Flamethrower upgrade! (Slot 0)"
+Inventory.PickupMessage "You got the UAC-M3 Flamethrower upgrade! (Slot 8)"
 States
 {
 Spawn:
@@ -229,7 +229,7 @@ ACTOR PB_Flamethrower : PB_Weapon
      +WEAPON.NOAUTOAIM
 	+FLOORCLIP
 	+DONTGIB
-	Inventory.PickupMessage "You got the UAC-M3 Flamethrower! (Slot 0)"
+	Inventory.PickupMessage "You got the UAC-M3 Flamethrower! (Slot 8)"
 	Tag "UAC-M3 Flamethrower"
 	States
 	{

diff --git a/actors/Weapons/Slot9/Unmaker.dec b/actors/Weapons/Slot9/Unmaker.dec
@@ -72,7 +72,7 @@ ACTOR PB_Unmaker : PB_Weapon
 	+WEAPON.NOAUTOFIRE	
 	+WEAPON.AMMO_OPTIONAL
 	scale .5
-	Inventory.PickupMessage "You got the sinister Unmaker, the penultimate wrath of Hell itself. (Slot 9)"
+	Inventory.PickupMessage "You got the sinister Unmaker, the penultimate wrath of Hell itself. (Slot 0)"
 	PB_WeaponBase.respectItem "RespectUnmaker"
 	States
 	{		

diff --git a/brightmaps/ITEMS/PVISA0.png → brightmaps/ITEMS/PVISA.png b/brightmaps/ITEMS/PVISA0.png → brightmaps/ITEMS/PVISA.png
diff --git a/doomdefs.bm b/doomdefs.bm
@@ -2,6 +2,7 @@
 #include BMAP/Ammo.txt
 #include BMAP/Armor.txt
 #include BMAP/Shields.txt
+#include BMAP/Powerups.txt
 
 //Weapons
 //Slot 2