alysbrooks-public/games/isometric-park-fna Commit - r276:81028a34aa88

alysbrooks-public » games » isometric-park-fna

Commit `r276:81028a34aa88` public

parent | child

Description:

Many small tweaks.

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

r276:81028a34aa88 - Mon, 31 May 2021 09:31:36

isometric-park-fna/Engines/Spawners/ContractSpawner.cs ¶ +1 -2

             			var odds_to_try = new[] {0.5f, 0.75f, 1.0f, 0.5f, 0.75f, 1.0f};
             			var retry_location = new[] {false, false, false, true, false, false};
             			Debug.Assert(odds_to_try.Count() == retry_location.Count());
-            			// foreach( double odds in odds_to_try  )
             			for(int i = 0; i < odds_to_try.Count(); i++)
             			{
             							_ => random_generator.Next(CONTRACT_MINIMUM, CONTRACT_MAXIMUM)
             					};
-            					// AddComponent
             					AddComponent(contract, new AreaComponent { squares = squares });
             					AddComponent(contract, new NameAndDescriptionComponent { DisplayName = this.grammar.Flatten(message.name) });
             					AddComponent(contract, new SelectedComponent { selected = false });

isometric-park-fna/Engines/Spawners/OrganizationSpawner.cs ¶ 0 -7

                     Family,
                     LargeCorporation,
                     Cooperative
                 }
             	[Receives(typeof(SpawnOrganizationtMessage))]
-            	//[Reads(typeof(AreaComponent), typeof(ContractStatusComponent))]
             	class OrganizationSpawner : Spawner<SpawnOrganizationtMessage>
             	{
                     {
                         var organization = CreateEntity();
-                        // var image_index = random_generator.Next(1, 7);
             	    var image_index =  message.type switch {
             		    OrganizationType.Cooperative => MathUtils.NextSample(random_generator, new[] {1, 2, 3, 11, 12, 13, 15}),
             		    OrganizationType.LargeCorporation => MathUtils.NextSample(random_generator, new[] {0, 6, 7, 9, 10}),
             	    };
             	    Logging.Success("Generated image index.");
                         var name =  message.name != null ? message.name : "#logging_company.capitalizeAll#";
                         var description = message.description != null ? message.description : "";
                         AddComponent(organization, new OffersContractsComponent { });
                         AddComponent(organization, new OrganizationTypeComponent { type = message.type  });
                     }
                 }
             }

isometric-park-fna/FNAGame.cs ¶ 0 -65

