Skip to content

Commit

Permalink
Removed meatshield related code and old bmaps
Browse files Browse the repository at this point in the history 
Removed the residual Smart Scav code , removed Brightmaps - Excavator , Pulse Cannon , removed the meat shield code, removed the BFG 11k Beam code.
  • Loading branch information
Demon Slayer authored and Demon Slayer committed Dec 20, 2022
1 parent 1b75bc2 commit 85352bc
Show file tree
Hide file tree
Showing 63 changed files with 242 additions and 3,860 deletions.
5 changes: 0 additions & 5 deletions BMAP/Excavator.txt
View file

This file was deleted.

22 changes: 0 additions & 22 deletions BMAP/Health.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,4 @@ brightmap sprite PSTRA0{map "brightmaps/items/m3dia.png"disablefullbright}
brightmap sprite MSTRA0{map "brightmaps/items/medpa.png"disablefullbright}


//Stimpack
brightmap sprite ST1MA0 { map "brightmaps/items/SmartScav/ST1MA0.png" }

//Medikit

brightmap sprite MEDIA0 { map "brightmaps/items/SmartScav/MEDIA0.png" }

//Medipack

brightmap sprite MEDPA0 { map "brightmaps/items/SmartScav/MEDPA0.png" }


//Stimpack
brightmap sprite ST1WA0 { map "brightmaps/items/SmartScav/ST1MA0.png" }

//Medikit

brightmap sprite MEDWA0 { map "brightmaps/items/SmartScav/MEDIA0.png" }


//Medipack

brightmap sprite MDPWA0 { map "brightmaps/items/SmartScav/MEDPA0.png" }
5 changes: 0 additions & 5 deletions BMAP/PulseCannon.txt
View file

This file was deleted.

6 changes: 0 additions & 6 deletions BMAP/Weapons.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ brightmap sprite RKTLZ0 { map "Brightmaps/WEAPONS/RKTLZ.png" }
//M1 Plasma Rifle
brightmap sprite PLASA0 { map "Brightmaps/WEAPONS/PLASA.png" }

//Pulse Cannon Upgrade
brightmap sprite PLCUA0 { map "Brightmaps/WEAPONS/PulseCannon/PLCUA.png" }

//M2 Plasma Rifle
brightmap sprite M2PRA0 { map "Brightmaps/WEAPONS/M2PRA.png" }

Expand All @@ -61,9 +58,6 @@ brightmap sprite SRCGA0 { map "Brightmaps/WEAPONS/SRCGA.png" }
//BFG-9000
brightmap sprite RDABX0 { map "Brightmaps/WEAPONS/RDABX.png" }

//BFG Beam
brightmap sprite 8BGPA0 { map "Brightmaps/WEAPONS/8BGPA.png" }

//Black Hole Generator
brightmap sprite PRDCZ0 { map "Brightmaps/WEAPONS/PRDCZ.png" }

Expand Down
15 changes: 3 additions & 12 deletions DECORATE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,6 @@ Actor IsTacticalClass : Inventory {} //Fake item to fix the lag.
#include "actors/Weapons/WeaponTokens.dec"

//MeatShields
#include "actors/Weapons/Meatshields/IMPSHIELD.dec"
#include "actors/Weapons/MeatShields/ZMANSHIELD.dec"
#include "actors/Weapons/MeatShields/SGUYSHIELD.dec"
#include "actors/Weapons/MeatShields/DARKIMPSHIELD.dec"
#include "actors/Weapons/MeatShields/ASGGUYSHIELD.dec"
#include "actors/Weapons/MeatShields/CarbineZombieSHIELD.dec"
#include "actors/Weapons/MeatShields/CommandoSHIELD.dec"
#include "actors/Weapons/MeatShields/PlasmaZombieSHIELD.dec"
#include "actors/Weapons/MeatShields/LabGuySHIELD.dec"
#include "actors/Weapons/MeatShields/SavageImpSHIELD.dec"
#include "actors/Weapons/MeatShields/TriclopsImpSHIELD.dec"
#include "actors/Weapons/MeatShields/PB_NailgunGuyShield.dec"
#include "actors/Weapons/MeatShields/BarrelThrower.dec"

//Ammo Ammo Ammo //Smart Scavenger
Expand Down Expand Up @@ -96,6 +84,9 @@ Actor IsTacticalClass : Inventory {} //Fake item to fix the lag.
#include "actors/Decorations/DEAD.dec"
#include "Actors/Decorations/Barrels/BarrelEffects.dec"


