Added full editor integration for Project Brutality.

This PR adds editor numbers and keys for every actor in the mod that would be relevant to use in the editor.
pa1nki113r · May 4, 2022 · 2793f98 · 2793f98
1 parent 5ce1eb3
commit 2793f98
Show file tree

Hide file tree

Showing 220 changed files with 1,042 additions and 341 deletions.
diff --git a/CVARINFO b/CVARINFO
@@ -534,11 +534,11 @@ server	int		pb_spawner_drum		= 0;
 Server	Bool	V5_MODELS			= false;
 Server	Bool	V5_Cull				= false;
 Server	Int		V5_MDist			= 900;
-Server	Bool	V5_Quake3			=false;
-server 	float	V5_Q3Spin			=5.0;
-server 	float	V5_Q3Zoff			=16.0;
-server 	float	V5_Q3Bob			=0.5;
-server	noarchive	bool	V5_Mlock	=False;
+Server	Bool	V5_Quake3			= false;
+server 	float	V5_Q3Spin			= 5.0;
+server 	float	V5_Q3Zoff			= 16.0;
+server 	float	V5_Q3Bob			= 0.5;
+server	noarchive	bool	V5_Mlock	= False;
 
 ////////////////////////////////
 

diff --git a/GLDEFS b/GLDEFS
@@ -1,3 +1,4 @@
+/*
 #include "BMAP/Shields.txt"
 #include "BMAP/Ammo.txt"
 #include "BMAP/Armor.txt"
@@ -23,7 +24,7 @@
 #include "BMAP/Excavator.txt"
 #include "BMAP/Throwables.txt"
 #include "BMAP/VoidSpectre.txt"
-
+*/
 #include "models/nashgore/CorpseBlood/_materials.txt"
 #include "models/nashgore/Footprint/_materials.txt"
 #include "GLDEFS.Overlord" //For the Overlord projectiles, to prevent this file from being flooded
@@ -182,7 +183,7 @@ pulselight TracerLight
 
 pointlight DemonTechImpact
 {
-    color 6.0 0.3 0.0
+    color 1.0 0.3 0.0
     size 64
 }
 
@@ -250,7 +251,7 @@ object LargeDemonpower
 
 pointlight FireshotFX
 {
-    color 1.0 6.0 0.0
+    color 1.0 1.0 0.0
     size 64
 }
 
@@ -824,13 +825,13 @@ object CacodemonBall_
     frame BAL2D { light CACOBALL_X2 }
 	frame BAL2E { light CACOBALL_X2 }
 }
