diff --git a/BMAP/Armor.txt b/BMAP/Armor.txt index f94a7131d6..1db4196c30 100644 --- 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" } \ No newline at end of file diff --git a/BMAP/Health.txt b/BMAP/Health.txt index 05be5cd294..150128d6ca 100644 --- 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 index 40784ea6fd..c6460cffa4 100644 --- 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" } \ No newline at end of file +brightmap sprite PVISA0 { map "Brightmaps/ITEMS/PVISA.png" } +brightmap sprite PSTRA0 { map "Brightmaps/ITEMS/PSTRA0.png" } +brightmap sprite SUITA0 { map "Brightmaps/ITEMS/SUITA0.png" } \ No newline at end of file diff --git a/PBTEST.wad b/PBTEST.wad index 4e182537f6..c32a885016 100644 Binary files a/PBTEST.wad and b/PBTEST.wad differ diff --git a/SPRITES/ITEMS/Ammo/BROKA0.png b/SPRITES/ITEMS/Ammo/BROKA0.png new file mode 100644 index 0000000000..5937229ef9 Binary files /dev/null and b/SPRITES/ITEMS/Ammo/BROKA0.png differ diff --git a/SPRITES/ITEMS/Ammo/GSLNA0.png b/SPRITES/ITEMS/Ammo/GSLNA0.png new file mode 100644 index 0000000000..7a0f5bb507 Binary files /dev/null and b/SPRITES/ITEMS/Ammo/GSLNA0.png differ diff --git a/SPRITES/WEAPONS/Slot 5/ROCKETLAUNCHER/Rockets/R0CKA0.png b/SPRITES/ITEMS/Ammo/R0CKA0.png similarity index 100% rename from SPRITES/WEAPONS/Slot 5/ROCKETLAUNCHER/Rockets/R0CKA0.png rename to SPRITES/ITEMS/Ammo/R0CKA0.png diff --git a/SPRITES/ITEMS/Spheres/MEGAA0.png b/SPRITES/ITEMS/Spheres/MEGAA0.png index d46d31fac3..ffab107a5a 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAA0.png and b/SPRITES/ITEMS/Spheres/MEGAA0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAB0.png b/SPRITES/ITEMS/Spheres/MEGAB0.png index 12774ba611..cd57097cf8 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAB0.png and b/SPRITES/ITEMS/Spheres/MEGAB0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAC0.png b/SPRITES/ITEMS/Spheres/MEGAC0.png index 6b2acd7999..321d211922 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAC0.png and b/SPRITES/ITEMS/Spheres/MEGAC0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAD0.png b/SPRITES/ITEMS/Spheres/MEGAD0.png index cd09e3a9f5..e28d6e834d 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAD0.png and b/SPRITES/ITEMS/Spheres/MEGAD0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAE0.png b/SPRITES/ITEMS/Spheres/MEGAE0.png index 344919c255..a6bca6d4bb 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAE0.png and b/SPRITES/ITEMS/Spheres/MEGAE0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAF0.png b/SPRITES/ITEMS/Spheres/MEGAF0.png index f57f0e9df4..3a0a07f1b9 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAF0.png and b/SPRITES/ITEMS/Spheres/MEGAF0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAG0.png b/SPRITES/ITEMS/Spheres/MEGAG0.png index 6ab49b9cf5..e3a558ba91 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAG0.png and b/SPRITES/ITEMS/Spheres/MEGAG0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAH0.png b/SPRITES/ITEMS/Spheres/MEGAH0.png index a6943985cd..e38f9dd4f2 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAH0.png and b/SPRITES/ITEMS/Spheres/MEGAH0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAI0.png b/SPRITES/ITEMS/Spheres/MEGAI0.png index 7d9ff71732..c17218dcdb 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAI0.png and b/SPRITES/ITEMS/Spheres/MEGAI0.png differ diff --git a/SPRITES/ITEMS/Spheres/MEGAJ0.png b/SPRITES/ITEMS/Spheres/MEGAJ0.png index 32077344e9..feff0544bf 100644 Binary files a/SPRITES/ITEMS/Spheres/MEGAJ0.png and b/SPRITES/ITEMS/Spheres/MEGAJ0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULA0.png b/SPRITES/ITEMS/Spheres/SOULA0.png index dabb864cdf..f859f06dfa 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULA0.png and b/SPRITES/ITEMS/Spheres/SOULA0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULB0.png b/SPRITES/ITEMS/Spheres/SOULB0.png index 1f951fb0ba..27df8a9ade 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULB0.png and b/SPRITES/ITEMS/Spheres/SOULB0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULC0.png b/SPRITES/ITEMS/Spheres/SOULC0.png index 3d93cd5354..24b3711e54 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULC0.png and b/SPRITES/ITEMS/Spheres/SOULC0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULD0.png b/SPRITES/ITEMS/Spheres/SOULD0.png index fd61f05d17..1884153e4d 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULD0.png and b/SPRITES/ITEMS/Spheres/SOULD0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULE0.png b/SPRITES/ITEMS/Spheres/SOULE0.png index 7e6d1fadc8..3391960a72 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULE0.png and b/SPRITES/ITEMS/Spheres/SOULE0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULF0.png b/SPRITES/ITEMS/Spheres/SOULF0.png index 1b415e9528..f74e6848be 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULF0.png and b/SPRITES/ITEMS/Spheres/SOULF0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULG0.png b/SPRITES/ITEMS/Spheres/SOULG0.png index 23f0fc8158..78847b9189 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULG0.png and b/SPRITES/ITEMS/Spheres/SOULG0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULH0.png b/SPRITES/ITEMS/Spheres/SOULH0.png index ca9df58012..d04758b5d1 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULH0.png and b/SPRITES/ITEMS/Spheres/SOULH0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULI0.png b/SPRITES/ITEMS/Spheres/SOULI0.png index f97c4b7005..87bb28194c 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULI0.png and b/SPRITES/ITEMS/Spheres/SOULI0.png differ diff --git a/SPRITES/ITEMS/Spheres/SOULJ0.png b/SPRITES/ITEMS/Spheres/SOULJ0.png index 13c8a7db8b..14405217de 100644 Binary files a/SPRITES/ITEMS/Spheres/SOULJ0.png and b/SPRITES/ITEMS/Spheres/SOULJ0.png differ diff --git a/SPRITES/SFX/DB61A0.png b/SPRITES/SFX/DB61A0.png index 0d6215d9c9..b3c688578f 100644 Binary files a/SPRITES/SFX/DB61A0.png and b/SPRITES/SFX/DB61A0.png differ diff --git a/SPRITES/SFX/DB61B0.png b/SPRITES/SFX/DB61B0.png index c7a8ed1dff..377b4a2b6b 100644 Binary files a/SPRITES/SFX/DB61B0.png and b/SPRITES/SFX/DB61B0.png differ diff --git a/SPRITES/SFX/DB61C0.png b/SPRITES/SFX/DB61C0.png index 41b5d6e970..8f935f8055 100644 Binary files a/SPRITES/SFX/DB61C0.png and b/SPRITES/SFX/DB61C0.png differ diff --git a/SPRITES/SFX/DB61D0.png b/SPRITES/SFX/DB61D0.png index f976807f82..98030299a5 100644 Binary files a/SPRITES/SFX/DB61D0.png and b/SPRITES/SFX/DB61D0.png differ diff --git a/SPRITES/SFX/DB61E0.png b/SPRITES/SFX/DB61E0.png index 7991d84e87..559d974653 100644 Binary files a/SPRITES/SFX/DB61E0.png and b/SPRITES/SFX/DB61E0.png differ diff --git a/SPRITES/SFX/DB61F0.png b/SPRITES/SFX/DB61F0.png index 10eee49bb6..ec0d3a0508 100644 Binary files a/SPRITES/SFX/DB61F0.png and b/SPRITES/SFX/DB61F0.png differ diff --git a/SPRITES/SFX/DB61G0.png b/SPRITES/SFX/DB61G0.png index 231b9e6a73..d41b660306 100644 Binary files a/SPRITES/SFX/DB61G0.png and b/SPRITES/SFX/DB61G0.png differ diff --git a/SPRITES/SFX/DB61H0.png b/SPRITES/SFX/DB61H0.png index 99c799d642..c269378125 100644 Binary files a/SPRITES/SFX/DB61H0.png and b/SPRITES/SFX/DB61H0.png differ diff --git a/SPRITES/SFX/DB61I0.png b/SPRITES/SFX/DB61I0.png deleted file mode 100644 index 9ef14c58a0..0000000000 Binary files a/SPRITES/SFX/DB61I0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61J0.png b/SPRITES/SFX/DB61J0.png deleted file mode 100644 index 5bed52702e..0000000000 Binary files a/SPRITES/SFX/DB61J0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61K0.png b/SPRITES/SFX/DB61K0.png deleted file mode 100644 index 4d73411246..0000000000 Binary files a/SPRITES/SFX/DB61K0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61L0.png b/SPRITES/SFX/DB61L0.png deleted file mode 100644 index f18e762d68..0000000000 Binary files a/SPRITES/SFX/DB61L0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61M0.png b/SPRITES/SFX/DB61M0.png deleted file mode 100644 index 492db4a082..0000000000 Binary files a/SPRITES/SFX/DB61M0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61N0.png b/SPRITES/SFX/DB61N0.png deleted file mode 100644 index c7371f0170..0000000000 Binary files a/SPRITES/SFX/DB61N0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61O0.png b/SPRITES/SFX/DB61O0.png deleted file mode 100644 index ca3620ae14..0000000000 Binary files a/SPRITES/SFX/DB61O0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61P0.png b/SPRITES/SFX/DB61P0.png deleted file mode 100644 index e54d18809c..0000000000 Binary files a/SPRITES/SFX/DB61P0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61Q0.png b/SPRITES/SFX/DB61Q0.png deleted file mode 100644 index 2067439cc5..0000000000 Binary files a/SPRITES/SFX/DB61Q0.png and /dev/null differ diff --git a/SPRITES/SFX/DB61R0.png b/SPRITES/SFX/DB61R0.png deleted file mode 100644 index 64c6c17c5a..0000000000 Binary files a/SPRITES/SFX/DB61R0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Misc/GSLNA0.png b/SPRITES/WEAPONS/Misc/GSLNA0.png deleted file mode 100644 index 2f4c31ae1c..0000000000 Binary files a/SPRITES/WEAPONS/Misc/GSLNA0.png and /dev/null differ diff --git a/SPRITES/WEAPONS/Slot 5/ROCKETLAUNCHER/Rockets/BROKA0.png b/SPRITES/WEAPONS/Slot 5/ROCKETLAUNCHER/Rockets/BROKA0.png deleted file mode 100644 index 8ce02c3c43..0000000000 Binary files a/SPRITES/WEAPONS/Slot 5/ROCKETLAUNCHER/Rockets/BROKA0.png and /dev/null differ diff --git a/actors/Items/Powerups/SpecialPowerups.dec b/actors/Items/Powerups/SpecialPowerups.dec index abc5b9d8e7..55a953669c 100644 --- 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 index f890237819..3dc454762a 100644 --- 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 index 82556fe8dc..c312d2f7cc 100644 --- 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 index 0f2c1216c5..63218643d8 100644 --- 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,6 +600,7 @@ ACTOR Doomer : PlayerPawnBase Replaces DoomPlayer MARN A 1 StandStill: MARN A 0 + /* TNT1 A 0 { if (Height < 54) @@ -607,6 +608,7 @@ ACTOR Doomer : PlayerPawnBase Replaces DoomPlayer 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 index e461a5939d..f4dd2b808a 100644 --- 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 index f366ca7fcc..83526f9c7b 100644 --- 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 index 6b32adc653..39bbd0496a 100644 --- a/actors/SPAWNERS/WeaponSpawners/PlasmaRifleWeaponSpawners.dec +++ b/actors/SPAWNERS/WeaponSpawners/PlasmaRifleWeaponSpawners.dec @@ -72,26 +72,26 @@ 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: @@ -99,7 +99,7 @@ Actor PlasmaWeaponSpawner replaces PlasmaRifle 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 index 238c1117ec..8f8a7f997c 100644 --- 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 index 15f32df267..65a3f87e37 100644 --- 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 index 5b093301a6..d03b1f686c 100644 --- 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 index cb36ecda95..7ce599b2d4 100644 --- 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 index 84df132476..0ab675055e 100644 --- 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 index 4061e8077d..3c5dda89c3 100644 --- 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 index 1a3d29b0a9..c6a4ab3e23 100644 --- 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 b/brightmaps/ITEMS/PVISA.png similarity index 100% rename from brightmaps/ITEMS/PVISA0.png rename to brightmaps/ITEMS/PVISA.png diff --git a/doomdefs.bm b/doomdefs.bm index d4529bb5aa..b07f667546 100644 --- 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 diff --git a/zscript/AmmoBase.zsc b/zscript/AmmoBase.zsc index a2aba43a25..f2c2d58c61 100644 --- a/zscript/AmmoBase.zsc +++ b/zscript/AmmoBase.zsc @@ -1,6 +1,6 @@ class PB_Ammo : Ammo { - int cap,ca,res; name ammotype; string p; actor dtfx; + int cap,ca,res; name ammotype; string p; property ammotype : ammotype; Default @@ -26,16 +26,7 @@ class PB_Ammo : Ammo case 'cell' : SetStateLabel("SpawnCell"); break; case 'cellpack' : SetStateLabel("SpawnCellPack"); break; case 'fuel': sprite = GetSpriteIndex("GSLN"); break; - case 'dtech': - SetStateLabel("SpawnDTech"); - dtfx = PB_DTechAmmoEffect(Spawn("PB_DTechAmmoEffect",pos)); - if(dtfx) - { - dtfx.master = self; - dtfx.scale.x = 0.214; - dtfx.scale.y = dtfx.scale.x; - } - break; + case 'dtech': SetStateLabel("SpawnDTech"); break; case 'nade': SetStateLabel("SpawnNade"); break; case 'nadestun': sprite = GetSpriteIndex("STNG"); break; case 'proxmine': sprite = GetSpriteIndex("XPFP"); break; @@ -83,7 +74,7 @@ class PB_Ammo : Ammo YELP ABCDEFGHIJ 2; loop; SpawnDTech: - DB61 AABCCDEEFGGHIIJJ 1 bright; + DB61 ABCDEFGH 2 bright; loop; SpawnNade: PGRN D -1; @@ -125,7 +116,7 @@ class PB_HighCalMag : PB_Ammo { Default { - Scale 0.12; + Scale 0.15; Tag "High Caliber Round"; Inventory.Amount 15; Inventory.MaxAmount 300; @@ -140,7 +131,7 @@ class PB_HighCalBox : PB_HighCalMag { Default { - Scale 0.18; + Scale 0.15; Inventory.Amount 60; Inventory.PickupSound "CBOXPKUP"; PB_Ammo.ammotype "highcalbox"; @@ -192,7 +183,7 @@ class PB_RocketBox : PB_RocketAmmo replaces rocketbox { Default { - Scale 1; + Scale 0.2; Inventory.Amount 6; Inventory.PickupSound "misc/rockboxa"; PB_Ammo.ammotype "expbox"; @@ -229,6 +220,7 @@ class PB_Fuel : PB_Ammo { Default { + Scale 0.4; Tag "Fuel"; Inventory.Amount 50; Inventory.MaxAmount 300; @@ -243,7 +235,7 @@ class PB_DTech : PB_Ammo replaces demonpickup { Default { - Scale 0.25; + Scale 0.15; RenderStyle "Add"; Tag "Demon Energy"; Inventory.Amount 20; @@ -256,7 +248,6 @@ class PB_DTech : PB_Ammo replaces demonpickup override void DoPickupSpecial(actor toucher) { - if(dtfx) dtfx.Destroy(); toucher.GiveInventory("PB_ArmorBonus",1); Super.DoPickupSpecial(toucher); } @@ -266,15 +257,11 @@ class PB_DTechLarge : PB_DTech replaces demonpickup2 { Default { - Scale 0.35; + Scale 0.25; Inventory.Amount 40; } - override void PostBeginPlay() - { - Super.PostBeginPlay(); - if(dtfx) { dtfx.scale.x = 0.3; dtfx.scale.y = dtfx.scale.x; } - } - override void DoPickupSpecial(actor toucher) + + override void DoPickupSpecial(actor toucher) { toucher.GiveInventory("PB_ArmorBonus",1); toucher.GiveInventory("PB_HealthBonus",2); @@ -282,22 +269,6 @@ class PB_DTechLarge : PB_DTech replaces demonpickup2 } } -class PB_DTechAmmoEffect : Actor -{ - Default - { - Alpha 0.8; - +BRIGHT - } - - States - { - Spawn: - DB61 KKLLMMNNOOPPQQRR 1 A_Warp(AAPTR_MASTER,flags:WARPF_INTERPOLATE); - loop; - } -} - //Equipment ammo class PB_GrenadeAmmo : PB_Ammo { @@ -307,6 +278,7 @@ class PB_GrenadeAmmo : PB_Ammo Tag "Frag Grenade"; Inventory.Amount 1; Inventory.MaxAmount 6; + Inventory.PickupSound "GRNPIN"; Inventory.Icon "PGRND0"; Ammo.BackpackAmount 1; Ammo.BackpackMaxAmount 12; diff --git a/zscript/HP&AP.zsc b/zscript/HP&AP.zsc index c682a89eb8..c068ed9ff1 100644 --- a/zscript/HP&AP.zsc +++ b/zscript/HP&AP.zsc @@ -12,7 +12,7 @@ class PB_HealthBonus : HealthBonus replaces healthbonus States { Spawn: - BON1 ABCDEFGHIJ 2; + BON1 ABCDEFGHIJ 3; loop; } } @@ -63,7 +63,7 @@ class PB_ArmorBonus : ArmorBonus replaces armorbonus States { Spawn: - BON2 AAAAAAAABCDEFGH 3; + BON2 AAAAAAAABCDEFGH 2 BRIGHT; loop; } } diff --git a/zscript/Monsters/ZombieMen/ZombieScientist.zc b/zscript/Monsters/ZombieMen/ZombieScientist.zc index a65a2726dd..3470a56dcc 100644 --- a/zscript/Monsters/ZombieMen/ZombieScientist.zc +++ b/zscript/Monsters/ZombieMen/ZombieScientist.zc @@ -51,7 +51,7 @@ Class PB_ZombieScientist : PB_Monster damagefactor "Cut", 0.75; damagefactor "Tear", 0.25; damagefactor "Head", 0.6; - DropItem "Stimpack2", 22; + DropItem "PB_Stimpack", 22; Obituary "%o has been sliced apart by a zombie labworker."; +FLOORCLIP; +SLIDESONWALLS; diff --git a/zscript/Monsters/ZombieMen/ZombieScientistChainsaw.zc b/zscript/Monsters/ZombieMen/ZombieScientistChainsaw.zc index 4d710fc6cb..c8ed0c4247 100644 --- a/zscript/Monsters/ZombieMen/ZombieScientistChainsaw.zc +++ b/zscript/Monsters/ZombieMen/ZombieScientistChainsaw.zc @@ -7,8 +7,8 @@ Class PB_ZombieScientistChainsaw : PB_ZombieScientist //$Sprite 5CZAB1 Health 125; MaxTargetRange 200; - DropItem "Gas", 96; - DropItem "Stimpack2", 22; + DropItem "PB_Fuel", 96; + DropItem "PB_Stimpack", 22; } States { diff --git a/zscript/PowerupsBase.zsc b/zscript/PowerupsBase.zsc index 1a328f52a2..4e55e83810 100644 --- a/zscript/PowerupsBase.zsc +++ b/zscript/PowerupsBase.zsc @@ -51,7 +51,8 @@ class PB_Invul : PB_Inventory replaces invulnerabilitysphere { Inventory.PickupMessage "Invulnerability Sphere!"; Inventory.PickupSound "INVUL"; - //+FLOATBOB + +FLOATBOB + floatbobstrength .4; Scale .22; } @@ -163,7 +164,8 @@ class PB_BlurSphere : PB_Inventory replaces blursphere RenderStyle "Translucent"; Inventory.PickupMessage "Partial Invisibility!"; Inventory.PickupSound "INVISIBL"; - // +FLOATBOB + +FLOATBOB + floatbobstrength .4; Scale .22; } @@ -256,7 +258,8 @@ class PB_Soulsphere : PB_Inventory replaces soulsphere { Inventory.PickupMessage "Soulsphere!"; Inventory.PickupSound "SSPH"; - //+FLOATBOB + +FLOATBOB + floatbobstrength .4; Scale .22; } @@ -270,7 +273,7 @@ class PB_Soulsphere : PB_Inventory replaces soulsphere States { Spawn: - SOUL ABCDEFGHIJ 4; + SOUL ABCDEFGHIJ 3; loop; } } @@ -281,7 +284,8 @@ class PB_Megasphere : PB_Inventory replaces megasphere { Inventory.PickupMessage "Megasphere!"; Inventory.PickupSound "MEGASPH"; - //+FLOATBOB + +FLOATBOB + floatbobstrength .4; Scale .22; } @@ -357,6 +361,7 @@ class PB_Doomsphere : PB_Inventory Inventory.PickupSound "DDMGPU"; -COUNTITEM +FLOATBOB + floatbobstrength .4; } override bool Use(bool pickup) @@ -412,6 +417,7 @@ class PB_Haste : PB_Inventory Inventory.PickupSound "DEM"; -COUNTITEM +FLOATBOB + floatbobstrength .4; } override bool Use(bool pickup)