From d295589c44d1fac10f34e7ef3b319c84c2683351 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Wed, 13 Mar 2024 16:10:42 +1000 Subject: [PATCH] fix: update collision groups (#376) --- .../Entities/Constants/CollisionGroup.cs | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/managed/CounterStrikeSharp.API/Modules/Entities/Constants/CollisionGroup.cs b/managed/CounterStrikeSharp.API/Modules/Entities/Constants/CollisionGroup.cs index e7766553b..e43616910 100644 --- a/managed/CounterStrikeSharp.API/Modules/Entities/Constants/CollisionGroup.cs +++ b/managed/CounterStrikeSharp.API/Modules/Entities/Constants/CollisionGroup.cs @@ -18,34 +18,37 @@ namespace CounterStrikeSharp.API.Modules.Entities.Constants { public enum CollisionGroup { - COLLISION_GROUP_NONE = 0, - COLLISION_GROUP_DEBRIS, // Collides with nothing but world and static stuff - COLLISION_GROUP_DEBRIS_TRIGGER, // Same as debris, but hits triggers - COLLISION_GROUP_INTERACTIVE_DEBRIS, // Collides with everything except other interactive debris or debris - COLLISION_GROUP_INTERACTIVE, // Collides with everything except interactive debris or debris + COLLISION_GROUP_NONE = 0, + COLLISION_GROUP_NEVER, + COLLISION_GROUP_TRIGGER, + COLLISION_GROUP_CONDITIONALLY_SOLID, + COLLISION_GROUP_DEFAULT, + COLLISION_GROUP_DEBRIS, // Collides with nothing but world and static stuff + COLLISION_GROUP_INTERACTIVE_DEBRIS, // Collides with everything except other interactive debris or debris + COLLISION_GROUP_INTERACTIVE, // Collides with everything except interactive debris or debris COLLISION_GROUP_PLAYER, COLLISION_GROUP_BREAKABLE_GLASS, COLLISION_GROUP_VEHICLE, - COLLISION_GROUP_PLAYER_MOVEMENT, // For HL2, same as Collision_Group_Player, for + COLLISION_GROUP_PLAYER_MOVEMENT, // For HL2, same as Collision_Group_Player, for + // TF2, this filters out other players and CBaseObjects - COLLISION_GROUP_NPC, // Generic NPC group - COLLISION_GROUP_IN_VEHICLE, // for any entity inside a vehicle - COLLISION_GROUP_WEAPON, // for any weapons that need collision detection - COLLISION_GROUP_VEHICLE_CLIP, // vehicle clip brush to restrict vehicle movement - COLLISION_GROUP_PROJECTILE, // Projectiles! - COLLISION_GROUP_DOOR_BLOCKER, // Blocks entities not permitted to get near moving doors - COLLISION_GROUP_PASSABLE_DOOR, // Doors that the player shouldn't collide with - COLLISION_GROUP_DISSOLVING, // Things that are dissolving are in this group - COLLISION_GROUP_PUSHAWAY, // Nonsolid on client and server, pushaway in player code + COLLISION_GROUP_NPC, // Generic NPC group + COLLISION_GROUP_IN_VEHICLE, // for any entity inside a vehicle + COLLISION_GROUP_WEAPON, // for any weapons that need collision detection + COLLISION_GROUP_VEHICLE_CLIP, // vehicle clip brush to restrict vehicle movement + COLLISION_GROUP_PROJECTILE, // Projectiles! + COLLISION_GROUP_DOOR_BLOCKER, // Blocks entities not permitted to get near moving doors + COLLISION_GROUP_PASSABLE_DOOR, // Doors that the player shouldn't collide with + COLLISION_GROUP_DISSOLVING, // Things that are dissolving are in this group + COLLISION_GROUP_PUSHAWAY, // Nonsolid on client and server, pushaway in player code - COLLISION_GROUP_NPC_ACTOR, // Used so NPCs in scripts ignore the player. - COLLISION_GROUP_NPC_SCRIPTED, // USed for NPCs in scripts that should not collide with each other + COLLISION_GROUP_NPC_ACTOR, // Used so NPCs in scripts ignore the player. + COLLISION_GROUP_NPC_SCRIPTED, // USed for NPCs in scripts that should not collide with each other COLLISION_GROUP_PZ_CLIP, - - COLLISION_GROUP_DEBRIS_BLOCK_PROJECTILE, // Only collides with bullets + COLLISION_GROUP_PROPS, LAST_SHARED_COLLISION_GROUP - } + } } \ No newline at end of file