-
+/*
 object PurplePlasmaBall
 {
     frame PBALD { light CACOBALL }
     frame PBALE { light CACOBALL }
 }
-
+*/
 // Baron / Hell Knight fireball
 pointlight BARONBALL
 {
@@ -2010,7 +2011,7 @@ Size 86
 PointLight BruiserFire_18
 {
 Offset 0 0 0
-Color 1.38 0.13 0.0
+Color 1.0 0.13 0.0
 Size 87
 }
 

diff --git a/MODELS/Definitions/LegacyBlood.txt b/MODELS/Definitions/LegacyBlood.txt
@@ -1,3 +1,4 @@
+/*
 Model RedBloodFootPrintLeft      // Name of actor in DECORATE
 {
    Path "models/bloodspot"    // Path to model in PK3
@@ -49,7 +50,7 @@ Model BigBloodSpot      // Name of actor in DECORATE
    FrameIndex BBSP D 0 0         // The sprite lump, sprite frame, model index, frame number
    FrameIndex BBSP E 0 0         // The sprite lump, sprite frame, model index, frame number
 }
-
+*/
 Model PB_BloodSpot      // Name of actor in DECORATE
 {
    Path "models/bloodspot"    // Path to model in PK3
@@ -69,7 +70,7 @@ Model PB_BloodSpot      // Name of actor in DECORATE
    Skin 0 "bloodspothd.png" 
    FrameIndex BPDL D 0 0 
 }
-
+/*
 Model Brutal_BloodSpot      // Name of actor in DECORATE
 {
    Path "models/bloodspot"    // Path to model in PK3
@@ -126,7 +127,6 @@ Model Brutal_FlyingBlood      // Name of actor in DECORATE
    FrameIndex BPDL A 0 0         // The sprite lump, sprite frame, model index, frame number
 }
 
-
 Model CeilBloodSpot      // Name of actor in DECORATE
 {
    Path "models/bloodspot"    // Path to model in PK3
@@ -217,7 +217,6 @@ Model MediumBloodSpot      // Name of actor in DECORATE
    FrameIndex BBSP F 0 0         // The sprite lump, sprite frame, model index, frame number
 }
 
-
 Model Instestin     // Name of actor in DECORATE
 {
    Path "models/bloodspot"    // Path to model in PK3
@@ -318,4 +317,4 @@ Model SplatteredLarge     // Name of actor in DECORATE
    Scale 140.0 140.0 140.0            // Scale values
    ZOffset 0.6
    FrameIndex BPDL A 0 0         // The sprite lump, sprite frame, model index, frame number
-}
+}*/
diff --git a/SNDINFO b/SNDINFO
@@ -1,3 +1,5 @@
+NOTHING "SOUNDS/Misc/Nothing.wav"
+
 ////////////////////////////////////////////////////////PROJECT BRUTALITY SOUNDS
 menu/activate		"sounds/Menu/Select.ogg"	// Activate a new menu
 menu/backup			"sounds/Menu/Back.ogg"	// Backup to previous menu
@@ -527,7 +529,6 @@ WINBREA WINBREA
 //Barrel
 weapons/barrelpain		barrelz
 BIGEXPL2 BIGEXPL2
-$random barrelb/pain { bp1 bp2 bp3 bp4 bp5 }
 $random barrel/pain { p1 p2 p3 p4 }
 p1		barrel1
 p2		barrel2
@@ -692,20 +693,13 @@ $limit BDfireplace2 2
 $rolloff BDfireplace2 100 900
 $volume BDFirePlace2 .20
 props/redfire dsrdtrch
-$random props/torchfire {props/greenfire props/redfire props/bluefire}
+$random props/torchfire {props/redfire}
 $volume props/torchfire .20
-$rolloff props/greenfire 100 900
 $rolloff props/redfire 100 800
-$rolloff props/bluefire 100 900
 $rolloff props/torchfire 100 900
-$limit props/greenfire 2
 $limit props/redfire 2
-$limit props/bluefire 2
 $limit props/torchfire 4
-$volume props/greenfire 0.2
 $volume props/redfire 0.2
-$volume props/bluefire 0.2
-$volume props/barrelfire 0.2
 $limit world/sludgegloop 2
 $limit world/drip 2
 $limit world/hotsiz 2

diff --git a/SNDINFO.PBDoomguy and Marines b/SNDINFO.PBDoomguy and Marines
@@ -33,7 +33,6 @@ MRNWC6 MRNWC6
 $rolloff  MRNAT 50 1000
 $rolloff  MRNWT 50 1000
 $rolloff  MRNWC 50 1000
-$rolloff  MRNAG 50 1000
 
 FLEAS FLEAS
 $random DSMADTH { DSMADTH1 DSMADTH2 DSMADTH3 DSMADTH4 DSMADTH5 DSMADTH6 DSMADTH7 DSMADTH8 }
@@ -122,9 +121,9 @@ HLMTBEP HLMTBEP
 HLMTBPP HLMTBPP
 RSUP1 RSUP1
 RSUP2 RSUP2
-$random helmet/swipe	{ HELMSWI1 HEMLSWI2 HELMSWI3 }
+$random helmet/swipe	{ HELMSWI1 /*HEMLSWI2*/ HELMSWI3 }
 HELMSWI1 HELMSWI1
-HELMSWI2 HELMSWI2
+//HELMSWI2 HELMSWI2 Doesn't actually exist.
 HELMSWI3 HELMSWI3
 // Player Pain Sounds
 // 100 Pain

diff --git a/SNDINFO.PBGore and Nashgore b/SNDINFO.PBGore and Nashgore
@@ -11,7 +11,7 @@ misc/xdeath1e		dsxdth1e
 misc/xdeath1f		dsxdth1f
 misc/xdeath1g		dsxdth1g
 misc/xdeath1h		dsxdth1h
-$random misc/xdeath1	{ misc/xdeath1a misc/xdeath1b misc/xdeath1c misc/xdeath1d misc/xdeath1e misc/xdeath1f misc/xdeath1g misc/xdeath1h misc/xdeath1i misc/xdeath1j misc/xdeath1k misc/xdeath1l misc/xdeath1m misc/xdeath1n misc/xdeath1o }
+$random misc/xdeath1	{ misc/xdeath1a misc/xdeath1b misc/xdeath1c misc/xdeath1d misc/xdeath1e misc/xdeath1f misc/xdeath1g misc/xdeath1h}
 misc/xdeath2a		dsxdth2a
 misc/xdeath2b		dsxdth2b
 misc/xdeath2c	  	dsxdth2c
@@ -95,7 +95,7 @@ $random nashgore/gibsmall
 	nashgore/gibsmall01
 	nashgore/gibsmall02
 }
