diff --git a/source/core/thingdef_properties.cpp b/source/core/thingdef_properties.cpp index efa79eeb1..5fe684930 100644 --- a/source/core/thingdef_properties.cpp +++ b/source/core/thingdef_properties.cpp @@ -399,6 +399,10 @@ DEFINE_PROPERTY(lookallarounddefault,0, DukeActor) { PROP_INT_PARM(i, 0); if (!isRR()) defaults->flags1 |= SFLAG_LOOKALLAROUND; // feature comes from RR, but we want the option in Duke as well, so this fake property sets the default - else defaults->flags1 |= SFLAG_MOVEFTA_WAKEUPCHECK; // Animals were not supposed to have this, but due to a coding bug the logic was unconditional for everything in the game. + else + { + defaults->flags1 |= SFLAG_MOVEFTA_WAKEUPCHECK; // Animals were not supposed to have this, but due to a coding bug the logic was unconditional for everything in the game. + defaults->flags2 |= SFLAG2_NODAMAGEPUSH; // RR does not have this feature, so set the flag for everything, this allows disabling it if wanted later. + } } diff --git a/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs b/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs index c6dd8d823..7fc9dca03 100644 --- a/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs +++ b/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs @@ -103,7 +103,6 @@ class RedneckCootplay : DukeActor pic "COOTPLAY"; +INTERNAL_BADGUY; +LOOKALLAROUND; - +NODAMAGEPUSH; +NORADIUSPUSH; } override void Initialize() @@ -121,7 +120,6 @@ class RedneckBillyPlay : DukeActor pic "BILLYPLAY"; +INTERNAL_BADGUY; +LOOKALLAROUND; - +NODAMAGEPUSH; +NORADIUSPUSH; } override void Initialize() @@ -210,7 +208,6 @@ class RedneckMamaCloud : DukeActor default { pic "MAMACLOUD"; - +NODAMAGEPUSH; +NORADIUSPUSH; } override void Initialize() @@ -231,7 +228,6 @@ class RedneckMama : DukeActor +INTERNAL_BADGUY; +KILLCOUNT; +LOOKALLAROUND; - +NODAMAGEPUSH; +NORADIUSPUSH; +SPAWNRABBITGUTS; // owed to CON's shittiness. Todo: Think of something better. } @@ -302,7 +298,6 @@ class RedneckShitBoss : DukeActor +FULLBRIGHT; +INTERNAL_BADGUY; +KILLCOUNT; - +NODAMAGEPUSH; +NORADIUSPUSH; } @@ -337,7 +332,6 @@ class RedneckHulk : DukeActor pic "HULK"; +INTERNAL_BADGUY; +KILLCOUNT; - +NODAMAGEPUSH; +NORADIUSPUSH; }