//ThrownEnemies
#include "actors/Monsters/ThrownEnemies.dec"
//Enemies
#include "actors/Monsters/T1-Grunts/ZOMBIEMEN.dec"
#include "actors/Monsters/T1-Grunts/SERGEANTS.dec"
Expand Down
8 changes: 2 additions & 6 deletions MENUDEF.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,19 +244,15 @@ OptionMenu "WeaponSpawns"
Option "No Carbine", "pb_NoCarbineWeapon", "YesOrNo"
StaticText " "
Option "No Nailgun", "pb_NoNailgunWeapon", "YesOrNo"
StaticText " "
Option "No Excavator Launcher", "pb_NoHeavyGLWeapon", "YesOrNo"
StaticText " "
StaticText " "
Option "No Super Grenade Launcher", "pb_NoSuperGLWeapon", "YesOrNo"
StaticText " "
Option "No M2 Plasma Rifle", "pb_NoM2PlasmaWeapon", "YesOrNo"
StaticText " "
Option "No Freezer Rifle", "pb_NoFreezerWeapon", "YesOrNo"
StaticText " "
Option "No Rail Gun", "pb_NoRailgunWeapon", "YesOrNo"
StaticText " "
Option "No BFG 11K Beam", "pb_NoBFGBeamWeapon", "YesOrNo"
StaticText " "
StaticText " "
Option "No Blackhole Generator", "pb_NoBlackholeWeapon", "YesOrNo"
StaticText " "
}
Expand Down
30 changes: 3 additions & 27 deletions SBARINFO.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,20 +775,9 @@ statusbar fullscreen, fullscreenoffsets // Modified ZDoom HUD for Project Brutal
}
}

//special shit for meatshields
Weaponammo "MeatshieldGunAmmo"
{
//drawimage "XDT5B0", -14, -39, centerbottom;
//drawnumber 2147483647, HUDFONT_DOOM, untranslated, ammo MeatAmmo, drawshadow, -25, -56;
drawstring SMALLFONT, Red, "MEAT SHIELD", -163, -20, 0,alignment(left)|drawshadow(1,1);
inventorybarnotvisible
{
drawselectedinventory centerbottom, drawshadow, alwaysshowcounter, SMALLFONT, -43, -80, -38, -83, untranslated;
}
}

//normal shit
IsSelected not "PB_Freezer"
Weaponammo not "MeatshieldGunAmmo"
IsSelected not "PB_Freezer"
{
inventorybarnotvisible
{
Expand Down Expand Up @@ -927,22 +916,9 @@ statusbar normal // Modified Doom Status bar
drawnumber 3, HUDFONT_DOOM, untranslated, ammo2, 44, 171;
}
}
//special shit for meatshields
Weaponammo "MeatshieldGunAmmo"
{
InInventory "MeatShieldPistolEquipped", 1
{
drawnumber 3, HUDFONT_DOOM, untranslated, ammo2, 44, 171;
}
else
{
drawnumber 3, HUDFONT_DOOM, untranslated, ammo1, 44, 171;
}
}

//normal weapons
IsSelected not "PB_Freezer", "PB_Unmaker"
Weaponammo not "MeatshieldGunAmmo"
IsSelected not "PB_Freezer", "PB_Unmaker"
{
usessecondaryammo
{
Expand Down
2 changes: 1 addition & 1 deletion actors/Monsters/T1-Grunts/NAZIS.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1472,7 +1472,7 @@ TNT1 AAAAAAAAAAA 0 A_CustomMissile ("BrainBlood", 37, 0, random (0, 360), 2, ran
Death.Fatality:
Death.SuperPunch:
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasZmanShield", 1)

Stop

Death.Shotgun:
Expand Down
31 changes: 8 additions & 23 deletions actors/Monsters/T1-Imps/ImpVariant2.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1072,8 +1072,7 @@ ACTOR ImpVar2DyingOfBloodLoss: DNImpVariant2
Use:
TNT1 A 1 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)

Stop

Spawn:
Expand Down Expand Up @@ -1127,9 +1126,7 @@ ACTOR DyingImpVar2 : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T3DE D 8
Stop

Expand Down Expand Up @@ -1340,9 +1337,7 @@ ACTOR BrutalizedImpVar2 : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T3DE D 8
Stop

Expand Down Expand Up @@ -1438,9 +1433,7 @@ ACTOR BrutalizedImpVar22
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T3DD B 8
Stop

Expand Down Expand Up @@ -1613,9 +1606,7 @@ ACTOR DyingImpVar2NoArm : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T3D9 B 8
Stop

Expand Down Expand Up @@ -1749,9 +1740,7 @@ ACTOR DyingImpVar2NoLeg : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T3DA D 8
Stop

Expand Down Expand Up @@ -1850,9 +1839,7 @@ ACTOR DyingImpVar2NoArm2 : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T3DA D 8
Stop

Expand Down Expand Up @@ -2230,9 +2217,7 @@ ACTOR DyingImpVar22 : SwitchableDecoration
Death.Fatality:
Death.SuperPunch:
Death.ExtremePunches:
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
Stop
}
}
Expand Down
16 changes: 4 additions & 12 deletions actors/Monsters/T1-Imps/ImpVariants.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,9 +898,7 @@ ACTOR DyingImpVar31 : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T4DE E 8
Stop

