diff --git a/source/core/g_mapinfo.cpp b/source/core/g_mapinfo.cpp index dec007a16..a2bf97c7d 100644 --- a/source/core/g_mapinfo.cpp +++ b/source/core/g_mapinfo.cpp @@ -284,6 +284,7 @@ void FMapInfoParser::ParseSpawnClasses() } ParseAssign(); sc.MustGetString(); + actor = PClass::FindActor(sc.String); if (actor == nullptr) { @@ -295,6 +296,13 @@ void FMapInfoParser::ParseSpawnClasses() { // prefixing the texture names here with a '*' will render them fullbright. sc.MustGetString(); + if (sc.Compare("noskill")) + { + flags |= 0x8000; + if (sc.CheckString(",")) + sc.MustGetString(); + else goto out; + } const char* p = sc.String; if (*p == '*') { fullbright |= 1; p++; } basetex = tileForName(p); @@ -339,6 +347,7 @@ void FMapInfoParser::ParseSpawnClasses() } } } + out: if (actor != 0 && num >= 0) { // todo: check for proper base class diff --git a/source/core/thingdef_data.cpp b/source/core/thingdef_data.cpp index 7d26e952a..3d3c4361b 100644 --- a/source/core/thingdef_data.cpp +++ b/source/core/thingdef_data.cpp @@ -107,7 +107,7 @@ static FFlagDef DukeActorFlagDefs[] = DEFINE_FLAG(SFLAG, BOSS, DDukeActor, flags1), DEFINE_FLAG(SFLAG, BADGUYSTAYPUT, DDukeActor, flags1), DEFINE_FLAG(SFLAG, GREENSLIMEFOOD, DDukeActor, flags1), - DEFINE_FLAG(SFLAG, SKILLFILTER, DDukeActor, flags1), + //DEFINE_FLAG(SFLAG, SKILLFILTER, DDukeActor, flags1), DEFINE_FLAG(SFLAG, NOWATERDIP, DDukeActor, flags1), DEFINE_FLAG(SFLAG, INTERNAL_BADGUY, DDukeActor, flags1), DEFINE_FLAG(SFLAG, KILLCOUNT, DDukeActor, flags1), diff --git a/source/games/duke/src/funct.h b/source/games/duke/src/funct.h index f8723be36..a6df836af 100644 --- a/source/games/duke/src/funct.h +++ b/source/games/duke/src/funct.h @@ -194,7 +194,6 @@ DDukeActor* spawninit(DDukeActor* actj, DDukeActor* act, TArray* ac void addspritetodelete(int spnum=0); void checkavailinven(player_struct* p); bool initspriteforspawn(DDukeActor* spn); -bool commonEnemySetup(DDukeActor* self, DDukeActor* owner); void initshell(DDukeActor* actj, DDukeActor* acti, bool isshell); void spawneffector(DDukeActor* actor, TArray* actors); int startrts(int lumpNum, int localPlayer); diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp index fff42389e..199f77562 100644 --- a/source/games/duke/src/premap.cpp +++ b/source/games/duke/src/premap.cpp @@ -988,6 +988,12 @@ static TArray spawnactors(SpawnSpriteDef& sprites) auto actor = static_cast(InsertActor(cls? cls : RUNTIME_CLASS(DDukeActor), sprt->sectp, sprt->statnum)); if (actor) { + // for consistency with the original setup we should not eliminate filtered objects here but merely flag them for handling in spawninit. + if (cls && cls != RUNTIME_CLASS(DDukeActor)) + { + if (!(info->flags & 0x8000)) actor->flags1 |= SFLAG_SKILLFILTER; + } + spawns[j++] = actor; actor->initFromSprite(&sprites.sprites[i]); setFromSpawnRec(actor, info); diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp index 4fa8622bd..dcd6545f9 100644 --- a/source/games/duke/src/spawn.cpp +++ b/source/games/duke/src/spawn.cpp @@ -296,7 +296,7 @@ DDukeActor* spawn(DDukeActor* actj, PClassActor * cls) // //--------------------------------------------------------------------------- -bool commonEnemySetup(DDukeActor* self, DDukeActor* owner) +static void commonEnemySetup(DDukeActor* self, DDukeActor* owner) { if (!self->mapSpawned) self->spr.lotag = 0; @@ -314,30 +314,20 @@ bool commonEnemySetup(DDukeActor* self, DDukeActor* owner) } } - if (ud.monsters_off == 1) + makeitfall(self); + + self->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL; + + addtokills(self); + + self->timetosleep = 0; + if (!self->mapSpawned) { - self->spr.scale.Zero(); - ChangeActorStat(self, STAT_MISC); - return false; - } - else - { - makeitfall(self); - - self->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL; - - addtokills(self); - - self->timetosleep = 0; - if (!self->mapSpawned) - { - CallPlayFTASound(self); - ChangeActorStat(self, STAT_ACTOR); - if (owner && !(self->flags1 & SFLAG_INTERNAL_BADGUY)) self->spr.Angles.Yaw = owner->spr.Angles.Yaw; - } - else ChangeActorStat(self, STAT_ZOMBIEACTOR); - return true; + CallPlayFTASound(self); + ChangeActorStat(self, STAT_ACTOR); + if (owner && !(self->flags1 & SFLAG_INTERNAL_BADGUY)) self->spr.Angles.Yaw = owner->spr.Angles.Yaw; } + else ChangeActorStat(self, STAT_ZOMBIEACTOR); } @@ -842,7 +832,7 @@ DDukeActor* spawninit(DDukeActor* actj, DDukeActor* act, TArray* ac } else if (!act->isPlayer()) { - if (act->flags1 & (SFLAG_INTERNAL_BADGUY | SFLAG_SKILLFILTER)) + if (act->flags1 & SFLAG_SKILLFILTER) { if (act->spr.lotag > ud.player_skill) { @@ -851,9 +841,17 @@ DDukeActor* spawninit(DDukeActor* actj, DDukeActor* act, TArray* ac return nullptr; } } - - if (!badguy(act) || commonEnemySetup(act, actj)) - CallInitialize(act); + if (badguy(act)) + { + if (ud.monsters_off == 1) + { + act->spr.scale.Zero(); + ChangeActorStat(act, STAT_MISC); + return nullptr; + } + commonEnemySetup(act, actj); + } + CallInitialize(act); } else { diff --git a/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses b/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses index 45867953c..9ce5bc7d7 100644 --- a/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/duke.worldtour/rmapinfo.spawnclasses @@ -1,14 +1,14 @@ spawnclasses { - 5163 = DukeFireball - 5736 = DukeGenericDestructible, "WTGLASS1", "", "GLASS_BREAKING", spawnglass - 5737 = DukeGenericDestructible, "WTGLASS2", "", "GLASS_BREAKING", spawnglass - 5294 = DeveloperCommentary - 1891 = DukeFlamethrowerFlame - 5296 = DukeFireflyFlyingEffect - 5304 = DukeLavaPool - 5207 = DukeLavaPoolBubble + 5163 = DukeFireball, noskill + 5736 = DukeGenericDestructible, noskill, "WTGLASS1", "", "GLASS_BREAKING", spawnglass + 5737 = DukeGenericDestructible, noskill, "WTGLASS2", "", "GLASS_BREAKING", spawnglass + 5294 = DeveloperCommentary, noskill + 1891 = DukeFlamethrowerFlame, noskill + 5296 = DukeFireflyFlyingEffect, noskill + 5304 = DukeLavaPool, noskill + 5207 = DukeLavaPoolBubble, noskill 5310 = DukeBoss5 5311 = DukeBoss5Stayput @@ -16,9 +16,9 @@ spawnclasses 5134 = DukeFlamethrowerSprite 5135 = DukeFlamethrowerAmmo - 5143 = DukeOnFire + 5143 = DukeOnFire, noskill 5152 = DukeOnFireSmoke - 5268 = DukeWhispySmoke - 5846 = DukeSeriousSam + 5268 = DukeWhispySmoke, noskill + 5846 = DukeSeriousSam, noskill 5173 = DukeBurnedCorpse } diff --git a/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses b/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses index 4995eddb8..bccd4001c 100644 --- a/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/dukelike/rmapinfo.spawnclasses @@ -1,264 +1,261 @@ spawnclasses { - 1 = DukeSectorEffector - 2 = DukeActivator - 3 = DukeTouchplate - 4 = DukeActivatorLocked - 5 = DukeSoundController - 6 = DukeLocator - 7 = DukeCycler - 8 = DukeMasterSwitch - 9 = DukeRespawnController - 10 = DukeGPSpeed - 4890 = DukeNaturalLightning - 2521 = DukeKneeAttack - 2613 = DukeShotgunShot - 2536 = DukeChaingunShot - 1670 = DukeRadiusExplosion - 2556 = DukeShrinker + 1 = DukeSectorEffector, noskill + 2 = DukeActivator, noskill + 3 = DukeTouchplate, noskill + 4 = DukeActivatorLocked, noskill + 5 = DukeSoundController, noskill + 6 = DukeLocator, noskill + 7 = DukeCycler, noskill + 8 = DukeMasterSwitch, noskill + 9 = DukeRespawnController, noskill + 10 = DukeGPSpeed, noskill + 4890 = DukeNaturalLightning, noskill + 2521 = DukeKneeAttack, noskill + 2613 = DukeShotgunShot, noskill + 2536 = DukeChaingunShot, noskill + 1670 = DukeRadiusExplosion, noskill + 2556 = DukeShrinker, noskill - 1221 = DukeCranePole - 1222 = DukeCrane - 563 = DukeWaterFountain - 564 = DukeWaterFountain - 565 = DukeWaterFountain - 566 = DukeWaterFountain - 567 = DukeWaterFountainBroke - 951 = DukeBox - 978 = DukeCone - 908 = DukeTree1 - 910 = DukeTree2 - 990 = DukeTire - 911 = DukeCactus - 939 = DukeCactusBroke + 1221 = DukeCranePole, noskill + 1222 = DukeCrane, noskill + 563 = DukeWaterFountain, noskill + 564 = DukeWaterFountain, noskill + 565 = DukeWaterFountain, noskill + 566 = DukeWaterFountain, noskill + 567 = DukeWaterFountainBroke, noskill + 951 = DukeBox, noskill + 978 = DukeCone, noskill + 908 = DukeTree1, noskill + 910 = DukeTree2, noskill + 990 = DukeTire, noskill + 911 = DukeCactus, noskill + 939 = DukeCactusBroke, noskill 2566 = DukeTripbombPlaced - 2567 = DukeLaserline - 546 = DukeCrack - 547 = DukeCrack, "CRACK2" - 548 = DukeCrack, "CRACK3" - 549 = DukeCrack, "CRACK4" - 916 = DukeFireext - 1079 = DukeOozFilter - 1247 = DukeSeenine - 502 = DukeViewscreen - 499 = DukeViewscreen2 - 621 = DukeCamera // yes, they are all the same! - 622 = DukeCamera - 623 = DukeCamera - 624 = DukeCamera - 625 = DukeCamera - 3190 = DukeRespawnmarker - 1267 = DukeRat - 902 = DukeQueball - 901 = DukeStripeBall - 903 = DukePoolPocket - 2590 = DukeForceSphere - 1960 = DukeRecon - 2300 = DukeOoz - 2309 = DukeOoz2 - 2296 = DukeBloodSplat1 - 2297 = DukeBloodSplat2 - 2298 = DukeBloodSplat3 - 2299 = DukeBloodSplat4 - 1625 = DukeFireLaser - 1646 = DukeShrinkSpark - 2605 = DukeRPG - 1641 = DukeFreezeBlast - 1636 = DukeSpit - 1360 = DukeCoolExplosion1 - 578 = DukeReactor2 - 580 = DukeReactor2Spark - 1088 = DukeReactor - 1092 = DukeReactorSpark - 4465 = DukeGenericPole2 - 979 = DukeHangLight - 869 = DukeStatueFlash - 753 = DukeStatue - 1157 = DukeBottle10 - 765 = DukeVase - 4502 = DukeLetter - 4361 = DukeDuck - 4359 = DukeTarget - 1346 = DukeHelicopter - 2491 = DukeCar - 26 = DukePipeBomb - 940 = DukeBounceMine - 1650 = DukeMortar - 4095 = DukeFrameEffect - 925 = DukeNeon - 926 = DukeNeon, "NEON2" - 1007 = DukeNeon, "NEON3" - 1008 = DukeNeon, "NEON4" - 1009 = DukeNeon, "NEON5" - 1046 = DukeNeon, "NEON6" - 142 = DukeNukeButton - 1233 = DukeMoney - 4460 = DukePaper - 4410 = DukeMail - 1380 = DukeWaterSplash + 2567 = DukeLaserline, noskill + 546 = DukeCrack, noskill + 547 = DukeCrack, noskill, "CRACK2" + 548 = DukeCrack, noskill, "CRACK3" + 549 = DukeCrack, noskill, "CRACK4" + 916 = DukeFireext, noskill + 1079 = DukeOozFilter, noskill + 1247 = DukeSeenine, noskill + 502 = DukeViewscreen, noskill + 499 = DukeViewscreen2, noskill + 621 = DukeCamera, noskill // yes, they are all the same! + 622 = DukeCamera, noskill + 623 = DukeCamera, noskill + 624 = DukeCamera, noskill + 625 = DukeCamera, noskill + 3190 = DukeRespawnmarker, noskill + 1267 = DukeRat, noskill + 902 = DukeQueball, noskill + 901 = DukeStripeBall, noskill + 903 = DukePoolPocket, noskill + 2590 = DukeForceSphere, noskill + 2300 = DukeOoz, noskill + 2309 = DukeOoz2, noskill + 2296 = DukeBloodSplat1, noskill + 2297 = DukeBloodSplat2, noskill + 2298 = DukeBloodSplat3, noskill + 2299 = DukeBloodSplat4, noskill + 1625 = DukeFireLaser, noskill + 1646 = DukeShrinkSpark, noskill + 2605 = DukeRPG, noskill + 1641 = DukeFreezeBlast, noskill + 1636 = DukeSpit, noskill + 1360 = DukeCoolExplosion1, noskill + 578 = DukeReactor2, noskill + 580 = DukeReactor2Spark, noskill + 1088 = DukeReactor, noskill + 1092 = DukeReactorSpark, noskill + 4465 = DukeGenericPole2, noskill + 979 = DukeHangLight, noskill + 869 = DukeStatueFlash, noskill + 753 = DukeStatue, noskill + 1157 = DukeBottle10, noskill + 765 = DukeVase, noskill + 4502 = DukeLetter, noskill + 4361 = DukeDuck, noskill + 4359 = DukeTarget, noskill + 1346 = DukeHelicopter, noskill + 2491 = DukeCar, noskill + 26 = DukePipeBomb, noskill + 940 = DukeBounceMine, noskill + 1650 = DukeMortar, noskill + 4095 = DukeFrameEffect, noskill + 925 = DukeNeon, noskill + 926 = DukeNeon, noskill, "NEON2" + 1007 = DukeNeon, noskill, "NEON3" + 1008 = DukeNeon, noskill, "NEON4" + 1009 = DukeNeon, noskill, "NEON5" + 1046 = DukeNeon, noskill, "NEON6" + 142 = DukeNukeButton, noskill + 1233 = DukeMoney, noskill + 4460 = DukePaper, noskill + 4410 = DukeMail, noskill + 1380 = DukeWaterSplash, noskill 1031 = DukeGlassPieces 1032 = DukeGlassPieces1 1033 = DukeGlassPieces2 - 2533 = DukeShell - 2535 = DukeShotgunShell - 1226 = DukeBloodPool - 4389 = DukePuke - 407 = DukeFanSprite - 516 = DukeSatellite - 517 = DukeFuelPod - 602 = DukeSolarPanel - 607 = DukeAntenna - 1358 = DukeFetus - 1359 = DukeFetusBroke - 969 = DukeHydroplant - 1003 = DukeHydroplantBroke - 981 = DukeHydrant - 619 = DukePipe1 - 616 = DukePipe2 - 618 = DukePipe3 - 996 = DukePipe4 - 994 = DukePipe5 - 995 = DukePipe6 - 4943 = DukeJuryGuy - 1353 = DukeSpaceMarine - 1355 = DukeIndy - 1352 = DukeMonk - 1354 = DukeLuke - 680 = DukeChair3 - 569 = DukeToilet - 571 = DukeStall - 1069 = DukePlug - 568 = DukeFemMag - 577 = DukeFemMag, "FEMMAG2" - 4900 = DukeTag - 4909 = DukeTag, "SIGN1" - 4912 = DukeTag, "SIGN2" - 285 = DukeMaskWall - 913 = DukeMaskWall, "MASKWALL2" - 914 = DukeMaskWall, "MASKWALL3" - 915 = DukeMaskWall, "MASKWALL4" - 514 = DukeMaskWall, "MASKWALL5" - 1059 = DukeMaskWall, "MASKWALL6" - 1174 = DukeMaskWall, "MASKWALL7" - 1124 = DukeMaskWall, "MASKWALL8" - 255 = DukeMaskWall, "MASKWALL9" - 387 = DukeMaskWall, "MASKWALL10" - 391 = DukeMaskWall, "MASKWALL11" - 609 = DukeMaskWall, "MASKWALL12" - 830 = DukeMaskWall, "MASKWALL13" - 988 = DukeMaskWall, "MASKWALL14" - 1024 = DukeMaskWall, "MASKWALL15" - 550 = DukeFootprints - 672 = DukeFootprints - 673 = DukeFootprints - 674 = DukeFootprints - 952 = DukeBulletHole - 554 = DukeCameraPole - 977 = DukeGenericPole + 2533 = DukeShell, noskill + 2535 = DukeShotgunShell, noskill + 1226 = DukeBloodPool, noskill + 4389 = DukePuke, noskill + 407 = DukeFanSprite, noskill + 516 = DukeSatellite, noskill + 517 = DukeFuelPod, noskill + 602 = DukeSolarPanel, noskill + 607 = DukeAntenna, noskill + 1358 = DukeFetus, noskill + 1359 = DukeFetusBroke, noskill + 969 = DukeHydroplant, noskill + 1003 = DukeHydroplantBroke, noskill + 981 = DukeHydrant, noskill + 619 = DukePipe1, noskill + 616 = DukePipe2, noskill + 618 = DukePipe3, noskill + 996 = DukePipe4, noskill + 994 = DukePipe5, noskill + 995 = DukePipe6, noskill + 4943 = DukeJuryGuy, noskill + 1353 = DukeSpaceMarine, noskill + 1355 = DukeIndy, noskill + 1352 = DukeMonk, noskill + 1354 = DukeLuke, noskill + 680 = DukeChair3, noskill + 569 = DukeToilet, noskill + 571 = DukeStall, noskill + 1069 = DukePlug, noskill + 568 = DukeFemMag, noskill + 577 = DukeFemMag, noskill, "FEMMAG2" + 4900 = DukeTag, noskill + 4909 = DukeTag, noskill, "SIGN1" + 4912 = DukeTag, noskill, "SIGN2" + 285 = DukeMaskWall, noskill + 913 = DukeMaskWall, noskill, "MASKWALL2" + 914 = DukeMaskWall, noskill, "MASKWALL3" + 915 = DukeMaskWall, noskill, "MASKWALL4" + 514 = DukeMaskWall, noskill, "MASKWALL5" + 1059 = DukeMaskWall, noskill, "MASKWALL6" + 1174 = DukeMaskWall, noskill, "MASKWALL7" + 1124 = DukeMaskWall, noskill, "MASKWALL8" + 255 = DukeMaskWall, noskill, "MASKWALL9" + 387 = DukeMaskWall, noskill, "MASKWALL10" + 391 = DukeMaskWall, noskill, "MASKWALL11" + 609 = DukeMaskWall, noskill, "MASKWALL12" + 830 = DukeMaskWall, noskill, "MASKWALL13" + 988 = DukeMaskWall, noskill, "MASKWALL14" + 1024 = DukeMaskWall, noskill, "MASKWALL15" + 550 = DukeFootprints, noskill + 672 = DukeFootprints, noskill + 673 = DukeFootprints, noskill + 674 = DukeFootprints, noskill + 952 = DukeBulletHole, noskill + 554 = DukeCameraPole, noskill + 977 = DukeGenericPole, noskill - 1272 = DukeTrash - 634 = DukeBolt1 - 635 = DukeBolt2 - 636 = DukeBolt3 - 637 = DukeBolt4 - 4525 = DukeSideBolt1 - 4526 = DukeSideBolt2 - 4527 = DukeSideBolt3 - 4528 = DukeSideBolt4 - 660 = DukeWaterdrip - 160 = DukeDoorshock - 1232 = DukeCanWithSomething - 4580 = DukeCanWithSomething, "CANWITHSOMETHING2" - 4581 = DukeCanWithSomething, "CANWITHSOMETHING3" - 4582 = DukeCanWithSomething, "CANWITHSOMETHING4" - 1647 = DukeTongue - 1860 = DukeInnerJaw - 1861 = DukeInnerJaw1 - 2245 = DukeJibs1 - 2250 = DukeJibs2 - 2255 = DukeJibs3 - 2260 = DukeJibs4 - 2265 = DukeJibs5 - 2286 = DukeJibs6 - 1768 = DukeHeadJib1 - 1772 = DukeArmJib1 - 1776 = DukeLegJib1 - 2201 = DukeLizmanHead - 2205 = DukeLizmanArm - 2209 = DukeLizmanLeg - 1520 = DukePlayerTorso - 1528 = DukePlayerGun - 1536 = DukePlayerLeg + 1272 = DukeTrash, noskill + 634 = DukeBolt1, noskill + 635 = DukeBolt2, noskill + 636 = DukeBolt3, noskill + 637 = DukeBolt4, noskill + 4525 = DukeSideBolt1, noskill + 4526 = DukeSideBolt2, noskill + 4527 = DukeSideBolt3, noskill + 4528 = DukeSideBolt4, noskill + 660 = DukeWaterdrip, noskill + 160 = DukeDoorshock, noskill + 1232 = DukeCanWithSomething, noskill + 4580 = DukeCanWithSomething, noskill, "CANWITHSOMETHING2" + 4581 = DukeCanWithSomething, noskill, "CANWITHSOMETHING3" + 4582 = DukeCanWithSomething, noskill, "CANWITHSOMETHING4" + 1647 = DukeTongue, noskill + 1860 = DukeInnerJaw, noskill + 1861 = DukeInnerJaw1, noskill + 2245 = DukeJibs1, noskill + 2250 = DukeJibs2, noskill + 2255 = DukeJibs3, noskill + 2260 = DukeJibs4, noskill + 2265 = DukeJibs5, noskill + 2286 = DukeJibs6, noskill + 1768 = DukeHeadJib1, noskill + 1772 = DukeArmJib1, noskill + 1776 = DukeLegJib1, noskill + 2201 = DukeLizmanHead, noskill + 2205 = DukeLizmanArm, noskill + 2209 = DukeLizmanLeg, noskill + 1520 = DukePlayerTorso, noskill + 1528 = DukePlayerGun, noskill + 1536 = DukePlayerLeg, noskill - 2370 = DukeGreenSlime + 595 = DukeGenericDestructible, noskill, "GRATE1", "BGRATE1", "VENT_BUST", solid, unblocking + 1113 = DukeGenericDestructible, noskill, "CIRCLEPANNEL", "CIRCLEPANNELBROKE", "VENT_BUST", unblocking + 342 = DukeGenericDestructible, noskill, "PANNEL1", "BPANNEL1", "VENT_BUST", solid, unblocking + 343 = DukeGenericDestructible, noskill, "PANNEL2", "BPANNEL3", "VENT_BUST", solid, unblocking + 4099 = DukeGenericDestructible, noskill, "PANNEL3", "BPANNEL3", "VENT_BUST", unblocking + 556 = DukeGenericDestructible, noskill, "CHAIR1", "BROKENCHAIR", "", solid, unblocking + 557 = DukeGenericDestructible, noskill, "CHAIR2", "BROKENCHAIR", "", solid, unblocking - 595 = DukeGenericDestructible, "GRATE1", "BGRATE1", "VENT_BUST", solid, unblocking - 1113 = DukeGenericDestructible, "CIRCLEPANNEL", "CIRCLEPANNELBROKE", "VENT_BUST", unblocking - 342 = DukeGenericDestructible, "PANNEL1", "BPANNEL1", "VENT_BUST", solid, unblocking - 343 = DukeGenericDestructible, "PANNEL2", "BPANNEL3", "VENT_BUST", solid, unblocking - 4099 = DukeGenericDestructible, "PANNEL3", "BPANNEL3", "VENT_BUST", unblocking - 556 = DukeGenericDestructible, "CHAIR1", "BROKENCHAIR", "", solid, unblocking - 557 = DukeGenericDestructible, "CHAIR2", "BROKENCHAIR", "", solid, unblocking - - 686 = DukeGenericDestructible, "MOVIECAMERA", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 678 = DukeGenericDestructible, "SCALE", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 685 = DukeGenericDestructible, "CAMERALIGHT", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 689 = DukeGenericDestructible, "IVUNIT", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 694 = DukeGenericDestructible, "POT1", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 695 = DukeGenericDestructible, "POT2", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 697 = DukeGenericDestructible, "POT3", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 4444 = DukeGenericDestructible, "TRIPODCAMERA", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 669 = DukeGenericDestructible, "*VACUUM", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 971 = DukeGenericDestructible, "OCEANSPRITE1", "", "", 8, blocking, spawnsmoke - 972 = DukeGenericDestructible, "OCEANSPRITE2", "", "", 8, blocking, spawnsmoke - 973 = DukeGenericDestructible, "OCEANSPRITE3", "", "", 8, blocking, spawnsmoke - 974 = DukeGenericDestructible, "OCEANSPRITE4", "", "", spawnsmoke - 975 = DukeGenericDestructible, "OCEANSPRITE5", "", "", 8, blocking, spawnsmoke - 1025 = DukeGenericDestructible, "BOTTLE7", "", "GLASS_BREAKING", solid, spawnglass - 551 = DukeGenericDestructible, "DOMELITE", "", "GLASS_HEAVYBREAK", blocking, spawnglass2 - 954 = DukeGenericDestructible, "BOTTLE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 955 = DukeGenericDestructible, "BOTTLE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 956 = DukeGenericDestructible, "BOTTLE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 957 = DukeGenericDestructible, "BOTTLE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1012 = DukeGenericDestructible, "BOTTLE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1013 = DukeGenericDestructible, "BOTTLE6", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1014 = DukeGenericDestructible, "BOTTLE8", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1158 = DukeGenericDestructible, "BOTTLE11", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1159 = DukeGenericDestructible, "BOTTLE12", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1160 = DukeGenericDestructible, "BOTTLE13", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1161 = DukeGenericDestructible, "BOTTLE14", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1162 = DukeGenericDestructible, "BOTTLE15", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1163 = DukeGenericDestructible, "BOTTLE16", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1164 = DukeGenericDestructible, "BOTTLE17", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1165 = DukeGenericDestructible, "BOTTLE18", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1166 = DukeGenericDestructible, "BOTTLE19", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 716 = DukeGenericDestructible, "WAITTOBESEATED", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 768 = DukeGenericDestructible, "SUSHIPLATE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 769 = DukeGenericDestructible, "SUSHIPLATE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 774 = DukeGenericDestructible, "SUSHIPLATE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 779 = DukeGenericDestructible, "SUSHIPLATE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 792 = DukeGenericDestructible, "SUSHIPLATE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 686 = DukeGenericDestructible, noskill, "MOVIECAMERA", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 678 = DukeGenericDestructible, noskill, "SCALE", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 685 = DukeGenericDestructible, noskill, "CAMERALIGHT", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 689 = DukeGenericDestructible, noskill, "IVUNIT", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 694 = DukeGenericDestructible, noskill, "POT1", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 695 = DukeGenericDestructible, noskill, "POT2", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 697 = DukeGenericDestructible, noskill, "POT3", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 4444 = DukeGenericDestructible, noskill, "TRIPODCAMERA", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 669 = DukeGenericDestructible, noskill, "*VACUUM", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 971 = DukeGenericDestructible, noskill, "OCEANSPRITE1", "", "", 8, blocking, spawnsmoke + 972 = DukeGenericDestructible, noskill, "OCEANSPRITE2", "", "", 8, blocking, spawnsmoke + 973 = DukeGenericDestructible, noskill, "OCEANSPRITE3", "", "", 8, blocking, spawnsmoke + 974 = DukeGenericDestructible, noskill, "OCEANSPRITE4", "", "", spawnsmoke + 975 = DukeGenericDestructible, noskill, "OCEANSPRITE5", "", "", 8, blocking, spawnsmoke + 1025 = DukeGenericDestructible, noskill, "BOTTLE7", "", "GLASS_BREAKING", solid, spawnglass + 551 = DukeGenericDestructible, noskill, "DOMELITE", "", "GLASS_HEAVYBREAK", blocking, spawnglass2 + 954 = DukeGenericDestructible, noskill, "BOTTLE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 955 = DukeGenericDestructible, noskill, "BOTTLE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 956 = DukeGenericDestructible, noskill, "BOTTLE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 957 = DukeGenericDestructible, noskill, "BOTTLE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1012 = DukeGenericDestructible, noskill, "BOTTLE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1013 = DukeGenericDestructible, noskill, "BOTTLE6", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1014 = DukeGenericDestructible, noskill, "BOTTLE8", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1158 = DukeGenericDestructible, noskill, "BOTTLE11", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1159 = DukeGenericDestructible, noskill, "BOTTLE12", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1160 = DukeGenericDestructible, noskill, "BOTTLE13", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1161 = DukeGenericDestructible, noskill, "BOTTLE14", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1162 = DukeGenericDestructible, noskill, "BOTTLE15", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1163 = DukeGenericDestructible, noskill, "BOTTLE16", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1164 = DukeGenericDestructible, noskill, "BOTTLE17", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1165 = DukeGenericDestructible, noskill, "BOTTLE18", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1166 = DukeGenericDestructible, noskill, "BOTTLE19", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 716 = DukeGenericDestructible, noskill, "WAITTOBESEATED", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 768 = DukeGenericDestructible, noskill, "SUSHIPLATE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 769 = DukeGenericDestructible, noskill, "SUSHIPLATE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 774 = DukeGenericDestructible, noskill, "SUSHIPLATE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 779 = DukeGenericDestructible, noskill, "SUSHIPLATE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 792 = DukeGenericDestructible, noskill, "SUSHIPLATE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - // the following actors use CON. + // the following actors use CON but have native init code. 1671 = DukeForceRipple - 1630 = DukeTransporterStar - 1261 = DukeTransporterBeam - 921 = DukeToiletWater - 2270 = DukeBurning - 2310 = DukeBurning2 - 2271 = DukeFire - 2311 = DukeFire2 - 1890 = DukeExplosion2 - 2219 = DukeExplosion2Bot + 1630 = DukeTransporterStar, noskill + 1261 = DukeTransporterBeam, noskill + 921 = DukeToiletWater, noskill + 2270 = DukeBurning, noskill + 2310 = DukeBurning2, noskill + 2271 = DukeFire, noskill + 2311 = DukeFire2, noskill + 1890 = DukeExplosion2, noskill + 2219 = DukeExplosion2Bot, noskill 2380 = DukeWaterdripSplash - 662 = DukeWaterBubbleMaker - 2200 = DukeFeces - 1620 = DukeBlood - 3400 = DukeBlimp - 762 = DukeMike - 1518 = DukePlayerLyingDead - 1420 = DukePlayerOnWater - 2448 = DukeGrowSpark + 662 = DukeWaterBubbleMaker, noskill + 2200 = DukeFeces, noskill + 1620 = DukeBlood, noskill + 3400 = DukeBlimp, noskill + 762 = DukeMike, noskill + 1518 = DukePlayerLyingDead, noskill + 1420 = DukePlayerOnWater, noskill + 2448 = DukeGrowSpark, noskill 46 = DukeCrystalAmmo 55 = DukeSteroids @@ -293,37 +290,39 @@ spawnclasses 100 = DukeAtomicHealth - 1656 = DukeShrinkerExplosion - 661 = DukeWaterBubble - 2329 = DukeSmallSmoke - 1250 = DukeSteam - 1255 = DukeCeilingSteam - 1312 = DukeFemale1 - 1317 = DukeFemale2 - 1321 = DukeFemale3 - 1325 = DukeFemale4 - 1323 = DukeFemale5 - 1334 = DukeFemale6 - 1395 = DukeFemale7 - 1336 = DukeFemale8 - 3450 = DukeFemale9 - 4864 = DukeFemale10 - 4866 = DukeToughGal - 603 = DukeNaked - 1294 = DukePodFemale - 1324 = DukeBloodyPole - 1238 = DukeExplodingBarrel - 1026 = DukeHorseOnSide - 1240 = DukeFireBarrel - 1227 = DukeNukeBarrel - 1390 = DukeFireVase - 1228 = DukeNukeBarrelDented - 1229 = DukeNukeBarrelLeaked - 904 = DukeWoodenHorse - 1062 = DukeRubberCan - 2333 = DukeFloorFlame + 1656 = DukeShrinkerExplosion, noskill + 661 = DukeWaterBubble, noskill + 2329 = DukeSmallSmoke, noskill + 1250 = DukeSteam, noskill + 1255 = DukeCeilingSteam, noskill + 1312 = DukeFemale1, noskill + 1317 = DukeFemale2, noskill + 1321 = DukeFemale3, noskill + 1325 = DukeFemale4, noskill + 1323 = DukeFemale5, noskill + 1334 = DukeFemale6, noskill + 1395 = DukeFemale7, noskill + 1336 = DukeFemale8, noskill + 3450 = DukeFemale9, noskill + 4864 = DukeFemale10, noskill + 4866 = DukeToughGal, noskill + 603 = DukeNaked, noskill + 1294 = DukePodFemale, noskill + 1324 = DukeBloodyPole, noskill + 1238 = DukeExplodingBarrel, noskill + 1026 = DukeHorseOnSide, noskill + 1240 = DukeFireBarrel, noskill + 1227 = DukeNukeBarrel, noskill + 1390 = DukeFireVase, noskill + 1228 = DukeNukeBarrelDented, noskill + 1229 = DukeNukeBarrelLeaked, noskill + 904 = DukeWoodenHorse, noskill + 1062 = DukeRubberCan, noskill + 2333 = DukeFloorFlame, noskill + 1960 = DukeRecon + 2370 = DukeGreenSlime 2000 = DukePigCop 2001 = DukePigCopStayPut @@ -360,18 +359,20 @@ spawnclasses 4610 = DukeNewBeast 4611 = DukeNewBeastStayput 4670 = DukeNewBeastHang + 4671 = DukeNewBeastHangDead + 4690 = DukeNewBeastJump 1975 = DukeTank 1550 = DukeShark 1880 = DukeDrone 2420 = DukeTurret 2360 = DukeRotateGun - 675 = DukeEgg + 675 = DukeEgg, noskill 1225 = DukeBarBroke 418 = DukeBearingPlate 2612 = DukeLaserSite 4397 = DukeSpeaker - 2595 = DukeShotSpark + 2595 = DukeShotSpark, noskill // internal CON stuff referenced by name 4535 = DukeFoodObject6 @@ -454,8 +455,6 @@ spawnclasses 1810 = DukeCannon 4427 = DukeHotMeat 4340 = DukeLavaBubble - 4671 = DukeNewBeastHangDead - 4690 = DukeNewBeastJump } diff --git a/wadsrc/static/filter/redneck.redneck/rmapinfo.spawnclasses b/wadsrc/static/filter/redneck.redneck/rmapinfo.spawnclasses index 47de8f0dc..c6d9b178c 100644 --- a/wadsrc/static/filter/redneck.redneck/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/redneck.redneck/rmapinfo.spawnclasses @@ -6,7 +6,7 @@ spawnclasses 5278 = RedneckUfo3 5282 = RedneckUfo4 5286 = RedneckUfo5 - 2654 = DukeGenericDestructible, "*RRTILE2654", "", "GLASS_BREAKING", spawnglass - 2656 = DukeGenericDestructible, "*RRTILE2656", "", "GLASS_BREAKING", spawnglass - 3172 = DukeGenericDestructible, "*RRTILE3172", "", "GLASS_BREAKING", spawnglass + 2654 = DukeGenericDestructible, noskill, "*RRTILE2654", "", "GLASS_BREAKING", spawnglass + 2656 = DukeGenericDestructible, noskill, "*RRTILE2656", "", "GLASS_BREAKING", spawnglass + 3172 = DukeGenericDestructible, noskill, "*RRTILE3172", "", "GLASS_BREAKING", spawnglass } diff --git a/wadsrc/static/filter/redneck.ridesagain/rmapinfo.spawnclasses b/wadsrc/static/filter/redneck.ridesagain/rmapinfo.spawnclasses index 3fd88544a..73345cc79 100644 --- a/wadsrc/static/filter/redneck.ridesagain/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/redneck.ridesagain/rmapinfo.spawnclasses @@ -1,168 +1,168 @@ spawnclasses { - 7936 = RedneckFogEnabler - 6144 = RedneckSeasickEnabler - 8193 = RedneckPistonSoundEnabler + 7936 = RedneckFogEnabler, noskill + 6144 = RedneckSeasickEnabler, noskill + 8193 = RedneckPistonSoundEnabler, noskill - 3464 = RedneckCheerBomb - 2430 = RedneckCactusLargeYellow - 2431 = RedneckCactusLargeGreen - 2432 = RedneckCactusLargeBrown - 2443 = RedneckCactusDrug - 2451 = RedneckCactusWithHoles - 2455 = RedneckCactusSmall - 2446 = RedneckCactusLargeGreen2 - 2460 = RedneckCactusDebris1 - 2465 = RedneckCactusDebris2 - 7424 = RedneckRabbitSpawner - 5872 = RedneckBikeJibA - 5877 = RedneckBikeJibB - 5882 = RedneckBikeJibC - 6112 = RedneckBikerJibA - 6117 = RedneckBikerJibB - 6121 = RedneckBikerJibC - 6127 = RedneckBikerJibD - 7000 = RedneckCheerJibA - 7005 = RedneckCheerJibB - 7010 = RedneckCheerJibC - 7015 = RedneckCheerJibD - 7020 = RedneckFBoatJibA - 7025 = RedneckFBoatJibB - 7387 = RedneckRabbitJibA - 7392 = RedneckRabbitJibB - 7397 = RedneckRabbitJibC - 8890 = RedneckMamaJibA - 8895 = RedneckMamaJibB - 8487 = RedneckBalloons1 - 8489 = RedneckBalloons2 - 8165 = RedneckGamblingMachine - 8593 = RedneckGamblingMachine2 - 2437 = RedneckBell + 3464 = RedneckCheerBomb, noskill + 2430 = RedneckCactusLargeYellow, noskill + 2431 = RedneckCactusLargeGreen, noskill + 2432 = RedneckCactusLargeBrown, noskill + 2443 = RedneckCactusDrug, noskill + 2451 = RedneckCactusWithHoles, noskill + 2455 = RedneckCactusSmall, noskill + 2446 = RedneckCactusLargeGreen2, noskill + 2460 = RedneckCactusDebris1, noskill + 2465 = RedneckCactusDebris2, noskill + 7424 = RedneckRabbitSpawner, noskill + 5872 = RedneckBikeJibA, noskill + 5877 = RedneckBikeJibB, noskill + 5882 = RedneckBikeJibC, noskill + 6112 = RedneckBikerJibA, noskill + 6117 = RedneckBikerJibB, noskill + 6121 = RedneckBikerJibC, noskill + 6127 = RedneckBikerJibD, noskill + 7000 = RedneckCheerJibA, noskill + 7005 = RedneckCheerJibB, noskill + 7010 = RedneckCheerJibC, noskill + 7015 = RedneckCheerJibD, noskill + 7020 = RedneckFBoatJibA, noskill + 7025 = RedneckFBoatJibB, noskill + 7387 = RedneckRabbitJibA, noskill + 7392 = RedneckRabbitJibB, noskill + 7397 = RedneckRabbitJibC, noskill + 8890 = RedneckMamaJibA, noskill + 8895 = RedneckMamaJibB , noskill + 8487 = RedneckBalloons1, noskill + 8489 = RedneckBalloons2, noskill + 8165 = RedneckGamblingMachine, noskill + 8593 = RedneckGamblingMachine2, noskill + 2437 = RedneckBell, noskill 5270 = RedneckUfoRRRA 5274 = RedneckUfo2 5278 = RedneckUfo3 5282 = RedneckUfo4 5286 = RedneckUfo5 - 8192 = RedneckUfoSpawnerToggle - 1781 = RedneckChickenArrow - 1790 = RedneckBoatGrenade - 4956 = RedneckPigDisplay - 8450 = RedneckAirplane - 8099 = RedneckPiano - 8094 = RedneckPianoKeys - 8679 = RedneckSnakeRiverSign - 8448 = RedneckMusicNotes - 8704 = RedneckJoe9000 - 7220 = RedneckEmptyBike - 7233 = RedneckEmptyBoat + 8192 = RedneckUfoSpawnerToggle, noskill + 1781 = RedneckChickenArrow, noskill + 1790 = RedneckBoatGrenade, noskill + 4956 = RedneckPigDisplay, noskill + 8450 = RedneckAirplane, noskill + 8099 = RedneckPiano, noskill + 8094 = RedneckPianoKeys, noskill + 8679 = RedneckSnakeRiverSign, noskill + 8448 = RedneckMusicNotes, noskill + 8704 = RedneckJoe9000, noskill + 7220 = RedneckEmptyBike, noskill + 7233 = RedneckEmptyBoat, noskill - 7636 = DukeGenericDestructible, "OLDPHOTO0", "OLDPHOTO0BROKE", "VENT_BUST" - 7638 = DukeGenericDestructible, "OLDPHOTO1", "OLDPHOTO1BROKE", "VENT_BUST" - 7640 = DukeGenericDestructible, "FLAMMABLESIGN", "FLAMMABLESIGNBROKE", "VENT_BUST" - 7644 = DukeGenericDestructible, "OLDPHOTO2", "OLDPHOTO2BROKE", "VENT_BUST" - 7646 = DukeGenericDestructible, "OLDPHOTO3", "OLDPHOTO3BROKE", "VENT_BUST" - 7648 = DukeGenericDestructible, "WILLIESGUNS", "WILLIESGUNSBROKE", "WOODBREK" - 7650 = DukeGenericDestructible, "FLAMMABLE2SIGN", "FLAMMABLE2SIGNBROKE", "VENT_BUST" - 7653 = DukeGenericDestructible, "LABSIGN", "LABSIGNBROKE", "VENT_BUST" - 7655 = DukeGenericDestructible, "LABSIGN2", "LABSIGN2BROKE", "VENT_BUST" - 7691 = DukeGenericDestructible, "SALOONSIGN", "SALOONSIGNBROKE", "VENT_BUST" - 7875 = DukeGenericDestructible, "NOMOTOSIGN", "NOMOTOSIGNBROKE", "VENT_BUST" - 7876 = DukeGenericDestructible, "STREETSIGN1", "STREETSIGN1BROKE", "VENT_BUST" - 7881 = DukeGenericDestructible, "DANGERSIGN", "DANGERSIGNBROKE", "VENT_BUST" - 7883 = DukeGenericDestructible, "RADIATIONSIGN", "RADIATIONSIGNBROKE", "VENT_BUST" - 7879 = DukeGenericDestructible, "DIABLOHWAY", "DIABLOHWAYBROKE", "SIGNHIT", damaging - 7694 = DukeGenericDestructible, "BANKELPESO", "BANKELPESOBROKE", "WOODBREK" - 7700 = DukeGenericDestructible, "SHERIFFSIGN", "SHERIFFSIGNBROKE", "WOODBREK" - 7702 = DukeGenericDestructible, "STORESIGN", "STORESIGNBROKE", "WOODBREK" - 7711 = DukeGenericDestructible, "HOTELSIGN", "HOTELSIGNBROKE", "WOODBREK" - 7595 = DukeGenericDestructible, "RRTILE7595", "RRTILE7705", "SIGNHIT" - 7704 = DukeGenericDestructible, "RRTILE7704", "RRTILE7705", "SIGNHIT" - 8579 = DukeGenericDestructible, "RRTILE8579", "RRTILE5014", "GLASS_HEAVYBREAK" - 7441 = DukeGenericDestructible, "RRTILE7441", "RRTILE5016", "GLASS_HEAVYBREAK" - 7534 = DukeGenericDestructible, "RRTILE7534", "RRTILE5029", "GLASS_HEAVYBREAK" - 7545 = DukeGenericDestructible, "RRTILE7545", "RRTILE5030", "GLASS_HEAVYBREAK" - 7547 = DukeGenericDestructible, "RRTILE7547", "RRTILE5031", "GLASS_HEAVYBREAK" - 7574 = DukeGenericDestructible, "RRTILE7574", "RRTILE5032", "GLASS_HEAVYBREAK" - 7575 = DukeGenericDestructible, "RRTILE7575", "RRTILE5033", "GLASS_HEAVYBREAK" - 7578 = DukeGenericDestructible, "RRTILE7578", "RRTILE5034", "GLASS_HEAVYBREAK" - 7478 = DukeGenericDestructible, "RRTILE7478", "RRTILE5035", "GLASS_HEAVYBREAK" - 8525 = DukeGenericDestructible, "RRTILE8525", "RRTILE5036", "GLASS_HEAVYBREAK" - 8537 = DukeGenericDestructible, "RRTILE8537", "RRTILE5062", "GLASS_HEAVYBREAK" - 8215 = DukeGenericDestructible, "RRTILE8215", "RRTILE5064", "GLASS_HEAVYBREAK" - 8216 = DukeGenericDestructible, "*RRTILE8216", "RRTILE5065", "GLASS_HEAVYBREAK" // *prefix means fullbright. - 8217 = DukeGenericDestructible, "RRTILE8217", "RRTILE5066", "GLASS_HEAVYBREAK" - 8218 = DukeGenericDestructible, "*RRTILE8218", "RRTILE5067", "GLASS_HEAVYBREAK" - 8220 = DukeGenericDestructible, "*RRTILE8220", "RRTILE5068", "GLASS_HEAVYBREAK" - 8221 = DukeGenericDestructible, "RRTILE8221", "RRTILE5069", "GLASS_HEAVYBREAK" - 8395 = DukeGenericDestructible, "RRTILE8395", "RRTILE5072", "GLASS_HEAVYBREAK" - 8423 = DukeGenericDestructible, "RRTILE8423", "RRTILE5073", "GLASS_HEAVYBREAK" - 8462 = DukeGenericDestructible, "RRTILE8462", "RRTILE5074", "GLASS_HEAVYBREAK" - 8475 = DukeGenericDestructible, "RRTILE8475", "RRTILE5075", "GLASS_HEAVYBREAK" - 8608 = DukeGenericDestructible, "RRTILE8608", "RRTILE5083", "GLASS_HEAVYBREAK" - 8609 = DukeGenericDestructible, "RRTILE8609", "RRTILE5084", "GLASS_HEAVYBREAK" - 8312 = DukeGenericDestructible, "RRTILE8312", "RRTILE5071", "POOLBUD" - 8567 = DukeGenericDestructible, "RRTILE8567", "RRTILE5082", "GLASS_HEAVYBREAK" - 8568 = DukeGenericDestructible, "RRTILE8568", "RRTILE5082", "GLASS_HEAVYBREAK" - 8569 = DukeGenericDestructible, "RRTILE8569", "RRTILE5082", "GLASS_HEAVYBREAK" - 8570 = DukeGenericDestructible, "RRTILE8570", "RRTILE5082", "GLASS_HEAVYBREAK" - 8571 = DukeGenericDestructible, "RRTILE8571", "RRTILE5082", "GLASS_HEAVYBREAK" - 8640 = DukeGenericDestructible, "RRTILE8640", "RRTILE5085", "GLASS_HEAVYBREAK" - 8611 = DukeGenericDestructible, "RRTILE8611", "RRTILE5086", "GLASS_HEAVYBREAK" - 8497 = DukeGenericDestructible, "RRTILE8497", "RRTILE5076", "GLASS_HEAVYBREAK" - 8498 = DukeGenericDestructible, "RRTILE8498", "RRTILE5077", "GLASS_HEAVYBREAK" - 8499 = DukeGenericDestructible, "RRTILE8499", "RRTILE5078", "GLASS_HEAVYBREAK" - 8503 = DukeGenericDestructible, "RRTILE8503", "RRTILE5079", "GLASS_HEAVYBREAK" - 7901 = DukeGenericDestructible, "RRTILE7901", "RRTILE5080", "GLASS_HEAVYBREAK" - 7696 = DukeGenericDestructible, "RRTILE7696", "RRTILE7697", "WOODBREK" - 7806 = DukeGenericDestructible, "RRTILE7806", "RRTILE5043", "GLASS_HEAVYBREAK" - 7900 = DukeGenericDestructible, "RRTILE7900", "RRTILE5047", "GLASS_HEAVYBREAK" - 7906 = DukeGenericDestructible, "RRTILE7906", "RRTILE5048", "GLASS_HEAVYBREAK" - 7912 = DukeGenericDestructible, "RRTILE7912", "RRTILE5049", "GLASS_HEAVYBREAK" - 7913 = DukeGenericDestructible, "RRTILE7913", "RRTILE5049", "GLASS_HEAVYBREAK" - 8047 = DukeGenericDestructible, "RRTILE8047", "RRTILE5050", "GLASS_HEAVYBREAK" - 8596 = DukeGenericDestructible, "RRTILE8596", "RRTILE8598", "GLASS_HEAVYBREAK" - 8059 = DukeGenericDestructible, "RRTILE8059", "RRTILE5051", "GLASS_HEAVYBREAK" - 8060 = DukeGenericDestructible, "RRTILE8060", "RRTILE5052", "GLASS_HEAVYBREAK" - 8222 = DukeGenericDestructible, "RRTILE8222", "RRTILE5053", "GLASS_HEAVYBREAK" - 8223 = DukeGenericDestructible, "RRTILE8223", "RRTILE5054", "GLASS_HEAVYBREAK" - 8224 = DukeGenericDestructible, "RRTILE8224", "RRTILE5055", "GLASS_HEAVYBREAK" - 8370 = DukeGenericDestructible, "RRTILE8370", "RRTILE5056", "GLASS_HEAVYBREAK" - 8371 = DukeGenericDestructible, "RRTILE8371", "RRTILE5057", "GLASS_HEAVYBREAK" - 8372 = DukeGenericDestructible, "RRTILE8372", "RRTILE5058", "GLASS_HEAVYBREAK" - 8373 = DukeGenericDestructible, "RRTILE8373", "RRTILE5059", "GLASS_HEAVYBREAK" - 8396 = DukeGenericDestructible, "RRTILE8396", "RRTILE5038", "GLASS_HEAVYBREAK" - 8397 = DukeGenericDestructible, "RRTILE8397", "RRTILE5039", "GLASS_HEAVYBREAK" - 8398 = DukeGenericDestructible, "RRTILE8398", "RRTILE5040", "GLASS_HEAVYBREAK" - 8399 = DukeGenericDestructible, "RRTILE8399", "RRTILE5041", "GLASS_HEAVYBREAK" - 8385 = DukeGenericDestructible, "RRTILE8385", "RRTILE8386", "GLASS_HEAVYBREAK" - 8387 = DukeGenericDestructible, "RRTILE8387", "RRTILE8388", "GLASS_HEAVYBREAK" - 8389 = DukeGenericDestructible, "RRTILE8389", "RRTILE8390", "GLASS_HEAVYBREAK" - 8391 = DukeGenericDestructible, "RRTILE8391", "RRTILE8392", "GLASS_HEAVYBREAK" - 7553 = DukeGenericDestructible, "RRTILE7553", "RRTILE5035", "GLASS_HEAVYBREAK" - 8475 = DukeGenericDestructible, "RRTILE8475", "RRTILE5075", "GLASS_HEAVYBREAK" - 8498 = DukeGenericDestructible, "RRTILE8498", "RRTILE5077", "GLASS_HEAVYBREAK" - 8499 = DukeGenericDestructible, "RRTILE8499", "RRTILE5078", "GLASS_HEAVYBREAK" - 2445 = DukeGenericDestructible, "RRTILE2445", "RRTILE2450", "GLASS_HEAVYBREAK" - 7885 = DukeGenericDestructible, "RRTILE7885", "RRTILE5045", "SIGNHIT", damaging - 7890 = DukeGenericDestructible, "RRTILE7890", "RRTILE5045", "SIGNHIT", damaging - 7886 = DukeGenericDestructible, "RRTILE7886", "RRTILE5046", "SIGNHIT", damaging - 7887 = DukeGenericDestructible, "RRTILE7887", "RRTILE5044", "GLASS_HEAVYBREAK", damaging - 2123 = DukeGenericDestructible, "RRTILE2123", "RRTILE2124", "GLASS_BREAKING", damaging - 3773 = DukeGenericDestructible, "RRTILE3773", "RRTILE8651", "GLASS_BREAKING", damaging - 7533 = DukeGenericDestructible, "*RRTILE7533", "*RRTILE5035", "SIGNHIT", damaging - 3584 = DukeGenericDestructible, "RRTILE3584", "RRTILE8681", "SIGNHIT", damaging - 8394 = DukeGenericDestructible, "RRTILE8394", "RRTILE5072", "SIGNHIT" - 8461 = DukeGenericDestructible, "RRTILE8461", "RRTILE5074", "GLASS_HEAVYBREAK" - 8462 = DukeGenericDestructible, "RRTILE8462", "RRTILE5074", "GLASS_HEAVYBREAK" - 8682 = DukeGenericDestructible, "RRTILE8682", "RRTILE8683", "GLASS_HEAVYBREAK" - 1824 = DukeGenericDestructible, "YELLOWBOTTLE", "", "GLASS_HEAVYBREAK", spawnglass2 + 7636 = DukeGenericDestructible, noskill, "OLDPHOTO0", "OLDPHOTO0BROKE", "VENT_BUST" + 7638 = DukeGenericDestructible, noskill, "OLDPHOTO1", "OLDPHOTO1BROKE", "VENT_BUST" + 7640 = DukeGenericDestructible, noskill, "FLAMMABLESIGN", "FLAMMABLESIGNBROKE", "VENT_BUST" + 7644 = DukeGenericDestructible, noskill, "OLDPHOTO2", "OLDPHOTO2BROKE", "VENT_BUST" + 7646 = DukeGenericDestructible, noskill, "OLDPHOTO3", "OLDPHOTO3BROKE", "VENT_BUST" + 7648 = DukeGenericDestructible, noskill, "WILLIESGUNS", "WILLIESGUNSBROKE", "WOODBREK" + 7650 = DukeGenericDestructible, noskill, "FLAMMABLE2SIGN", "FLAMMABLE2SIGNBROKE", "VENT_BUST" + 7653 = DukeGenericDestructible, noskill, "LABSIGN", "LABSIGNBROKE", "VENT_BUST" + 7655 = DukeGenericDestructible, noskill, "LABSIGN2", "LABSIGN2BROKE", "VENT_BUST" + 7691 = DukeGenericDestructible, noskill, "SALOONSIGN", "SALOONSIGNBROKE", "VENT_BUST" + 7875 = DukeGenericDestructible, noskill, "NOMOTOSIGN", "NOMOTOSIGNBROKE", "VENT_BUST" + 7876 = DukeGenericDestructible, noskill, "STREETSIGN1", "STREETSIGN1BROKE", "VENT_BUST" + 7881 = DukeGenericDestructible, noskill, "DANGERSIGN", "DANGERSIGNBROKE", "VENT_BUST" + 7883 = DukeGenericDestructible, noskill, "RADIATIONSIGN", "RADIATIONSIGNBROKE", "VENT_BUST" + 7879 = DukeGenericDestructible, noskill, "DIABLOHWAY", "DIABLOHWAYBROKE", "SIGNHIT", damaging + 7694 = DukeGenericDestructible, noskill, "BANKELPESO", "BANKELPESOBROKE", "WOODBREK" + 7700 = DukeGenericDestructible, noskill, "SHERIFFSIGN", "SHERIFFSIGNBROKE", "WOODBREK" + 7702 = DukeGenericDestructible, noskill, "STORESIGN", "STORESIGNBROKE", "WOODBREK" + 7711 = DukeGenericDestructible, noskill, "HOTELSIGN", "HOTELSIGNBROKE", "WOODBREK" + 7595 = DukeGenericDestructible, noskill, "RRTILE7595", "RRTILE7705", "SIGNHIT" + 7704 = DukeGenericDestructible, noskill, "RRTILE7704", "RRTILE7705", "SIGNHIT" + 8579 = DukeGenericDestructible, noskill, "RRTILE8579", "RRTILE5014", "GLASS_HEAVYBREAK" + 7441 = DukeGenericDestructible, noskill, "RRTILE7441", "RRTILE5016", "GLASS_HEAVYBREAK" + 7534 = DukeGenericDestructible, noskill, "RRTILE7534", "RRTILE5029", "GLASS_HEAVYBREAK" + 7545 = DukeGenericDestructible, noskill, "RRTILE7545", "RRTILE5030", "GLASS_HEAVYBREAK" + 7547 = DukeGenericDestructible, noskill, "RRTILE7547", "RRTILE5031", "GLASS_HEAVYBREAK" + 7574 = DukeGenericDestructible, noskill, "RRTILE7574", "RRTILE5032", "GLASS_HEAVYBREAK" + 7575 = DukeGenericDestructible, noskill, "RRTILE7575", "RRTILE5033", "GLASS_HEAVYBREAK" + 7578 = DukeGenericDestructible, noskill, "RRTILE7578", "RRTILE5034", "GLASS_HEAVYBREAK" + 7478 = DukeGenericDestructible, noskill, "RRTILE7478", "RRTILE5035", "GLASS_HEAVYBREAK" + 8525 = DukeGenericDestructible, noskill, "RRTILE8525", "RRTILE5036", "GLASS_HEAVYBREAK" + 8537 = DukeGenericDestructible, noskill, "RRTILE8537", "RRTILE5062", "GLASS_HEAVYBREAK" + 8215 = DukeGenericDestructible, noskill, "RRTILE8215", "RRTILE5064", "GLASS_HEAVYBREAK" + 8216 = DukeGenericDestructible, noskill, "*RRTILE8216", "RRTILE5065", "GLASS_HEAVYBREAK" // *prefix means fullbright. + 8217 = DukeGenericDestructible, noskill, "RRTILE8217", "RRTILE5066", "GLASS_HEAVYBREAK" + 8218 = DukeGenericDestructible, noskill, "*RRTILE8218", "RRTILE5067", "GLASS_HEAVYBREAK" + 8220 = DukeGenericDestructible, noskill, "*RRTILE8220", "RRTILE5068", "GLASS_HEAVYBREAK" + 8221 = DukeGenericDestructible, noskill, "RRTILE8221", "RRTILE5069", "GLASS_HEAVYBREAK" + 8395 = DukeGenericDestructible, noskill, "RRTILE8395", "RRTILE5072", "GLASS_HEAVYBREAK" + 8423 = DukeGenericDestructible, noskill, "RRTILE8423", "RRTILE5073", "GLASS_HEAVYBREAK" + 8462 = DukeGenericDestructible, noskill, "RRTILE8462", "RRTILE5074", "GLASS_HEAVYBREAK" + 8475 = DukeGenericDestructible, noskill, "RRTILE8475", "RRTILE5075", "GLASS_HEAVYBREAK" + 8608 = DukeGenericDestructible, noskill, "RRTILE8608", "RRTILE5083", "GLASS_HEAVYBREAK" + 8609 = DukeGenericDestructible, noskill, "RRTILE8609", "RRTILE5084", "GLASS_HEAVYBREAK" + 8312 = DukeGenericDestructible, noskill, "RRTILE8312", "RRTILE5071", "POOLBUD" + 8567 = DukeGenericDestructible, noskill, "RRTILE8567", "RRTILE5082", "GLASS_HEAVYBREAK" + 8568 = DukeGenericDestructible, noskill, "RRTILE8568", "RRTILE5082", "GLASS_HEAVYBREAK" + 8569 = DukeGenericDestructible, noskill, "RRTILE8569", "RRTILE5082", "GLASS_HEAVYBREAK" + 8570 = DukeGenericDestructible, noskill, "RRTILE8570", "RRTILE5082", "GLASS_HEAVYBREAK" + 8571 = DukeGenericDestructible, noskill, "RRTILE8571", "RRTILE5082", "GLASS_HEAVYBREAK" + 8640 = DukeGenericDestructible, noskill, "RRTILE8640", "RRTILE5085", "GLASS_HEAVYBREAK" + 8611 = DukeGenericDestructible, noskill, "RRTILE8611", "RRTILE5086", "GLASS_HEAVYBREAK" + 8497 = DukeGenericDestructible, noskill, "RRTILE8497", "RRTILE5076", "GLASS_HEAVYBREAK" + 8498 = DukeGenericDestructible, noskill, "RRTILE8498", "RRTILE5077", "GLASS_HEAVYBREAK" + 8499 = DukeGenericDestructible, noskill, "RRTILE8499", "RRTILE5078", "GLASS_HEAVYBREAK" + 8503 = DukeGenericDestructible, noskill, "RRTILE8503", "RRTILE5079", "GLASS_HEAVYBREAK" + 7901 = DukeGenericDestructible, noskill, "RRTILE7901", "RRTILE5080", "GLASS_HEAVYBREAK" + 7696 = DukeGenericDestructible, noskill, "RRTILE7696", "RRTILE7697", "WOODBREK" + 7806 = DukeGenericDestructible, noskill, "RRTILE7806", "RRTILE5043", "GLASS_HEAVYBREAK" + 7900 = DukeGenericDestructible, noskill, "RRTILE7900", "RRTILE5047", "GLASS_HEAVYBREAK" + 7906 = DukeGenericDestructible, noskill, "RRTILE7906", "RRTILE5048", "GLASS_HEAVYBREAK" + 7912 = DukeGenericDestructible, noskill, "RRTILE7912", "RRTILE5049", "GLASS_HEAVYBREAK" + 7913 = DukeGenericDestructible, noskill, "RRTILE7913", "RRTILE5049", "GLASS_HEAVYBREAK" + 8047 = DukeGenericDestructible, noskill, "RRTILE8047", "RRTILE5050", "GLASS_HEAVYBREAK" + 8596 = DukeGenericDestructible, noskill, "RRTILE8596", "RRTILE8598", "GLASS_HEAVYBREAK" + 8059 = DukeGenericDestructible, noskill, "RRTILE8059", "RRTILE5051", "GLASS_HEAVYBREAK" + 8060 = DukeGenericDestructible, noskill, "RRTILE8060", "RRTILE5052", "GLASS_HEAVYBREAK" + 8222 = DukeGenericDestructible, noskill, "RRTILE8222", "RRTILE5053", "GLASS_HEAVYBREAK" + 8223 = DukeGenericDestructible, noskill, "RRTILE8223", "RRTILE5054", "GLASS_HEAVYBREAK" + 8224 = DukeGenericDestructible, noskill, "RRTILE8224", "RRTILE5055", "GLASS_HEAVYBREAK" + 8370 = DukeGenericDestructible, noskill, "RRTILE8370", "RRTILE5056", "GLASS_HEAVYBREAK" + 8371 = DukeGenericDestructible, noskill, "RRTILE8371", "RRTILE5057", "GLASS_HEAVYBREAK" + 8372 = DukeGenericDestructible, noskill, "RRTILE8372", "RRTILE5058", "GLASS_HEAVYBREAK" + 8373 = DukeGenericDestructible, noskill, "RRTILE8373", "RRTILE5059", "GLASS_HEAVYBREAK" + 8396 = DukeGenericDestructible, noskill, "RRTILE8396", "RRTILE5038", "GLASS_HEAVYBREAK" + 8397 = DukeGenericDestructible, noskill, "RRTILE8397", "RRTILE5039", "GLASS_HEAVYBREAK" + 8398 = DukeGenericDestructible, noskill, "RRTILE8398", "RRTILE5040", "GLASS_HEAVYBREAK" + 8399 = DukeGenericDestructible, noskill, "RRTILE8399", "RRTILE5041", "GLASS_HEAVYBREAK" + 8385 = DukeGenericDestructible, noskill, "RRTILE8385", "RRTILE8386", "GLASS_HEAVYBREAK" + 8387 = DukeGenericDestructible, noskill, "RRTILE8387", "RRTILE8388", "GLASS_HEAVYBREAK" + 8389 = DukeGenericDestructible, noskill, "RRTILE8389", "RRTILE8390", "GLASS_HEAVYBREAK" + 8391 = DukeGenericDestructible, noskill, "RRTILE8391", "RRTILE8392", "GLASS_HEAVYBREAK" + 7553 = DukeGenericDestructible, noskill, "RRTILE7553", "RRTILE5035", "GLASS_HEAVYBREAK" + 8475 = DukeGenericDestructible, noskill, "RRTILE8475", "RRTILE5075", "GLASS_HEAVYBREAK" + 8498 = DukeGenericDestructible, noskill, "RRTILE8498", "RRTILE5077", "GLASS_HEAVYBREAK" + 8499 = DukeGenericDestructible, noskill, "RRTILE8499", "RRTILE5078", "GLASS_HEAVYBREAK" + 2445 = DukeGenericDestructible, noskill, "RRTILE2445", "RRTILE2450", "GLASS_HEAVYBREAK" + 7885 = DukeGenericDestructible, noskill, "RRTILE7885", "RRTILE5045", "SIGNHIT", damaging + 7890 = DukeGenericDestructible, noskill, "RRTILE7890", "RRTILE5045", "SIGNHIT", damaging + 7886 = DukeGenericDestructible, noskill, "RRTILE7886", "RRTILE5046", "SIGNHIT", damaging + 7887 = DukeGenericDestructible, noskill, "RRTILE7887", "RRTILE5044", "GLASS_HEAVYBREAK", damaging + 2123 = DukeGenericDestructible, noskill, "RRTILE2123", "RRTILE2124", "GLASS_BREAKING", damaging + 3773 = DukeGenericDestructible, noskill, "RRTILE3773", "RRTILE8651", "GLASS_BREAKING", damaging + 7533 = DukeGenericDestructible, noskill, "*RRTILE7533", "*RRTILE5035", "SIGNHIT", damaging + 3584 = DukeGenericDestructible, noskill, "RRTILE3584", "RRTILE8681", "SIGNHIT", damaging + 8394 = DukeGenericDestructible, noskill, "RRTILE8394", "RRTILE5072", "SIGNHIT" + 8461 = DukeGenericDestructible, noskill, "RRTILE8461", "RRTILE5074", "GLASS_HEAVYBREAK" + 8462 = DukeGenericDestructible, noskill, "RRTILE8462", "RRTILE5074", "GLASS_HEAVYBREAK" + 8682 = DukeGenericDestructible, noskill, "RRTILE8682", "RRTILE8683", "GLASS_HEAVYBREAK" + 1824 = DukeGenericDestructible, noskill, "YELLOWBOTTLE", "", "GLASS_HEAVYBREAK", spawnglass2 244 = DukeActor, "*WALLLIGHT3" 246 = DukeActor, "*WALLLIGHT1" 3668 = DukeActor, "*RRTILE3668" 3795 = DukeActor, "*RRTILE3795" 7505 = DukeActor, "*RRTILE7505" 7506 = DukeActor, "*RRTILE7506" - 8860 = RedneckBellSwitch + 8860 = RedneckBellSwitch, noskill // stuff below uses CON @@ -190,7 +190,7 @@ spawnclasses - 78 = RedneckMotoAmmo - 8460 = RedneckBoatAmmo - 7170 = RedneckMotoHit + 78 = RedneckMotoAmmo, noskill + 8460 = RedneckBoatAmmo, noskill + 7170 = RedneckMotoHit, noskill } diff --git a/wadsrc/static/filter/redneck/rmapinfo.spawnclasses b/wadsrc/static/filter/redneck/rmapinfo.spawnclasses index 9e6ae8011..c3f52a798 100644 --- a/wadsrc/static/filter/redneck/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/redneck/rmapinfo.spawnclasses @@ -1,142 +1,141 @@ spawnclasses { - 1 = DukeSectorEffector - 2 = DukeActivator - 3 = DukeTouchplate - 4 = DukeActivatorLocked - 5 = DukeSoundController - 6 = DukeLocator - 7 = DukeCycler - 8 = DukeMasterSwitch - 9 = DukeRespawnController - 10 = DukeGPSpeed + 1 = DukeSectorEffector, noskill + 2 = DukeActivator, noskill + 3 = DukeTouchplate, noskill + 4 = DukeActivatorLocked, noskill + 5 = DukeSoundController, noskill + 6 = DukeLocator, noskill + 7 = DukeCycler, noskill + 8 = DukeMasterSwitch, noskill + 9 = DukeRespawnController, noskill + 10 = DukeGPSpeed, noskill - 18 = DukeTorchCtrl - 35 = DukeLightningCtrl - 68 = DukeShadeCtrl - 71 = DukeSoundFX - 252 = RedneckUfoBeam - 2586 = RedneckInvisible - 3587 = RedneckLadder - 36 = RedneckDestructo - 63 = RedneckDestroyTags - 7936 = RedneckFogEnabler - 6144 = RedneckSeasickEnabler - 8193 = RedneckPistonSoundEnabler + 18 = DukeTorchCtrl, noskill + 35 = DukeLightningCtrl, noskill + 68 = DukeShadeCtrl, noskill + 71 = DukeSoundFX, noskill + 252 = RedneckUfoBeam, noskill + 2586 = RedneckInvisible, noskill + 3587 = RedneckLadder, noskill + 36 = RedneckDestructo, noskill + 63 = RedneckDestroyTags, noskill + 7936 = RedneckFogEnabler, noskill + 6144 = RedneckSeasickEnabler, noskill + 8193 = RedneckPistonSoundEnabler, noskill - 64 = RedneckMinecartDef - 65 = RedneckMinecartSound - 66 = RedneckMinecartInner - 67 = DukeMinecartKiller - 11 = RedneckJaildoorDef - 38 = RedneckJaildoorSound - 19 = RedneckGeometryEffect - 34 = RedneckKeyinfoSetter - 3380 = RedneckChaingunShot - 3350 = RedneckShotgunShot - 3340 = RedneckCrowbarAttack - 1426 = DukeRadiusExplosion + 64 = RedneckMinecartDef, noskill + 65 = RedneckMinecartSound, noskill + 66 = RedneckMinecartInner, noskill + 67 = DukeMinecartKiller, noskill + 11 = RedneckJaildoorDef, noskill + 38 = RedneckJaildoorSound, noskill + 19 = RedneckGeometryEffect, noskill + 34 = RedneckKeyinfoSetter, noskill + 3380 = RedneckChaingunShot, noskill + 3350 = RedneckShotgunShot, noskill + 3340 = RedneckCrowbarAttack, noskill + 1426 = DukeRadiusExplosion, noskill - 1298 = DukeCranePole - 1299 = DukeCrane - 1092 = DukeWaterFountain - 1093 = DukeWaterFountain - 1094 = DukeWaterFountain - 1095 = DukeWaterFountain - 1096 = DukeWaterFountainBroke - 1211 = DukeBox - 1191 = DukeTree1 - 1193 = DukeTree2 - 1230 = DukeTire - 1194 = DukeCactus - 1203 = DukeCactusBroke - 1075 = DukeCrack - 1076 = DukeCrack, "CRACK2" - 1077 = DukeCrack, "CRACK3" - 1078 = DukeCrack, "CRACK4" - 1273 = DukeOozFilter - 1324 = DukeSeenine - 1346 = DukeTrash - 1127 = DukeBolt1 - 1128 = DukeBolt2 - 1129 = DukeBolt3 - 1130 = DukeBolt4 - 239 = DukeWaterdrip - 120 = DukeDoorshock - 1309 = DukeCanWithSomething - 1414 = DukeTongue - 1439 = DukeInnerJaw - 1440 = DukeInnerJaw1 - 866 = RedneckRespawnMarker + 1298 = DukeCranePole, noskill + 1299 = DukeCrane, noskill + 1092 = DukeWaterFountain, noskill + 1093 = DukeWaterFountain, noskill + 1094 = DukeWaterFountain, noskill + 1095 = DukeWaterFountain, noskill + 1096 = DukeWaterFountainBroke, noskill + 1211 = DukeBox, noskill + 1191 = DukeTree1, noskill + 1193 = DukeTree2, noskill + 1230 = DukeTire, noskill + 1194 = DukeCactus, noskill + 1203 = DukeCactusBroke, noskill + 1075 = DukeCrack, noskill + 1076 = DukeCrack, noskill, "CRACK2" + 1077 = DukeCrack, noskill, "CRACK3" + 1078 = DukeCrack, noskill, "CRACK4" + 1273 = DukeOozFilter, noskill + 1324 = DukeSeenine, noskill + 1346 = DukeTrash, noskill + 1127 = DukeBolt1, noskill + 1128 = DukeBolt2, noskill + 1129 = DukeBolt3, noskill + 1130 = DukeBolt4, noskill + 239 = DukeWaterdrip, noskill + 120 = DukeDoorshock, noskill + 1309 = DukeCanWithSomething, noskill + 1414 = DukeTongue, noskill + 1439 = DukeInnerJaw, noskill + 1440 = DukeInnerJaw1, noskill + 866 = RedneckRespawnMarker, noskill 1344 = DukeRat - 1759 = DukeForceSphere - 1529 = DukeOoz - 1538 = DukeOoz2 - 1427 = DukeForceRipple - 1525 = DukeBloodSplat1 - 1526 = DukeBloodSplat2 - 1527 = DukeBloodSplat3 - 1528 = DukeBloodSplat4 - 3420 = DukeFireLaser - 3471 = RedneckOWhip - 3475 = RedneckUWhip - 2095 = RedneckVixenShot - 1774 = RedneckDynamiteArrow - 3390 = RedneckShitBall - 3400 = RedneckSawBlade - 1107 = DukeReactor2 - 1109 = DukeReactor2Spark - 2239 = DukeReactor - 2243 = DukeReactorSpark - 2754 = DukeGenericPole2 - 3063 = DukeHangLight - 2231 = DukeStatueFlash - 1168 = DukeStatue - 1280 = DukeBottle10 - 1172 = DukeVase - 2999 = DukeFrameEffect - 1200 = DukeNeon - 1201 = DukeNeon, "NEON2" - 1241 = DukeNeon, "NEON3" - 1242 = DukeNeon, "NEON4" - 1243 = DukeNeon, "NEON5" - 1264 = DukeNeon, "NEON6" - 1310 = RedneckFeather - 1383 = DukeWaterSplash - 1420 = RedneckMudSplash - 1256 = DukeGlassPieces - 1257 = DukeGlassPieces1 - 1258 = DukeGlassPieces2 - 1702 = DukeShell - 1704 = DukeShotgunShell - 1303 = DukeBloodPool - 210 = DukeFanSprite - 1066 = DukeSatellite - 1067 = DukeFuelPod - 1114 = DukeSolarPanel - 1117 = DukeAntenna - 1228 = DukeHydrant - 1124 = DukePipe1 - 1121 = DukePipe2 - 1123 = DukePipe3 - 1234 = DukePipe4 - 1232 = DukePipe5 - 1233 = DukePipe6 - 1152 = DukeChair3 - 1098 = DukeToilet - 1100 = DukeStall - 2121 = RedneckToiletSeat - 2122 = RedneckToilet2 - 1097 = DukeFemMag - 1106 = DukeFemMag, "FEMMAG2" - 2264 = DukeMaskWall, "MASKWALL7" - 1079 = DukeFootprints - 1144 = DukeFootprints - 1145 = DukeFootprints - 1146 = DukeFootprints - 1212 = DukeBulletHole - 1083 = DukeCameraPole + 1759 = DukeForceSphere, noskill + 1529 = DukeOoz, noskill + 1538 = DukeOoz2, noskill + 1427 = DukeForceRipple, noskill + 1525 = DukeBloodSplat1, noskill + 1526 = DukeBloodSplat2, noskill + 1527 = DukeBloodSplat3, noskill + 1528 = DukeBloodSplat4, noskill + 3420 = DukeFireLaser, noskill + 3471 = RedneckOWhip, noskill + 3475 = RedneckUWhip, noskill + 2095 = RedneckVixenShot, noskill + 1774 = RedneckDynamiteArrow, noskill + 3390 = RedneckShitBall, noskill + 3400 = RedneckSawBlade, noskill + 1107 = DukeReactor2, noskill + 1109 = DukeReactor2Spark, noskill + 2239 = DukeReactor, noskill + 2243 = DukeReactorSpark, noskill + 2754 = DukeGenericPole2, noskill + 3063 = DukeHangLight, noskill + 2231 = DukeStatueFlash, noskill + 1168 = DukeStatue, noskill + 1280 = DukeBottle10, noskill + 1172 = DukeVase, noskill + 2999 = DukeFrameEffect, noskill + 1200 = DukeNeon, noskill + 1201 = DukeNeon, noskill, "NEON2" + 1241 = DukeNeon, noskill, "NEON3" + 1242 = DukeNeon, noskill, "NEON4" + 1243 = DukeNeon, noskill, "NEON5" + 1264 = DukeNeon, noskill, "NEON6" + 1310 = RedneckFeather, noskill + 1383 = DukeWaterSplash, noskill + 1420 = RedneckMudSplash, noskill + 1256 = DukeGlassPieces, noskill + 1257 = DukeGlassPieces1, noskill + 1258 = DukeGlassPieces2, noskill + 1702 = DukeShell, noskill + 1704 = DukeShotgunShell, noskill + 1303 = DukeBloodPool, noskill + 210 = DukeFanSprite, noskill + 1066 = DukeSatellite, noskill + 1067 = DukeFuelPod, noskill + 1114 = DukeSolarPanel, noskill + 1117 = DukeAntenna, noskill + 1228 = DukeHydrant, noskill + 1124 = DukePipe1, noskill + 1121 = DukePipe2, noskill + 1123 = DukePipe3, noskill + 1234 = DukePipe4, noskill + 1232 = DukePipe5, noskill + 1233 = DukePipe6, noskill + 1098 = DukeToilet, noskill + 1100 = DukeStall, noskill + 2121 = RedneckToiletSeat, noskill + 2122 = RedneckToilet2, noskill + 1097 = DukeFemMag, noskill + 1106 = DukeFemMag, noskill, "FEMMAG2" + 2264 = DukeMaskWall, noskill, "MASKWALL7" + 1079 = DukeFootprints, noskill + 1144 = DukeFootprints, noskill + 1145 = DukeFootprints, noskill + 1146 = DukeFootprints, noskill + 1212 = DukeBulletHole, noskill + 1083 = DukeCameraPole, noskill 26 = RedneckDynamite 27 = RedneckPowderKeg @@ -162,119 +161,123 @@ spawnclasses 53 = RedneckWhiskey 43 = RedneckSawAmmo 60 = RedneckDoorKey - - 1416 = RedneckMortar - 285 = RedneckChickenSpawner1 - 286 = RedneckChickenSpawner2 - 287 = RedneckFeatherSpawner - 288 = RedneckChickenHeadSpawner - 289 = RedneckChickenLoafSpawner - 290 = RedneckChickenNuggetSpawner - 291 = RedneckChickenRoastSpawner - 292 = RedneckBonelessSpawner - 293 = RedneckJibsSpawner + 41 = RedneckRifleAmmo + 52 = RedneckPorkRinds + 5595 = RedneckGoogooCluster + 3437 = RedneckBowlingBallSprite + + 1416 = RedneckMortar, noskill + 285 = RedneckChickenSpawner1, noskill + 286 = RedneckChickenSpawner2, noskill + 287 = RedneckFeatherSpawner, noskill + 288 = RedneckChickenHeadSpawner, noskill + 289 = RedneckChickenLoafSpawner, noskill + 290 = RedneckChickenNuggetSpawner, noskill + 291 = RedneckChickenRoastSpawner, noskill + 292 = RedneckBonelessSpawner, noskill + 293 = RedneckJibsSpawner, noskill 7525 = RedneckRabbitSpawner - 3190 = RedneckChickenA - 3191 = RedneckChickenB - 3192 = RedneckChickenC - 3120 = RedneckChickenLoaf - 3122 = RedneckChickenNugget - 3123 = RedneckRoastedChicken - 3124 = RedneckBonelessChicken - 3132 = RedneckChickenHead - 3410 = RedneckLumberBlade - 295 = RedneckKegHolder - 1463 = DukeJibs1 - 1468 = RedneckJibs2 - 1473 = DukeJibs3 - 1478 = DukeJibs4 - 1483 = DukeJibs5 - 1515 = DukeJibs6 - 4041 = DukePlayerTorso - 4046 = DukePlayerGun - 4055 = DukePlayerLeg - 4235 = RedneckBillyJibA - 4244 = RedneckBillyJibB - 4748 = RedneckHulkJibA - 4753 = RedneckHulkJibB - 4758 = RedneckHulkJibB - 5290 = RedneckMinJibA - 5295 = RedneckMinJibB - 5300 = RedneckMinJibB - 5602 = RedneckCootJibA - 5607 = RedneckCootJibB - 5616 = RedneckCootJibB + 3190 = RedneckChickenA, noskill + 3191 = RedneckChickenB, noskill + 3192 = RedneckChickenC, noskill + 3120 = RedneckChickenLoaf, noskill + 3122 = RedneckChickenNugget, noskill + 3123 = RedneckRoastedChicken, noskill + 3124 = RedneckBonelessChicken, noskill + 3132 = RedneckChickenHead, noskill + 3410 = RedneckLumberBlade, noskill + 295 = RedneckKegHolder, noskill + 1463 = DukeJibs1, noskill + 1468 = RedneckJibs2, noskill + 1473 = DukeJibs3, noskill + 1478 = DukeJibs4, noskill + 1483 = DukeJibs5, noskill + 1515 = DukeJibs6, noskill + 4041 = DukePlayerTorso, noskill + 4046 = DukePlayerGun, noskill + 4055 = DukePlayerLeg, noskill + 4235 = RedneckBillyJibA, noskill + 4244 = RedneckBillyJibB, noskill + 4748 = RedneckHulkJibA, noskill + 4753 = RedneckHulkJibB, noskill + 4758 = RedneckHulkJibB, noskill + 5290 = RedneckMinJibA, noskill + 5295 = RedneckMinJibB, noskill + 5300 = RedneckMinJibB, noskill + 5602 = RedneckCootJibA, noskill + 5607 = RedneckCootJibB, noskill + 5616 = RedneckCootJibB, noskill 280 = RedneckBowlingPinController - 281 = RedneckBowlingSectorLink - 282 = RedneckBowlingBallSpot - 283 = RedneckBowlingPinSpot - 3440 = RedneckBowlingPin - 3430 = RedneckBowlingBall - 4897 = RedneckHenstand - 296 = RedneckTeleport - 297 = RedneckTeleportDest - 2137 = RedneckFlamingo - 2151 = RedneckMarbleStatue - 2152 = RedneckMarbleStatue2 - 2021 = RedneckPopcorn + 281 = RedneckBowlingSectorLink, noskill + 282 = RedneckBowlingBallSpot, noskill + 283 = RedneckBowlingPinSpot, noskill + 3440 = RedneckBowlingPin, noskill + 3430 = RedneckBowlingBall, noskill + 4897 = RedneckHenstand, noskill + 296 = RedneckTeleport, noskill + 297 = RedneckTeleportDest, noskill + 2137 = RedneckFlamingo, noskill + 2151 = RedneckMarbleStatue, noskill + 2152 = RedneckMarbleStatue2, noskill + 2021 = RedneckPopcorn, noskill - 3114 = DukeGenericDestructible, "RRTILE3114", "RRTILE3117", "GLASS_BREAKING", spawnglass - 2876 = DukeGenericDestructible, "RRTILE2876", "RRTILE2990", "GLASS_BREAKING", spawnglass - 3152 = DukeGenericDestructible, "RRTILE3152", "RRTILE3218", "GLASS_BREAKING", spawnglass - 3153 = DukeGenericDestructible, "RRTILE3153", "RRTILE3219", "GLASS_BREAKING", spawnglass - 2030 = DukeGenericDestructible, "RRTILE2030", "LETSBOWL", "GLASS_BREAKING", spawnglass - 2915 = DukeGenericDestructible, "RRTILE2915", "RRTILE2977", "GLASS_BREAKING", spawnglass - 2893 = DukeGenericDestructible, "RRTILE2893", "RRTILE2978", "GLASS_BREAKING", spawnglass - 3115 = DukeGenericDestructible, "RRTILE3115", "RRTILE3116", "GLASS_BREAKING", spawnglass - 3171 = DukeGenericDestructible, "RRTILE3171", "RRTILE3216", "GLASS_BREAKING", spawnglass - 2156 = DukeGenericDestructible, "*RRTILE2156", "*RRTILE2157", "GLASS_BREAKING", spawnglass - 2158 = DukeGenericDestructible, "*RRTILE2158", "*RRTILE2159", "GLASS_BREAKING", spawnglass - 2160 = DukeGenericDestructible, "*RRTILE2160", "*RRTILE2161", "GLASS_BREAKING", spawnglass - 2175 = DukeGenericDestructible, "*RRTILE2175", "*RRTILE2176", "GLASS_BREAKING", spawnglass + 3114 = DukeGenericDestructible, noskill, "RRTILE3114", "RRTILE3117", "GLASS_BREAKING", spawnglass + 2876 = DukeGenericDestructible, noskill, "RRTILE2876", "RRTILE2990", "GLASS_BREAKING", spawnglass + 3152 = DukeGenericDestructible, noskill, "RRTILE3152", "RRTILE3218", "GLASS_BREAKING", spawnglass + 3153 = DukeGenericDestructible, noskill, "RRTILE3153", "RRTILE3219", "GLASS_BREAKING", spawnglass + 2030 = DukeGenericDestructible, noskill, "RRTILE2030", "LETSBOWL", "GLASS_BREAKING", spawnglass + 2915 = DukeGenericDestructible, noskill, "RRTILE2915", "RRTILE2977", "GLASS_BREAKING", spawnglass + 2893 = DukeGenericDestructible, noskill, "RRTILE2893", "RRTILE2978", "GLASS_BREAKING", spawnglass + 3115 = DukeGenericDestructible, noskill, "RRTILE3115", "RRTILE3116", "GLASS_BREAKING", spawnglass + 3171 = DukeGenericDestructible, noskill, "RRTILE3171", "RRTILE3216", "GLASS_BREAKING", spawnglass + 2156 = DukeGenericDestructible, noskill, "*RRTILE2156", "*RRTILE2157", "GLASS_BREAKING", spawnglass + 2158 = DukeGenericDestructible, noskill, "*RRTILE2158", "*RRTILE2159", "GLASS_BREAKING", spawnglass + 2160 = DukeGenericDestructible, noskill, "*RRTILE2160", "*RRTILE2161", "GLASS_BREAKING", spawnglass + 2175 = DukeGenericDestructible, noskill, "*RRTILE2175", "*RRTILE2176", "GLASS_BREAKING", spawnglass - 234 = DukeGenericDestructible, "GRATE1", "BGRATE1", "VENT_BUST", solid, unblocking - 2251 = DukeGenericDestructible, "CIRCLEPANNEL", "CIRCLEPANNELBROKE", "VENT_BUST", unblocking - 343 = DukeGenericDestructible, "PANNEL2", "BPANNEL3", "VENT_BUST", solid, unblocking - 1085 = DukeGenericDestructible, "CHAIR1", "BROKENCHAIR", "", solid, unblocking - 1086 = DukeGenericDestructible, "CHAIR2", "BROKENCHAIR", "", solid, unblocking - 1157 = DukeGenericDestructible, "CAMERALIGHT", "", "GLASS_HEAVYBREAK", spawnscrap - 1158 = DukeGenericDestructible, "MOVIECAMERA", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 1150 = DukeGenericDestructible, "SCALE", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 1163 = DukeGenericDestructible, "IVUNIT", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 1164 = DukeGenericDestructible, "POT1", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 1165 = DukeGenericDestructible, "POT2", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 1166 = DukeGenericDestructible, "POT3", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 1141 = DukeGenericDestructible, "VACUUM", "", "GLASS_HEAVYBREAK", solid, spawnscrap - 1080 = DukeGenericDestructible, "DOMELITE", "", "GLASS_HEAVYBREAK", blocking, spawnglass2 - 1215 = DukeGenericDestructible, "BOTTLE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1216 = DukeGenericDestructible, "BOTTLE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1217 = DukeGenericDestructible, "BOTTLE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1218 = DukeGenericDestructible, "BOTTLE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1219 = DukeGenericDestructible, "BOTTLE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1220 = DukeGenericDestructible, "BOTTLE6", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1221 = DukeGenericDestructible, "BOTTLE7", "", "GLASS_BREAKING", solid, spawnglass - 1222 = DukeGenericDestructible, "BOTTLE8", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1281 = DukeGenericDestructible, "BOTTLE11", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1282 = DukeGenericDestructible, "BOTTLE12", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1283 = DukeGenericDestructible, "BOTTLE13", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1284 = DukeGenericDestructible, "BOTTLE14", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1285 = DukeGenericDestructible, "BOTTLE15", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1286 = DukeGenericDestructible, "BOTTLE16", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1287 = DukeGenericDestructible, "BOTTLE17", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1288 = DukeGenericDestructible, "BOTTLE18", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1289 = DukeGenericDestructible, "BOTTLE19", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 234 = DukeGenericDestructible, noskill, "GRATE1", "BGRATE1", "VENT_BUST", solid, unblocking + 2251 = DukeGenericDestructible, noskill, "CIRCLEPANNEL", "CIRCLEPANNELBROKE", "VENT_BUST", unblocking + 343 = DukeGenericDestructible, noskill, "PANNEL2", "BPANNEL3", "VENT_BUST", solid, unblocking + 1085 = DukeGenericDestructible, noskill, "CHAIR1", "BROKENCHAIR", "", solid, unblocking + 1086 = DukeGenericDestructible, noskill, "CHAIR2", "BROKENCHAIR", "", solid, unblocking + 1157 = DukeGenericDestructible, noskill, "CAMERALIGHT", "", "GLASS_HEAVYBREAK", spawnscrap + 1158 = DukeGenericDestructible, noskill, "MOVIECAMERA", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 1150 = DukeGenericDestructible, noskill, "SCALE", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 1163 = DukeGenericDestructible, noskill, "IVUNIT", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 1164 = DukeGenericDestructible, noskill, "POT1", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 1165 = DukeGenericDestructible, noskill, "POT2", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 1166 = DukeGenericDestructible, noskill, "POT3", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 1141 = DukeGenericDestructible, noskill, "VACUUM", "", "GLASS_HEAVYBREAK", solid, spawnscrap + 1080 = DukeGenericDestructible, noskill, "DOMELITE", "", "GLASS_HEAVYBREAK", blocking, spawnglass2 + 1215 = DukeGenericDestructible, noskill, "BOTTLE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1216 = DukeGenericDestructible, noskill, "BOTTLE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1217 = DukeGenericDestructible, noskill, "BOTTLE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1218 = DukeGenericDestructible, noskill, "BOTTLE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1219 = DukeGenericDestructible, noskill, "BOTTLE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1220 = DukeGenericDestructible, noskill, "BOTTLE6", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1221 = DukeGenericDestructible, noskill, "BOTTLE7", "", "GLASS_BREAKING", solid, spawnglass + 1222 = DukeGenericDestructible, noskill, "BOTTLE8", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1281 = DukeGenericDestructible, noskill, "BOTTLE11", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1282 = DukeGenericDestructible, noskill, "BOTTLE12", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1283 = DukeGenericDestructible, noskill, "BOTTLE13", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1284 = DukeGenericDestructible, noskill, "BOTTLE14", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1285 = DukeGenericDestructible, noskill, "BOTTLE15", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1286 = DukeGenericDestructible, noskill, "BOTTLE16", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1287 = DukeGenericDestructible, noskill, "BOTTLE17", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1288 = DukeGenericDestructible, noskill, "BOTTLE18", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1289 = DukeGenericDestructible, noskill, "BOTTLE19", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 2215 = DukeGenericDestructible, "WAITTOBESEATED", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1174 = DukeGenericDestructible, "SUSHIPLATE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1175 = DukeGenericDestructible, "SUSHIPLATE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1176 = DukeGenericDestructible, "SUSHIPLATE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1178 = DukeGenericDestructible, "SUSHIPLATE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 1180 = DukeGenericDestructible, "SUSHIPLATE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 2215 = DukeGenericDestructible, noskill, "WAITTOBESEATED", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1174 = DukeGenericDestructible, noskill, "SUSHIPLATE1", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1175 = DukeGenericDestructible, noskill, "SUSHIPLATE2", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1176 = DukeGenericDestructible, noskill, "SUSHIPLATE3", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1178 = DukeGenericDestructible, noskill, "SUSHIPLATE4", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 + 1180 = DukeGenericDestructible, noskill, "SUSHIPLATE5", "", "GLASS_HEAVYBREAK", 8, blocking, spawnglass2 - 2654 = DukeGenericDestructible, "RRTILE2654", "", "GLASS_BREAKING", spawnglass - 2656 = DukeGenericDestructible, "RRTILE2656", "", "GLASS_BREAKING", spawnglass - 3172 = DukeGenericDestructible, "RRTILE3172", "", "GLASS_BREAKING", spawnglass - 94 = RedneckChickenPlantButton + 2654 = DukeGenericDestructible, noskill, "RRTILE2654", "", "GLASS_BREAKING", spawnglass + 2656 = DukeGenericDestructible, noskill, "RRTILE2656", "", "GLASS_BREAKING", spawnglass + 3172 = DukeGenericDestructible, noskill, "RRTILE3172", "", "GLASS_BREAKING", spawnglass + 94 = RedneckChickenPlantButton, noskill 1878 = DukeActor, "*RRTILE1878" 1952 = DukeActor, "*RRTILE1952" @@ -306,35 +309,31 @@ spawnclasses 3216 = DukeActor, "*RRTILE3216" 3720 = DukeActor, "*RRTILE3720" 2944 = DukeActor, "*PULSELAMP" - 2034 = RedneckLetsBowl + 2034 = RedneckLetsBowl, noskill // the following actors use CON - 1398 = DukeTransporterStar - 1338 = DukeTransporterBeam - 1196 = DukeToiletWater - 1494 = DukeBurning - 1539 = DukeBurning2 + 1398 = DukeTransporterStar, noskill + 1338 = DukeTransporterBeam, noskill + 1196 = DukeToiletWater, noskill + 1494 = DukeBurning, noskill + 1539 = DukeBurning2, noskill 1540 = DukeFire2 // not used but referenced 1495 = RedneckFire - 1441 = DukeExplosion2 - 1442 = RedneckExplosion3 - 1204 = DukeBounceMine - 2272 = DukeExplosion2Bot - 41 = RedneckRifleAmmo - 52 = RedneckPorkRinds - 5595 = RedneckGoogooCluster - 240 = DukeWaterBubble - 3388 = RedneckCircleStuck - 1554 = DukeSmallSmoke - 1327 = DukeSteam - 3437 = RedneckBowlingBallSprite - 241 = DukeWaterBubbleMaker - 1391 = RedneckBlood - 3998 = RedneckPlayerLyingDead - 3860 = DukePlayerOnWater - 1332 = DukeCeilingSteam - 3677 = RedneckUfoLight + 1441 = DukeExplosion2, noskill + 1442 = RedneckExplosion3, noskill + 1204 = DukeBounceMine, noskill + 2272 = DukeExplosion2Bot, noskill + 240 = DukeWaterBubble, noskill + 3388 = RedneckCircleStuck, noskill + 1554 = DukeSmallSmoke, noskill + 1327 = DukeSteam, noskill + 241 = DukeWaterBubbleMaker, noskill + 1391 = RedneckBlood, noskill + 3998 = RedneckPlayerLyingDead, noskill + 3860 = DukePlayerOnWater, noskill + 1332 = DukeCeilingSteam, noskill + 3677 = RedneckUfoLight, noskill 4861 = RedneckHen @@ -361,9 +360,9 @@ spawnclasses 4916 = RedneckMosquito 5635 = RedneckVixen - 1764 = DukeShotSpark - 2094 = RedneckTeslaBall - 3395 = RedneckBuzzSaw + 1764 = DukeShotSpark, noskill + 2094 = RedneckTeslaBall, noskill + 3395 = RedneckBuzzSaw, noskill //3845 = RedneckPlayerPawn 4983 = RedneckPigEat 2898 = RedneckBustaWin4a diff --git a/wadsrc/static/zscript/games/duke/actors/rat.zs b/wadsrc/static/zscript/games/duke/actors/rat.zs index 59c72f90e..a3ac112f1 100644 --- a/wadsrc/static/zscript/games/duke/actors/rat.zs +++ b/wadsrc/static/zscript/games/duke/actors/rat.zs @@ -13,25 +13,17 @@ class DukeRat : DukeActor { if (!self.mapSpawned) self.lotag = 0; - if ((self.lotag > ud.player_skill) || ud.monsters_off == 1) - { - self.scale = (0, 0); - self.ChangeStat(STAT_MISC); - } - else - { - self.makeitfall(); - self.angle = frandom(0, 360); - self.cstat = 0; + self.makeitfall(); + self.angle = frandom(0, 360); + self.cstat = 0; - if (!self.mapSpawned && self.ownerActor) - { - self.timetosleep = 0; - self.ChangeStat(STAT_ACTOR); - if (Raze.isRR()) self.shade = self.ownerActor.shade; - } - else self.ChangeStat(STAT_ZOMBIEACTOR); + if (!self.mapSpawned && self.ownerActor) + { + self.timetosleep = 0; + self.ChangeStat(STAT_ACTOR); + if (Raze.isRR()) self.shade = self.ownerActor.shade; } + else self.ChangeStat(STAT_ZOMBIEACTOR); self. clipdist = 10; self. scale = (0.75, 0.75); } diff --git a/wadsrc/static/zscript/games/duke/actors/tripbomb.zs b/wadsrc/static/zscript/games/duke/actors/tripbomb.zs index d5f8fc23a..4fd5cd0ff 100644 --- a/wadsrc/static/zscript/games/duke/actors/tripbomb.zs +++ b/wadsrc/static/zscript/games/duke/actors/tripbomb.zs @@ -206,12 +206,6 @@ class DukeTripBombPlaced : DukeTripBomb { override void Initialize() { - if (self.lotag > ud.player_skill) - { - self.scale = (0, 0); - self.ChangeStat(STAT_MISC); - return; - } Super.Initialize(); self.ownerActor = self; diff --git a/wadsrc/static/zscript/games/duke/dukeactor.zs b/wadsrc/static/zscript/games/duke/dukeactor.zs index 0486029f0..5bccae2cd 100644 --- a/wadsrc/static/zscript/games/duke/dukeactor.zs +++ b/wadsrc/static/zscript/games/duke/dukeactor.zs @@ -245,19 +245,10 @@ class DukeActor : CoreActor native self.scale = (REPEAT_SCALE, REPEAT_SCALE); } - if (self.lotag > ud.player_skill) - { - self.scale = (0, 0); - self.ChangeStat(STAT_MISC); - } - else - { - self.clipdist = 10; - self.ownerActor = self; - self.ChangeStat(STAT_ACTOR); - } + self.clipdist = 10; + self.ownerActor = self; + self.ChangeStat(STAT_ACTOR); } - } @@ -282,7 +273,7 @@ class DukeActor : CoreActor native self.cstat = 0; } - if ((ud.multimode < 2 && self.pal != 0) || (self.lotag > ud.player_skill)) + if (ud.multimode < 2 && self.pal != 0) { self.scale = (0, 0); self.ChangeStat(STAT_MISC);