alysbrooks-public/games/isometric-park-fna Commit - r219:263adbab28fd

alysbrooks-public » games » isometric-park-fna

Commit `r219:263adbab28fd` public

parent | child

Description:

Improve contract spawning.

Commit status:

[Not Reviewed]

References:

m3-contracts

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r219:263adbab28fd - Wed, 28 Apr 2021 06:20:42

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

isometric-park-fna/Engines/Spawners/ContractSpawner.cs ¶ +39 -25

             using System;
+            using System.Linq;
             using System.Collections.Generic;
             using Encompass;
+            using JM.LinqFaster;
             using Microsoft.Xna.Framework;
             namespace isometricparkfna.Spawners {
             	[Receives(typeof(SpawnContractMessage))]
-            	[Reads(typeof(AreaComponent))]
+            	[Reads(typeof(AreaComponent), typeof(ContractStatusComponent))]
             	class ContractSpawner : Spawner<SpawnContractMessage>
             	{
                     private Random random_generator;
+            	public const int DEFAULT_MIN_SQUARES = 10;
             	public const int DEFAULT_SQUARES = 25;
             	public const int CONTRACT_MINIMUM = 50;
             	public const int CONTRACT_MAXIMUM = 250;
             						attempts += 1;
             					}
             				}
-            				squares.AddRange(squares_to_add);
+            				var remaining = max_size - squares.Count;
+            				squares.AddRange(squares_to_add.Take(remaining));
                             squares_to_add.Clear();
-            				if (attempts >= maxAttempts)
+            				if (attempts >= maxAttempts && squares.Count < max_size)
             				{
             					System.Console.WriteLine(string.Format("Failed to generate enough squares. {0} were requested, only {1} were found ({2} attempts)", max_size, squares.Count, attempts));
             					break;
                     protected override void Spawn(in SpawnContractMessage message)
                     {
-                        var contract = CreateEntity();
-            	    //for now:
+                        //for now:
-            	    var occupied = new List<Vector2>();
+                        var occupied = new List<Vector2>();
-            	    foreach(ref readonly var entity in ReadEntities<AreaComponent>())
+                        foreach (var (entity, status) in ReadEntities<AreaComponent>().SelectWhereF((e) => (e, GetComponent<ContractStatusComponent>(e)),
+                                                                                                        (e) => (e.Item2.status != ContractStatus.Expired))
-            			var entitySquares = GetComponent<AreaComponent>(entity).squares;
-            		    occupied.AddRange(entitySquares);
+                            var entitySquares = GetComponent<AreaComponent>(entity).squares;
+                            occupied.AddRange(entitySquares);
+                        }
-            		var start_x = random_generator.Next(0,50);
+                        var start_x = random_generator.Next(0, 50);
-            		var start_y = random_generator.Next(0,50);
+                        var start_y = random_generator.Next(0, 50);
+                        int max_squares = (message.max_squares == 0) ? DEFAULT_SQUARES : message.max_squares;
+                        int min_squares = (message.min_squares == null) ? DEFAULT_MIN_SQUARES : (int)message.min_squares;
+                        Vector2[] squares = (message.squares == null) ? CreateArea(start_x, start_y, max_squares, new HashSet<Vector2>(occupied)) : message.squares;
-            		int max_squares = (message.max_squares == 0) ? DEFAULT_SQUARES : message.max_squares;
+                        if (squares.Length > min_squares)
-            		Vector2[] squares = (message.squares == null) ? CreateArea(start_x, start_y, max_squares, new HashSet<Vector2>(occupied))  : message.squares;
+                            var contract = CreateEntity();
-            		int contract_amount = random_generator.Next(CONTRACT_MINIMUM, CONTRACT_MAXIMUM);
+                            int contract_amount = random_generator.Next(CONTRACT_MINIMUM, CONTRACT_MAXIMUM);
-                        // AddComponent
+                            // AddComponent
-                        AddComponent(contract, new AreaComponent { squares = squares });
+                            AddComponent(contract, new AreaComponent { squares = squares });
-                        AddComponent(contract, new NameComponent { DisplayName = message.name });
+                            AddComponent(contract, new NameComponent { DisplayName = message.name });
-                        AddComponent(contract, new SelectedComponent { selected = false });
+                            AddComponent(contract, new SelectedComponent { selected = false });
-                        AddComponent(contract, new ContractStatusComponent { status = ContractStatus.Proposed, date = this.simulation.DateTime });
+                            AddComponent(contract, new ContractStatusComponent { status = ContractStatus.Proposed, date = this.simulation.DateTime });
-            			AddComponent(contract, new TreeDeltaComponent{ deltaTrees = -1});
+                            AddComponent(contract, new TreeDeltaComponent { deltaTrees = -1 });
-                        AddComponent(contract, new BudgetLineComponent { category = "Contracts",
+                            AddComponent(contract, new BudgetLineComponent
-            			    //Round to the nearest $5
-            			    amount = (decimal)((contract_amount/5)*5) });
+                                category = "Contracts",
+                                //Round to the nearest $5
+                                amount = (decimal)((contract_amount / 5) * 5)
+                            });
+                        }
                     }
                 }

isometric-park-fna/Messages/SpawnContractMessage.cs ¶ +3 -1

             	{
                     public Vector2[] squares;
                     public string name;
-            	public int max_squares;
+                    public int max_squares;
+                    public int? min_squares;
                 }
             }

isometric-park-fna/isometric-park-fna.csproj ¶ +3 0

                 </Reference>
                 <Reference Include="System.Data.DataSetExtensions" />
                 <Reference Include="System.Xml" />
+                <Reference Include="JM.LinqFaster">
+                  <HintPath>..\packages\JM.LinqFaster.1.1.2\lib\net461\JM.LinqFaster.dll</HintPath>
+                </Reference>
               </ItemGroup>
               <ItemGroup>
                 <Folder Include="Utils\" />

isometric-park-fna/packages.config ¶ +5 -4

             <packages>
               <package id="Collections.Pooled" version="1.0.82" targetFramework="net461" />
               <package id="ImGui.NET" version="1.78.0" targetFramework="net472" />
-              <package id="morelinq" version="3.2.0" targetFramework="net461" />
+              <package id="JM.LinqFaster" version="1.1.2" targetFramework="net461" />
-              <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+              <package id="morelinq" version="3.3.2" targetFramework="net461" />
+              <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
               <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
               <package id="System.Memory" version="4.5.4" targetFramework="net461" />
               <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
               <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
               <package id="System.Security.Permissions" version="5.0.0" targetFramework="net461" />
               <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
-              <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
+              <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
               <package id="Tracery.Net" version="1.0.0" targetFramework="net461" />
-              <package id="YamlDotNet" version="9.1.4" targetFramework="net461" />
+              <package id="YamlDotNet" version="11.1.1" targetFramework="net461" />
             </packages>

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r219:263adbab28fd - Wed, 28 Apr 2021 06:20:42

Sign in to your account

Commit r219:263adbab28fd public

Author

r219:263adbab28fd - Wed, 28 Apr 2021 06:20:42

Commit `r219:263adbab28fd` public