diff --git a/source/games/duke/src/dispatch.cpp b/source/games/duke/src/dispatch.cpp index 4fd785c65..29d1b5cd8 100644 --- a/source/games/duke/src/dispatch.cpp +++ b/source/games/duke/src/dispatch.cpp @@ -162,7 +162,6 @@ int TILE_APLAYER; int TILE_DRONE; int TILE_WATERBUBBLE; int TILE_BLOODPOOL; -int TILE_MIRRORBROKE; int TILE_CROSSHAIR; END_DUKE_NS diff --git a/source/games/duke/src/flags_d.cpp b/source/games/duke/src/flags_d.cpp index 7b795d2e5..0fa76ee96 100644 --- a/source/games/duke/src/flags_d.cpp +++ b/source/games/duke/src/flags_d.cpp @@ -284,7 +284,6 @@ void initactorflags_d() TILE_DRONE = DTILE_DRONE; TILE_WATERBUBBLE = DTILE_WATERBUBBLE; TILE_BLOODPOOL = DTILE_BLOODPOOL; - TILE_MIRRORBROKE = DTILE_MIRRORBROKE; TILE_CROSSHAIR = DTILE_CROSSHAIR; } diff --git a/source/games/duke/src/flags_r.cpp b/source/games/duke/src/flags_r.cpp index c8902bf94..17970a39f 100644 --- a/source/games/duke/src/flags_r.cpp +++ b/source/games/duke/src/flags_r.cpp @@ -251,7 +251,6 @@ void initactorflags_r() TILE_DRONE = RTILE_DRONE; TILE_WATERBUBBLE = RTILE_WATERBUBBLE; TILE_BLOODPOOL = RTILE_BLOODPOOL; - TILE_MIRRORBROKE = RTILE_MIRRORBROKE; TILE_CROSSHAIR = RTILE_CROSSHAIR; gs.firstdebris = RTILE_SCRAP6; diff --git a/source/games/duke/src/names.h b/source/games/duke/src/names.h index af0604bd8..d4bb05556 100644 --- a/source/games/duke/src/names.h +++ b/source/games/duke/src/names.h @@ -7,7 +7,6 @@ extern int TILE_APLAYER; extern int TILE_DRONE; extern int TILE_WATERBUBBLE; extern int TILE_BLOODPOOL; -extern int TILE_MIRRORBROKE; extern int TILE_CROSSHAIR; diff --git a/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses b/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses index c51496ed3..45867953c 100644 --- a/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses @@ -20,4 +20,5 @@ spawnclasses 5152 = DukeOnFireSmoke 5268 = DukeWhispySmoke 5846 = DukeSeriousSam + 5173 = DukeBurnedCorpse } diff --git a/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses b/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses index 357289030..d04fb7484 100644 --- a/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses @@ -11,8 +11,10 @@ spawnclasses 9 = DukeRespawnController 10 = DukeGPSpeed 4890 = DukeNaturalLightning + 2521 = DukeKneeAttack 2613 = DukeShotgunShot 2536 = DukeChaingunShot + 1670 = DukeRadiusExplosion 1221 = DukeCranePole 1222 = DukeCrane @@ -354,11 +356,17 @@ spawnclasses 1920 = DukeCommander 1921 = DukeCommanderStayput + 4610 = DukeNewBeast + 4611 = DukeNewBeastStayput + 1550 = DukeShark 1880 = DukeDrone 2420 = DukeTurret 2360 = DukeRotateGun 675 = DukeEgg - + 1225 = DukeBarBroke + 418 = DukeBearingPlate + 2612 = DukeLaserSite + 2734 = DukeSpeaker } diff --git a/wadsrc/static/filter/redneck/rmapinfo.spawnclasses b/wadsrc/static/filter/redneck/rmapinfo.spawnclasses index 8756e23c3..baf9e557a 100644 --- a/wadsrc/static/filter/redneck/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/redneck/rmapinfo.spawnclasses @@ -14,7 +14,6 @@ spawnclasses 18 = DukeTorchCtrl 35 = DukeLightningCtrl 68 = DukeShadeCtrl - 67 = DukeMinecartKiller 71 = DukeSoundFX 252 = RedneckUfoBeam 2586 = RedneckInvisible @@ -29,12 +28,15 @@ spawnclasses 64 = RedneckMinecartDef 65 = RedneckMinecartSound 66 = RedneckMinecartInner + 67 = DukeMinecartKiller 11 = RedneckJaildoorDef 38 = RedneckJaildoorSound 19 = RedneckGeometryEffect 34 = RedneckKeyinfoSetter 3380 = RedneckChaingunShot 3350 = RedneckShotgunShot + 3340 = RedneckCrowbarAttack + 1426 = DukeRadiusExplosion 1298 = DukeCranePole 1299 = DukeCrane @@ -327,6 +329,7 @@ spawnclasses 3998 = RedneckPlayerLyingDead 3860 = DukePlayerOnWater 1332 = DukeCeilingSteam + 3677 = RedneckUfoLight 4861 = RedneckHen diff --git a/wadsrc/static/zscript/games/duke/actors/_placeholders.zs b/wadsrc/static/zscript/games/duke/actors/_placeholders.zs index bf4ac7230..de99eaaeb 100644 --- a/wadsrc/static/zscript/games/duke/actors/_placeholders.zs +++ b/wadsrc/static/zscript/games/duke/actors/_placeholders.zs @@ -1,6 +1,27 @@ // dummy items representing certain weapons +class DukeKneeAttack : DukeActor +{ + default + { + pic "KNEE"; + } +} + +class RedneckCrowbarAttack : DukeKneeAttack +{ +} + + +class DukeRadiusExplosion : DukeActor +{ + default + { + pic "RADIUSEXPLOSION"; + } +} + class DukeShotgunShot : DukeActor { default diff --git a/wadsrc/static/zscript/games/duke/actors/dukemisc.zs b/wadsrc/static/zscript/games/duke/actors/dukemisc.zs index 83117b3f9..bb29bb4b7 100644 --- a/wadsrc/static/zscript/games/duke/actors/dukemisc.zs +++ b/wadsrc/static/zscript/games/duke/actors/dukemisc.zs @@ -216,3 +216,71 @@ class DeveloperCommentary : DukeActor return true; } } + +// These ones are either inert or use CON but also have flags attached + +class DukeBarBroke : DukeActor +{ + default + { + pic "BARBROKE"; + } +} + +class DukeBearingPlate : DukeActor +{ + default + { + pic "BEARINGPLATE"; + } +} + +class DukeBurnedCorpse : DukeActor +{ + default + { + pic "BURNEDCORPSE"; + } +} + +class DukeLaserSite : DukeActor +{ + default + { + pic "LASERSITE"; + } +} + +class DukeSpeaker : DukeActor +{ + default + { + pic "SPEAKER"; + } +} + +class RedneckUfoLight : DukeActor +{ + default + { + pic "UFOLIGHT"; + } +} + +class DukeNewBeast : DukeActor +{ + default + { + pic "NEWBEAST"; + } +} + +class DukeNewBeastStayput : DukeNewBeast +{ + default + { + pic "NEWBEASTSTAYPUT"; + } +} + +