Added support for sub-collisions using an entity type as long as it implements ICollidable

vchelaru · vchelaru · commit 4e6a75156d7a · 2025-04-03T05:25:26.000-06:00
diff --git a/FRBDK/Glue/OfficialPlugins/CollisionPlugin/Controllers/CollisionRelationshipViewModelController.cs b/FRBDK/Glue/OfficialPlugins/CollisionPlugin/Controllers/CollisionRelationshipViewModelController.cs
@@ -390,8 +390,10 @@ private static List<string> GetAvailableSubCollisions(EntitySave firstEntity)
 
             foreach (var nos in firstEntity.AllNamedObjects)
             {
-                var canBeSubCollision = IsShape(nos) || nos.GetAssetTypeInfo() == AvailableAssetTypes.CommonAtis.ShapeCollection ||
-                     IsTileShapeCollection(nos);
+                var canBeSubCollision = IsShape(nos) ||
+                    nos.GetAssetTypeInfo() == AvailableAssetTypes.CommonAtis.ShapeCollection ||
+                    IsTileShapeCollection(nos) ||
+                    nos.IsCollidableOrCollidableList();
 
                 if (canBeSubCollision)
                 {

Original file line number	Diff line number	Diff line change
`@@ -390,8 +390,10 @@ private static List<string> GetAvailableSubCollisions(EntitySave firstEntity)`
`390`	`390`
`391`	`391`	`foreach (var nos in firstEntity.AllNamedObjects)`
`392`	`392`	`{`
`393`		`- var canBeSubCollision = IsShape(nos) \|\| nos.GetAssetTypeInfo() == AvailableAssetTypes.CommonAtis.ShapeCollection \|\|`
`394`		`- IsTileShapeCollection(nos);`
	`393`	`+ var canBeSubCollision = IsShape(nos) \|\|`
	`394`	`+ nos.GetAssetTypeInfo() == AvailableAssetTypes.CommonAtis.ShapeCollection \|\|`
	`395`	`+ IsTileShapeCollection(nos) \|\|`
	`396`	`+ nos.IsCollidableOrCollidableList();`
`395`	`397`
`396`	`398`	`if (canBeSubCollision)`
`397`	`399`	`{`