@@ -113,7 +113,6
113		113
114	private FNAGame()	114	private FNAGame()
115	{	115	{
116	//this.device = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.)
117		116
118	#if DEBUG	117	#if DEBUG
119	foreach (System.Reflection.Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())	118	foreach (System.Reflection.Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
@@ -204,10 +203,6
204		203
205	this.grammar = new TraceryNet.Grammar(json2);	204	this.grammar = new TraceryNet.Grammar(json2);
206		205
207	//let's see if this works:
208	// WorldBuilder = new WorldBuilder();
209	var dummy_entity = WorldBuilder.CreateEntity();
210
211		206
212	WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height));	207	WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height));
213	WorldBuilder.AddEngine(new UIEngine());	208	WorldBuilder.AddEngine(new UIEngine());
@@ -282,12 +277,10
282	WorldBuilder.SendMessage(new SpawnContractMessage	277	WorldBuilder.SendMessage(new SpawnContractMessage
283	{	278	{
284	squares = squares,	279	squares = squares,
285	//new[] {new Vector2(4,4), new Vector2(5,4)},
286	name = "Northshore Logging"	280	name = "Northshore Logging"
287	});	281	});
288	WorldBuilder.SendMessage(new SpawnContractMessage	282	WorldBuilder.SendMessage(new SpawnContractMessage
289	{	283	{
290	// squares = squares2, //new[] { new Vector2(6, 6), new Vector2(6, 7), new Vector2(6, 8) },
291	name = "Aeres Maximalis Ltd."	284	name = "Aeres Maximalis Ltd."
292	});	285	});
293	World = WorldBuilder.Build();	286	World = WorldBuilder.Build();
@@ -308,8 +301,6
308	);	301	);
309		302
310		303
311
312
313	this.output = grammar.Flatten("#greeting#");	304	this.output = grammar.Flatten("#greeting#");
314	var result = grammar.Flatten("#[assistantName:#assistantNames#][whatever:whatever]vars#");	305	var result = grammar.Flatten("#[assistantName:#assistantNames#][whatever:whatever]vars#");
315		306
@@ -565,43 +556,6
565	null,	556	null,
566	camera.get_transformation(GraphicsDevice));	557	camera.get_transformation(GraphicsDevice));
567		558
568	//New tile stuff
569	/*
570	Vector2 firstSquare = Vector2.Zero;
571	int firstX = (int)firstSquare.X;
572	int firstY = (int)firstSquare.Y;
573
574	Vector2 squareOffset = Vector2.Zero;
575
576	int offsetX = (int)squareOffset.X;
577	int offsetY = (int)squareOffset.Y;
578
579
580	for (int y = 0; y < this.squaresDown; y++)
581	{
582	int rowOffset = 0;
583	if ((firstY + y) % 2 == 1)
584	rowOffset = Tile.OddRowXOffset;
585
586	for (int x = 0; x < this.squaresAcross; x++) {
587
588
589	batch.Draw(
590	Tile.TileSetTexture,
591	new Rectangle(
592	((x * Tile.TileStepX) - offsetX + rowOffset + baseOffsetX),
593	((y * Tile.TileStepY) - offsetY + baseOffsetY),
594	Tile.TileWidth, Tile.TileHeight),
595	Tile.GetSourceRectangle(1),
596	Color.White,
597	0.0f,
598	Vector2.Zero,
599	SpriteEffects.None,
600	0.9f);
601
602
603	}
604	}*/
605		559
606	#region draw_tiles	560	#region draw_tiles
607	//reset	561	//reset
@@ -757,26 +711,7
757		711
758		712
759	#endregion draw_cursor	713	#endregion draw_cursor
760	/*
761		714
762	for (int i = 0; i< 80; i++)
763	{
764	for (int j = 0; j < 50; j += 1)
765	{
766	//Warning: creates a flashing effect because tree positions update every 1/60th of a second
767
768	if (this.random_generator.NextDouble() > 0.75)
769	{
770	drawTileAt(i, j, 142, 2);
771	}
772
773	if ((i + j) % 3 == 0)
774	{
775	drawTileAt(i, j, 142, 2);
776	}
777
778	}
779	}//*/
780		715
781	#region draw_trees	716	#region draw_trees
782	if (this.showTrees) {	717	if (this.showTrees) {

isometric-park-fna/Quad.cs ¶ +1 -18

                     static public void FillSquare(GraphicsDevice device, int x, int y, Color color, float alpha)
                     {
-                        // Vector2 adjust2 = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); //TODO figure out why this second value shouldn't be halved
-                        //
                         var startX = ((x - y) * Tile.TileSpriteWidth / 2) + (Tile.TileSpriteWidth / 2);
                         var startY = (x + y) * Tile.TileSpriteHeight / 2 + (Tile.TileSpriteHeight);
                         startX = 0;
                         startY = 10;
-                        //
-                        // Rectangle rect = new Rectangle(startX, startY, Tile.TileSpriteWidth / 2, (int)(Tile.TileSpriteHeight * 0.75));
-                        // batch.Draw(Line.PixelTexture, rect, null, color, 0.785f, new Vector2(0,0), SpriteEffects.None, 0.79f);
-                        //
-                        // vert[0].Position = new Vector3(startX, startY, 0);
-                        // vert[1].Position = new Vector3(startX+Tile.TileSpriteWidth, startY, 0);
-                        // vert[2].Position = new Vector3(startX, startY+Tile.TileSpriteHeight, 0);
-                        // vert[3].Position = new Vector3(startX+Tile.TileSpriteWidth, startY+Tile.TileSpriteHeight, 0);
                         vert[0].Position = new Vector3(startX, startY, 0);
                         vert[1].Position = new Vector3(startX + 100, startY, 0);
                         vert[2].Position = new Vector3(startX, startY + 100, 0);
                         vert[3].Position = new Vector3(startX + 100, startY + 100, 0);
                         vert[0].TextureCoordinate = new Vector2(0, 0);
                         vert[1].TextureCoordinate = new Vector2(1, 0);
                         vert[2].TextureCoordinate = new Vector2(0, 1);
                         {
                             FillSquare2(batch, (int)square.X, (int)square.Y, color, alpha, depth);
                         }
                     }
                 }
+            }
-            }
  No newline at end of file