Expand Down Expand Up @@ -1091,9 +1089,7 @@ ACTOR DyingImpVar32 : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T4DE D 8
Stop

Expand Down Expand Up @@ -1367,9 +1363,7 @@ ACTOR DyingImpVar3NoLeg : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T4DA D 8
Stop

Expand Down Expand Up @@ -1457,9 +1451,7 @@ ACTOR DyingImpVar3NoArm : SwitchableDecoration
Pain.Fatality:
Active:
TNT1 A 0 A_FaceTarget
TNT1 A 0 A_NoBlocking
TNT1 A 0 A_GiveToTarget("HasImpShield", 1)
TNT1 A 0 A_GiveToTarget("GotMeatShield", 1)
TNT1 A 0 A_NoBlocking
T4DA D 8
Stop

Expand Down
6 changes: 3 additions & 3 deletions actors/Monsters/T3-Revies/REVENANT.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ FatalityZombieman:
SKF1 I 1 A_Chase("","")
SKF1 I 10 A_FaceTarget
TNT1 A 0 A_TakeInventory("ZombieManFatality",1)
TNT1 A 0 A_CustomMissile("ThrowedZombieMan2", 64, 0, 0, 0)

SKEL HI 4
Goto See

Expand Down Expand Up @@ -618,7 +618,7 @@ FatalitySergeant:
SKF2 I 1 A_Chase("","")
SKF2 I 10 A_FaceTarget
TNT1 A 0 A_TakeInventory("SergeantFatality",1)
TNT1 A 0 A_CustomMissile("ThrowedSergeant2", 64, 0, 0, 0)

SKEL HI 4
Goto See

Expand Down Expand Up @@ -659,7 +659,7 @@ FatalityImp:
SKF3 I 1 A_Chase("","")
SKF3 I 10 A_FaceTarget
TNT1 A 0 A_TakeInventory("ImpFatality",1)
TNT1 A 0 A_CustomMissile("ThrowedImp2", 64, 0, 0, 0)

SKEL HI 4
Goto See

Expand Down
4 changes: 2 additions & 2 deletions actors/Monsters/T4-Nobles/BARON.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ Goto See2
TNT1 A 0 A_SpawnItem("HeadshotTarget8b", 24, 66,0)
BOSS E 8 A_FaceTarget
TNT1 A 0 A_SpawnItem("HeadshotTarget8b", 24, 66,0)
BOSS F 8 A_CustomMissile("ThrowedZombieMan2", 64, 0, 0, 0)

TNT1 A 0 A_SpawnItem("HeadshotTarget8b", 24, 66,0)
BOSS G 8
Goto See2
Expand All @@ -1066,7 +1066,7 @@ Goto See2
TNT1 A 0 A_SpawnItem("HeadshotTarget8b", 24, 66,0)
BOSS E 8 A_FaceTarget
TNT1 A 0 A_SpawnItem("HeadshotTarget8b", 24, 66,0)
BOSS F 8 A_CustomMissile("ThrowedSergeantPiece", 64, 0, 0, 0)

TNT1 A 0 A_SpawnItem("HeadshotTarget8b", 24, 66,0)
BOSS G 8
Goto See2
Expand Down
Loading

0 comments on commit 85352bc

Please sign in to comment.