-$volume nashgore/gibsmall 0.44;
+$volume nashgore/gibsmall 0.44
 nashgore/giblarge01 "sounds/gore/nashgore/gib large 01.ogg"
 nashgore/giblarge02 "sounds/gore/nashgore/gib large 02.ogg"
 nashgore/giblarge03 "sounds/gore/nashgore/gib large 03.ogg"

diff --git a/SNDINFO.PBWeapons b/SNDINFO.PBWeapons
@@ -206,7 +206,6 @@ weapons/shell3			dsshell3
 weapons/shell4			dsshell4
 weapons/shell5			dsshell5
 $random weapons/shell		{weapons/shell1 weapons/shell2 weapons/shell3 weapons/shell4 weapons/shell5} 
-$volume weapons/RL 2.5
 $rolloff  weapons/casing 100 600
 SHELPKUP SHELPKUP
 weapons/shotgunmag/magout SH_MAGOU
@@ -242,6 +241,7 @@ $volume FireSuperShotgun  1.3
 $volume weapons/casing2 0.9
 
 //QUAD SHOTGUN
+QSGCHRG QSGCHRG
 QSGFIRE1 QSGFIRE1
 $rolloff QSGFIRE1 100 2200
 QSGIN QSGIN

diff --git a/SNDINFO.txt b/SNDINFO.txt
diff --git a/SOUNDS/Misc/Nothing.wav b/SOUNDS/Misc/Nothing.wav
diff --git a/SPRITES/Editor Graphics/Ammo Spawners/UDBGY0.png b/SPRITES/Editor Graphics/Ammo Spawners/UDBGY0.png
diff --git a/SPRITES/Editor Graphics/Ammo Spawners/UDBGZ0.png b/SPRITES/Editor Graphics/Ammo Spawners/UDBGZ0.png
diff --git a/SPRITES/Editor Graphics/Ammo Spawners/UDBG[0.png b/SPRITES/Editor Graphics/Ammo Spawners/UDBG[0.png
diff --git a/SPRITES/Editor Graphics/Ammo Spawners/UDBG]0.png b/SPRITES/Editor Graphics/Ammo Spawners/UDBG]0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGA0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGA0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGB0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGB0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGC0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGC0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGD0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGD0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGE0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGE0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGF0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGF0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGG0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGG0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGH0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGH0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGI0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGI0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGJ0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGJ0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGK0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGK0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGL0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGL0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGM0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGM0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGN0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGN0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGO0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGO0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGP0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGP0.png
diff --git a/SPRITES/Editor Graphics/Monster Spawners/UDBGQ0.png b/SPRITES/Editor Graphics/Monster Spawners/UDBGQ0.png
diff --git a/SPRITES/Editor Graphics/Other Item Spawners/UDBG+0.png b/SPRITES/Editor Graphics/Other Item Spawners/UDBG+0.png
diff --git a/SPRITES/Editor Graphics/Other Item Spawners/UDBG=0.png b/SPRITES/Editor Graphics/Other Item Spawners/UDBG=0.png
diff --git a/SPRITES/Editor Graphics/Other Item Spawners/[email protected] b/SPRITES/Editor Graphics/Other Item Spawners/[email protected]
diff --git a/SPRITES/Editor Graphics/Other Item Spawners/UDBG^0.png b/SPRITES/Editor Graphics/Other Item Spawners/UDBG^0.png
diff --git a/SPRITES/Editor Graphics/Other Item Spawners/UDBG_0.png b/SPRITES/Editor Graphics/Other Item Spawners/UDBG_0.png
diff --git a/SPRITES/Editor Graphics/Other/UDBGR0.png b/SPRITES/Editor Graphics/Other/UDBGR0.png
diff --git a/SPRITES/Editor Graphics/Weapon Spawners/UDBGS0.png b/SPRITES/Editor Graphics/Weapon Spawners/UDBGS0.png
diff --git a/SPRITES/Editor Graphics/Weapon Spawners/UDBGT0.png b/SPRITES/Editor Graphics/Weapon Spawners/UDBGT0.png
diff --git a/SPRITES/Editor Graphics/Weapon Spawners/UDBGU0.png b/SPRITES/Editor Graphics/Weapon Spawners/UDBGU0.png
diff --git a/SPRITES/Editor Graphics/Weapon Spawners/UDBGV0.png b/SPRITES/Editor Graphics/Weapon Spawners/UDBGV0.png
diff --git a/SPRITES/Editor Graphics/Weapon Spawners/UDBGW0.png b/SPRITES/Editor Graphics/Weapon Spawners/UDBGW0.png
diff --git a/SPRITES/Editor Graphics/Weapon Spawners/UDBGX0.png b/SPRITES/Editor Graphics/Weapon Spawners/UDBGX0.png
diff --git a/SPRITES/MONSTERS/Masterminds/MASTERMIND/SPIDG2G8.png b/SPRITES/MONSTERS/Masterminds/MASTERMIND/SPIDG2G8.png
diff --git a/...ONSTERS/Zombie Man/ZOMBIEMAN/PSSSA2A8.png → .../MONSTERS/Zombie Man/ZOMBIEMAN/PSSSA2.png b/...ONSTERS/Zombie Man/ZOMBIEMAN/PSSSA2A8.png → .../MONSTERS/Zombie Man/ZOMBIEMAN/PSSSA2.png
diff --git a/...ONSTERS/Zombie Man/ZOMBIEMAN/PSSSA3A7.png → .../MONSTERS/Zombie Man/ZOMBIEMAN/PSSSA3.png b/...ONSTERS/Zombie Man/ZOMBIEMAN/PSSSA3A7.png → .../MONSTERS/Zombie Man/ZOMBIEMAN/PSSSA3.png
diff --git a/SPRITES/NULLA0.png b/SPRITES/NULLA0.png
diff --git a/actors/Decorations/Barrels/BarrelEffects.dec b/actors/Decorations/Barrels/BarrelEffects.dec
@@ -12,6 +12,9 @@ Actor BarrelExpMeas2 : Inventory{inventory.maxamount 950}
 
 Actor BarrelSpawner Replaces ExplosiveBarrel
 {
+	//$Title Random Barrel Spawner
+	//$Sprite UDBG+0
+	Scale 0.5 //So the editor sprite isn't massive.
 	+LOOKALLAROUND
 	States
 	{
@@ -42,6 +45,9 @@ Actor BarrelSpawner Replaces ExplosiveBarrel
 
 Actor FlameBarrelSpawner Replaces BurningBarrel
 {
+	//$Title Random Barrel Spawner
+	//$Sprite UDBG+0
+	Scale 0.5 //So the editor sprite isn't massive.
 	+LOOKALLAROUND
 	States
 	{

diff --git a/actors/Decorations/Barrels/BarrelEmpty.dec b/actors/Decorations/Barrels/BarrelEmpty.dec
@@ -1,5 +1,7 @@
 ACTOR BarrelEmpty : SwitchableDecoration
 {
+	//$Title Empty Barrel
+	//$Category Obstacles
 	Game Doom
     damagefactor "Trample", 0.0
 	damagefactor "Ice", 0.0

diff --git a/actors/Decorations/Barrels/BarrelFrozen.dec b/actors/Decorations/Barrels/BarrelFrozen.dec
@@ -1,5 +1,7 @@
 ACTOR BarrelFrozen : SwitchableDecoration
 {
+	//$Title Frozen Barrel
+	//$Category Obstacles
 	Game Doom
     damagefactor "Trample", 0.0
 	damagefactor "Ice", 0.0

diff --git a/actors/Decorations/Barrels/FlameBarrel.dec b/actors/Decorations/Barrels/FlameBarrel.dec
@@ -1,5 +1,8 @@
 Actor FlameBarrel : SwitchableDecoration
 {
+	//$Title Flaming Barrel
+	//$Category Obstacles
+	//$Sprite FBARA0
 -COUNTKILL
 +NOBLOOD
 +FRIENDLY

diff --git a/actors/Decorations/Barrels/NukageBarrel.dec b/actors/Decorations/Barrels/NukageBarrel.dec
@@ -1,5 +1,8 @@
 ACTOR NukageBarrel : SwitchableDecoration 
 {
+	//$Title Nukage Barrel
+	//$Category Obstacles
+	//$Sprite BAR1A0
 	Game Doom
     damagefactor "Trample", 0.0
     damagefactor "Kick", 0.2

diff --git a/actors/Effects/TELEPORTS.dec b/actors/Effects/TELEPORTS.dec
@@ -32,6 +32,7 @@ DamageFactor "CancelTeleportFog", 9999.0
 
 ACTOR BrutalTeleportDest: TeleportDest Replaces TeleportDest
 {
+	//$Sprite TFOGI0
 	+NOBLOCKMAP
 	+NOSECTOR
 	+DONTSPLASH
@@ -86,11 +87,13 @@ ACTOR TeleportRemovalThing
 
 ACTOR BrutalTeleportDest2 : BrutalTeleportDest Replaces TeleportDest2
 {
+	//$Sprite UDBGR0
 	+NOGRAVITY
 }
 
 ACTOR BrutalTeleportDest3 : BrutalTeleportDest Replaces TeleportDest3
 {
+	//$Sprite UDBGR0
 	-NOGRAVITY
 }
 

diff --git a/actors/Friendly Marines/CapturedMarine.dec b/actors/Friendly Marines/CapturedMarine.dec
@@ -6,6 +6,9 @@ Inventory.pickupsound "INVISIBL"
 
 ACTOR CapturedMarine: SwitchableDecoration Replaces Blursphere
 {
+	//$Title Captured Marine
+	//$Sprite CAPTA1
+	//$Angled
     Radius 24
     Height 48
     Speed 0
@@ -470,7 +473,7 @@ Stop
  }
 }
 
-ACTOR MarineSurvivor2: Marine 8756
+ACTOR MarineSurvivor2: Marine
 {
 Speed 5
 Health 6

diff --git a/actors/Friendly Marines/MARINESPAWNER.dec b/actors/Friendly Marines/MARINESPAWNER.dec
@@ -5,6 +5,8 @@ inventory.maxamount 1
 
 ACTOR PrePlacedMarine Replaces MarinePistol
 {
+	//$Title Marine
+	//$Sprite PLAYE1
     States
 	{
 	Spawn:
@@ -140,11 +142,13 @@ ACTOR RandomPBMarine: RandomMarine
 
 ACTOR Marine_Fist: PrePlacedMarine Replaces MarineFist
 {
+//$Title Unarmed Marine (Dummy)
 Health 200
 }
 
 ACTOR Marine_SSG: PrePlacedMarine Replaces MarineSSG
 {
+//$Title SSG Marine (Dummy)
 Health 200
 }
 

diff --git a/actors/Friendly Marines/Marine-AutoShotgun.dec b/actors/Friendly Marines/Marine-AutoShotgun.dec
@@ -1,5 +1,8 @@
 ACTOR PrePlacedMarineAutoShotgun //Replaces MarineAutoShotgun
 {
+	//$Title Autoshotgun Marine
+	//$Category Marines
+	//$Sprite PASGE1
     States
 	{
 	Spawn:

diff --git a/actors/Friendly Marines/Marine-Chaingun.dec b/actors/Friendly Marines/Marine-Chaingun.dec
@@ -1,5 +1,7 @@
 ACTOR PrePlacedMarineMinigun Replaces MarineChaingun
 {
+	//$Title Minigun Marine
+	//$Sprite PL42E1
     States
 	{
 	Spawn:

diff --git a/actors/Friendly Marines/Marine-Plasmagun.dec b/actors/Friendly Marines/Marine-Plasmagun.dec
@@ -1,5 +1,7 @@
 ACTOR PrePlacedMarinePlasmaGun Replaces MarinePlasma
 {
+	//$Title Plasma Gun Marine
+	//$Sprite PLA6E1
     States
 	{
 	Spawn:

diff --git a/actors/Friendly Marines/Marine-PulseCannon.dec b/actors/Friendly Marines/Marine-PulseCannon.dec
@@ -1,5 +1,8 @@
 ACTOR PrePlacedMarinePulseCannon //Replaces MarinePlasma
 {
+	//$Title Pulse Cannon Marine
+	//$Category Marines
+	//$Sprite PSTNE1
     States
 	{
 	Spawn:

diff --git a/actors/Friendly Marines/Marine-Shotgun.dec b/actors/Friendly Marines/Marine-Shotgun.dec
@@ -1,5 +1,7 @@
 ACTOR PrePlacedMarineShotgun Replaces MarineShotgun
 {
+	//$Title Shotgun Marine
+	//$Sprite PLA3E1
     States
 	{
 	Spawn:

diff --git a/actors/Items/Ammo/Bulletkit.dec b/actors/Items/Ammo/Bulletkit.dec
@@ -1,5 +1,8 @@
 ACTOR BulletKit : CustomInventory
 {
+	//$Title Low Caliber Ammo Kit
+	//$Category Ammunition
+	//$Sprite AMOKA0
 	Game Doom
 	Scale 1.0
 	-COUNTITEM
@@ -83,6 +86,8 @@ ACTOR SmartBulletKit : SwitchableDecoration
 
 ACTOR BulletCartridge : PistolBullets
 {
+	//$Title Low Caliber Cartridge
+	//$Category Ammunition
 	Game Doom
 	Inventory.Amount 15
 	scale 0.13