isometric-park-fna/Simulation.cs ¶ 0 -9

                                 this.lastAdvance += advancesToSimulate * millisecondsPerAdvance;
                             }
-                            /*
-                            if ((this.Tick % this.millisecondsPerAdvance) == 0)
-                                this.DateTime = this.DateTime.AddMonths(1);
-                            }*/
                         }
                     }
                 }
             }

isometric-park-fna/UI/ContractWindow.cs ¶ +3 -8

                     public static void LoadContent(ImGuiRenderer _imGuiRenderer, ImageMap map)
                     {
                         ContractWindow.map = map;
                         var _xnaTexture = ImageMap.ImageMapTexture;
                         ContractWindow._imGuiTexture = _imGuiRenderer.BindTexture(_xnaTexture);
                     }
                     public static void Render(ImFontPtr font, ImFontPtr italicFont, ImGuiWindowBridgeEngine engine, Entity entity, string name, string description, ContractStatus status, decimal amount, string delta_trees, int area_size, int imageIndex)
                     {
                         bool newShow = true;
-                        // Entity newSelected;
                         if (newShow)
                         {
                             ImGui.PushFont(font);
                             StyleSet.pushStyleVarSet(StyleSet.defaultWindowVars);
                             StyleSet.pushColorSet(StyleSet.defaultWindowColors);
                             ImGui.SetNextWindowSize(new Num.Vector2(320, 360));
-                            ImGui.Begin(string.Format("Contract {0} ## {1}", name, entity.ID), ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
+                            ImGui.Begin(string.Format("Contract {0} ## {1}", name, entity.ID), ref newShow,
+            				ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
                             ImGui.Image(_imGuiTexture, new Num.Vector2(250, 200), map.GetSourceUVStart(imageIndex), map.GetSourceUVEnd(imageIndex), Num.Vector4.One, Num.Vector4.Zero); // Here, the previously loaded texture is used
                                     break;
                             }
                             ImGui.Text(string.Format("Amount: ${0}/mo.", amount));
-            		ImGui.Text(string.Format("Size {0} m^2", area_size));
+            		ImGui.Text(string.Format("Size: {0} acres", area_size));
                             if (delta_trees != null)
                             {
                                 engine.contractStatusMessages.Add(new ChangeContractStatusMessage { Entity = entity, newStatus = ContractStatus.Broken });
                             }
                         }
                     }
                 }

isometric-park-fna/UI/ContractsWindow.cs ¶ +6 -2

                             ImGui.SetNextWindowSize(new Num.Vector2(320, 340));
                             ImGui.Begin("Contracts", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
                             ImGui.ListBoxHeader("##Contracts:", new Num.Vector2(320, 150));
-                            foreach (var contract in contracts.Where((contract) => ((!(new[] {ContractStatus.Expired, ContractStatus.Broken, ContractStatus.Rejected}.Contains(contract.status))
-                                                                                    || ContractsWindow.show_all ))))
+            		var filter_statuses = new[] {ContractStatus.Expired, ContractStatus.Broken, ContractStatus.Rejected};
+                            foreach (var contract in contracts.Where((contract) =>
+            					((!(filter_statuses.Contains(contract.status))
+            					  || ContractsWindow.show_all ))))
                             {
                                 if (ImGui.Selectable(String.Format("{0}##{1}",contract.name, contract.entity.ID),
                                 ContractsWindow.selected.entity == contract.entity))

isometric-park-fna/Utils/MathUtils.cs ¶ 0 -4

                             return (variation * z2) + mean;
                         }
                     }
             	public static int NextSample(Random random, int[] integers)
             		return integers[index];
             	}
                 }
             }

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

r276:81028a34aa88 - Mon, 31 May 2021 09:31:36

Sign in to your account

Commit r276:81028a34aa88 public

Author

r276:81028a34aa88 - Mon, 31 May 2021 09:31:36

Commit `r276:81028a34aa88` public