# HG changeset patch # User Alys Brooks # Date 2021-08-07 07:46:16 # Node ID 7e1881d69239d96cd555ed43a5f10144ece0da8d # Parent b605b62e85782f5f919bc41f1a0666ff56f91355 Fix issue with area generation. diff --git a/TODO.taskpaper b/TODO.taskpaper --- a/TODO.taskpaper +++ b/TODO.taskpaper @@ -194,7 +194,7 @@ - Ingame Menu @done(2021-06-22) - Main Menu Simulation: - - Expired areas can't be reused. + - Expired areas can't be reused. @done(2021-08-07) Misc: - Exits are messy (does Encompass add threading?) [xcb] Unknown sequence number while appending request diff --git a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs --- a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs +++ b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs @@ -123,10 +123,7 @@ organization_type = GetComponent(contractOrganizations[organization_index]).type; } - foreach (var (entity, status) in ReadEntities().SelectWhereF((e) => (e, GetComponent(e)), - (e) => ((e.Item2.status != ContractStatus.Broken) && (e.Item2.status != ContractStatus.Expired))) - ) - { + foreach (var (entity, status) in ReadEntities().SelectWhereF((e) => (e, GetComponent(e)), (e) => ((e.Item2.status != ContractStatus.Broken) && (e.Item2.status != ContractStatus.Rejected) && (e.Item2.status != ContractStatus.Expired)))) { var entitySquares = GetComponent(entity).squares; occupied.AddRange(entitySquares); }