diff --git a/BMAP/DMR.txt b/BMAP/DMR.txt index 6c2603010d..01b0da5d77 100644 --- a/BMAP/DMR.txt +++ b/BMAP/DMR.txt @@ -1,4 +1,6 @@ -brightmap sprite RI2GA0{map "Brightmaps/WEAPONS/DMR/RI2GA.png"} +//OLD ASS DMR BRIGHTMAPS TO BE OVERHAULED LATER! + +/*brightmap sprite RI2GA0{map "Brightmaps/WEAPONS/DMR/RI2GA.png"} brightmap sprite RI2FA0{map "Brightmaps/WEAPONS/DMR/RI2GA.png"} brightmap sprite RI2FB0{map "Brightmaps/WEAPONS/DMR/RI2FB.png"} brightmap sprite RI2FC0{map "Brightmaps/WEAPONS/DMR/RI2FC.png"} @@ -48,4 +50,4 @@ brightmap sprite P2W1D0 { map "Brightmaps/WEAPONS/DMR/P2W1D.png" } brightmap sprite P2W2A0 { map "Brightmaps/WEAPONS/DMR/P2W2A.png" } brightmap sprite P2W2B0 { map "Brightmaps/WEAPONS/DMR/P2W2A.png" } brightmap sprite P2W2C0 { map "Brightmaps/WEAPONS/DMR/P2W2C.png" } -brightmap sprite P2W2D0 { map "Brightmaps/WEAPONS/DMR/P2W2D.png" } \ No newline at end of file +brightmap sprite P2W2D0 { map "Brightmaps/WEAPONS/DMR/P2W2D.png" }*/ \ No newline at end of file diff --git a/GLDEFS b/GLDEFS index ac316cc758..0ff5c2ffd4 100644 --- a/GLDEFS +++ b/GLDEFS @@ -4,7 +4,6 @@ #include "BMAP/Weapons.txt" #include "BMAP/Carbine.txt" #include "BMAP/AutoShotgun.txt" -#include "BMAP/DMR.txt" #include "BMAP/Minigun.txt" #include "BMAP/Nailgun.txt" #include "BMAP/LMG.txt" diff --git a/actors/Gore/GORE!!!.dec b/actors/Gore/GORE!!!.dec index 6f5353b90d..29beef355a 100644 --- a/actors/Gore/GORE!!!.dec +++ b/actors/Gore/GORE!!!.dec @@ -3220,6 +3220,7 @@ actor Gib_VoidSpectreLeg: Gib_MechDemonArm Scale 1.1 BloodType "Green_Blood", "GreenSawBlood", "GreenSawBlood" BloodColor "DarkGreen" + Decal GreenBloodSplat States { Spawn: @@ -3712,16 +3713,16 @@ ACTOR XDeathStomach: PB_XDeath1 ACTOR XDeathStomachGreen: PB_XDeath1 { translation "168:191=112:127","16:47=120:127" + Decal GreenBloodSplat + States { Spawn: - TNT1 A 0 A_SpawnItem("Green_BloodSpot",0,0,0,1) XSTO A 24 A_CustomMissile ("Green_FlyingBloodTrail", 0, 0, random (0, 360), 2, random (0, 360)) Loop Death: TNT1 A 0 TNT1 A 0 A_Stop - TNT1 A 0 A_SpawnItem("Green_BloodSpot",0,0,0,1) XSTO EEEEEEEEE 0 A_CustomMissile ("Green_FlyingBloodTrail", 0, 0, random (0, 180), 2, random (0, 180)) XSTO E -1 Stop @@ -3944,6 +3945,8 @@ ACTOR XDeathVoidSpectreHead BounceCount 5 BloodType "NashGoreBlood_Green", "NashGoreBlood_Green", "NashGoreBlood_Green" BloodColor "DarkGreen" + seesound "bloood" + deathsound "bloood" +DOOMBOUNCE +MISSILE +MOVEWITHSECTOR @@ -8125,6 +8128,7 @@ ACTOR XDeathHellKnightHead: XDeathBullArm1 Scale 1.0 BloodType "Green_Blood", "GreenSawBlood", "GreenSawBlood" BloodColor "DarkGreen" + Decal GreenBloodSplat States { Spawn: @@ -8386,12 +8390,12 @@ ACTOR XDeathBaronHead5: XDeathBullArm1 { BloodType "Green_Blood", "GreenSawBlood", "GreenSawBlood" BloodColor "DarkGreen" + Decal GreenBloodSplat -CLIENTSIDEONLY Scale 1.2 States { Spawn: - TNT1 A 0 A_SpawnItem("Green_BloodSpot",0,0,0,1) TNT1 A 0 A_JumpIf(waterlevel > 1, "Death") TNT1 A 0 A_JumpIf(momz == 0, "Death") XHE5 ABCDEFGH 6 @@ -8410,6 +8414,7 @@ actor BaronHead: LimbBase damagefactor "Kick", 9.0 damagefactor "Melee", 9.0 damagefactor "SuperPunch", 9.0 +Decal GreenBloodSplat -CLIENTSIDEONLY Radius 10 diff --git a/actors/Gore/GORE4.dec b/actors/Gore/GORE4.dec index a7a1716d27..e42a368564 100644 --- a/actors/Gore/GORE4.dec +++ b/actors/Gore/GORE4.dec @@ -779,7 +779,6 @@ ACTOR XDeathInfernusHead States { Spawn: - TNT1 A 0 A_SpawnItem("Green_BloodSpot",0,0,0,1) G0RV ABCDEFGH 4 Loop Death: @@ -851,11 +850,9 @@ ACTOR XDeathInfernusUpperTorso Spawn: BT02 ABC 4 Falling: - TNT1 A 0 A_SpawnItem("Green_BloodSpot",0,0,0,1) BT02 CC 4 Loop Death: - TNT1 A 0 A_SpawnItem("Green_BloodSpot",0,0,0,1) TNT1 AAA 0 A_SpawnItem("Green_Blood", 0, 5) TNT1 A 0 A_SpawnItem("Gib_InfernusUpperTorso",0,0,0,1) Stop diff --git a/brightmaps/WEAPONS/DMR/P2SGA.png b/brightmaps/WEAPONS/DMR/P2SGA.png deleted file mode 100644 index 4f728a6c30..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SGA.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2SGB.png b/brightmaps/WEAPONS/DMR/P2SGB.png deleted file mode 100644 index 0b69cf8adc..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SGB.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2SSA.png b/brightmaps/WEAPONS/DMR/P2SSA.png deleted file mode 100644 index bc94c48c21..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SSA.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2SSB.png b/brightmaps/WEAPONS/DMR/P2SSB.png deleted file mode 100644 index 2b5b94ac8c..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SSB.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2SSC.png b/brightmaps/WEAPONS/DMR/P2SSC.png deleted file mode 100644 index 4a5b8ea4b1..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SSC.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2SSD.png b/brightmaps/WEAPONS/DMR/P2SSD.png deleted file mode 100644 index ddfc3a8c7a..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SSD.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2SSE.png b/brightmaps/WEAPONS/DMR/P2SSE.png deleted file mode 100644 index 8b3ffcfd32..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SSE.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2SSF.png b/brightmaps/WEAPONS/DMR/P2SSF.png deleted file mode 100644 index 8b3ffcfd32..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2SSF.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2W1A.png b/brightmaps/WEAPONS/DMR/P2W1A.png deleted file mode 100644 index 3736a2ef1d..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2W1A.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2W1C.png b/brightmaps/WEAPONS/DMR/P2W1C.png deleted file mode 100644 index 0ec3b96e91..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2W1C.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2W1D.png b/brightmaps/WEAPONS/DMR/P2W1D.png deleted file mode 100644 index fd99f9c739..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2W1D.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2W2A.png b/brightmaps/WEAPONS/DMR/P2W2A.png deleted file mode 100644 index bbe7306e5e..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2W2A.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2W2C.png b/brightmaps/WEAPONS/DMR/P2W2C.png deleted file mode 100644 index 522f035b29..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2W2C.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/P2W2D.png b/brightmaps/WEAPONS/DMR/P2W2D.png deleted file mode 100644 index d3bdb91b12..0000000000 Binary files a/brightmaps/WEAPONS/DMR/P2W2D.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/RI2FB.png b/brightmaps/WEAPONS/DMR/RI2FB.png deleted file mode 100644 index 94c482a982..0000000000 Binary files a/brightmaps/WEAPONS/DMR/RI2FB.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/RI2FC.png b/brightmaps/WEAPONS/DMR/RI2FC.png deleted file mode 100644 index b3861c85a4..0000000000 Binary files a/brightmaps/WEAPONS/DMR/RI2FC.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/RI2GA.png b/brightmaps/WEAPONS/DMR/RI2GA.png deleted file mode 100644 index bb8b9d425e..0000000000 Binary files a/brightmaps/WEAPONS/DMR/RI2GA.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/RI2ZF.png b/brightmaps/WEAPONS/DMR/RI2ZF.png deleted file mode 100644 index 2e3349c813..0000000000 Binary files a/brightmaps/WEAPONS/DMR/RI2ZF.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/RIFGA.png b/brightmaps/WEAPONS/DMR/RIFGA.png deleted file mode 100644 index 161fec2998..0000000000 Binary files a/brightmaps/WEAPONS/DMR/RIFGA.png and /dev/null differ diff --git a/brightmaps/WEAPONS/DMR/RIFRA.png b/brightmaps/WEAPONS/DMR/RIFRA.png deleted file mode 100644 index df4389baaa..0000000000 Binary files a/brightmaps/WEAPONS/DMR/RIFRA.png and /dev/null differ