alysbrooks-public/games/isometric-park-fna Commit - r224:edc55e821257

alysbrooks-public » games » isometric-park-fna

Commit `r224:edc55e821257` public

parent | child

Description:

Change delta to be per-year

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

r224:edc55e821257 - Thu, 29 Apr 2021 02:34:18

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

NO CONTENT: modified file, binary diff hidden

isometric-park-fna/CellMap.cs ¶ +1 -1

                      public Boolean inBounds(int x, int y)
                      {
-                         return MathUtils.Between(x, 0, MapWidth - 1) && MathUtils.Between(y, 0, MapHeight - 1);
+                         return MathUtils.BetweenExclusive(x, 0, MapWidth - 1) && MathUtils.BetweenExclusive(y, 0, MapHeight - 1);
                      }
                      private System.Collections.Generic.IEnumerable<Cell> iterate_neighbors(int x, int y)

isometric-park-fna/Engines/InputEngine.cs ¶ +4 -4

              #region mouse_movement
-             		if (MathUtils.Between(mouseCur.Y, menuBarHeight, 50 + menuBarHeight))
+             		if (MathUtils.BetweenExclusive(mouseCur.Y, menuBarHeight, 50 + menuBarHeight))
              		{
              			SendMessage(new MoveCameraMessage {Movement = new Vector2(0, -4)});
              		}
-             		else if (MathUtils.Between(mouseCur.Y, (this.viewHeight - 50 -menuBarHeight), this.viewHeight-menuBarHeight))
+             		else if (MathUtils.BetweenExclusive(mouseCur.Y, (this.viewHeight - 50 -menuBarHeight), this.viewHeight-menuBarHeight))
              		{
              			SendMessage(new MoveCameraMessage {Movement = new Vector2(0, 4)});
              		}
-             		if (MathUtils.Between(mouseCur.X, 0, 50))
+             		if (MathUtils.BetweenExclusive(mouseCur.X, 0, 50))
              		{
              			SendMessage(new MoveCameraMessage {Movement = new Vector2(-4, 0)});
              		}
-             		else if (MathUtils.Between(mouseCur.X, (this.viewWidth - 50), this.viewWidth))
+             		else if (MathUtils.BetweenExclusive(mouseCur.X, (this.viewWidth - 50), this.viewWidth))
              		{
              			SendMessage(new MoveCameraMessage {Movement = new Vector2(4, 0)});
              		}

isometric-park-fna/Engines/SimulationBridgeEngine.cs ¶ +2 -2

              						//calculate the probability in order to get the expected number of removed trees
              						var expected = to_remove;
              						var trials = tree_squares.Count();
-             						double probability = ((double)expected / (double)trials);
+             						double probability = ((double)expected / (double)trials) / 12;
                                      foreach (var square in tree_squares)
                                      {
                                          }
                                          if (removed >= to_remove)
                                          {
-                                             break;
+                                             // break;
                                          }
                                      }
                                  }

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

              						if (random_generator.NextDouble() < 0.5
              								&& !squares.Contains(new_square)
              								&& !occupied_squares.Contains(new_square)
-             								&& MathUtils.BetweenInclusive(new_square.X, 0, this.MapWidth)
-             								&& MathUtils.BetweenInclusive(new_square.Y, 0, this.MapHeight)
+             								&& MathUtils.Between(new_square.X, 0, this.MapWidth)
+             								&& MathUtils.Between(new_square.Y, 0, this.MapHeight)
              								)
              						{
              							squares_to_add.Add(new_square);

isometric-park-fna/FNAGame.cs ¶ +4 -4

              		Vector2 original = Vector2.Transform(new Vector2(screenX, screenY), camera.get_transformation(GraphicsDevice));
              		return (!FNAGame.enableCulling ||
-             			(MathUtils.Between(original.X, -Tile.TileSpriteWidth, FNAGame.width)
-             			&& MathUtils.Between(original.Y, -Tile.TileSpriteHeight, FNAGame.height)));
+             			(MathUtils.BetweenExclusive(original.X, -Tile.TileSpriteWidth, FNAGame.width)
+             			&& MathUtils.BetweenExclusive(original.Y, -Tile.TileSpriteHeight, FNAGame.height)));
              	}
                  //Convenience method I'm not super sure about anymore.
                              null);
                      bool has_tree = false;
-                     if (MathUtils.Between(this.mouseGrid.X, 0, this.squaresAcross) && MathUtils.Between(this.mouseGrid.Y, 0, this.squaresAcross))
+                     if (MathUtils.BetweenExclusive(this.mouseGrid.X, 0, this.squaresAcross) && MathUtils.BetweenExclusive(this.mouseGrid.Y, 0, this.squaresAcross))
                      {
                          has_tree = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].hasTree;
                      }
                      //*/
                      String status_left = "";
-                     if (MathUtils.Between(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.Between(this.mouseGrid.Y, -1, this.simulation.map.MapHeight))
+                     if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight))
                      {
              			status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y,
                           this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status,

isometric-park-fna/Line.cs ¶ +1 -1

                      public static Vector2 departurePoint(Vector2 start, Vector2 stop, float width, float height)
                      {
-                         if (MathUtils.Between(stop.X, 0, width ) && MathUtils.Between(stop.Y, 0, height)) {
+                         if (MathUtils.BetweenExclusive(stop.X, 0, width ) && MathUtils.BetweenExclusive(stop.Y, 0, height)) {
                              return stop;
                          }

isometric-park-fna/UI/BudgetWindow.cs ¶ +4 -4

                          this.previous_budget = previous_budget;
                          if ((mouseCur.LeftButton == ButtonState.Pressed)
-                             && MathUtils.Between(mouseCur.X, width+x-20, width+x)
-                             && MathUtils.Between(mouseCur.Y, y+bar_height, y+bar_height+20)
+                             && MathUtils.BetweenExclusive(mouseCur.X, width+x-20, width+x)
+                             && MathUtils.BetweenExclusive(mouseCur.Y, y+bar_height, y+bar_height+20)
                              ) {
                                  return false;
                          }
                          else if ((mouseCur.LeftButton == ButtonState.Pressed)
-                             && MathUtils.Between(mouseCur.X, x, width+x)
-                             && MathUtils.Between(mouseCur.Y, y, 500 + y))
+                             && MathUtils.BetweenExclusive(mouseCur.X, x, width+x)
+                             && MathUtils.BetweenExclusive(mouseCur.Y, y, 500 + y))
                          {
                              if (mousePrev.LeftButton == ButtonState.Released)
                              {

isometric-park-fna/Utils/MathUtils.cs ¶ +68 -53

                      {
                      }
                      public static bool Between(float val, float x, float y)
                      {
+                         return ((x <= val && val < y) || (y <= val && val < x));
+                     }
+                     public static bool Between(int val, int x, int y)
+                     {
+                         return ((x <= val && val < y) || (y <= val && val < x));
+                     }
+                     public static bool BetweenExclusive(float val, float x, float y)
+                     {
                          return ((x < val && val < y) || (y < val && val < x));
                      }
-             	public static bool Between(int val, int x, int y)
+             	{
-             		return ((x < val && val < y) || (y < val && val < x));
+                     public static bool BetweenExclusive(int val, int x, int y)
+                     {
+                         return ((x < val && val < y) || (y < val && val < x));
+             	}
+                     }
                      public static bool BetweenInclusive(float val, float x, float y)
                      {
                      }
-             	public static bool BetweenInclusive(int val, int x, int y)
+             	{
-             		return ((x <= val && val <= y) || (y <= val && val <= x));
+                     public static bool BetweenInclusive(int val, int x, int y)
+                     {
+                         return ((x <= val && val <= y) || (y <= val && val <= x));
+             	}
+                     }
-             		public static int Clamp(int val, int min, int max)
+                     public static int Clamp(int val, int min, int max)
                      {
-             			if(val > max)
+                         if (val > max)
                          {
-             				return max;
+                             return max;
                          }
-             			else if (val < min)
+                         else if (val < min)
                          {
-             				return min;
+                             return min;
                          }
-             			else
+                         else
                          {
-             				return val;
+                             return val;
                          }
                      }
-             		protected float Decrement(float value, float delta)
+             		{
-             			float magnitude = Math.Abs(value);
+                     protected float Decrement(float value, float delta)
+                     {
+                         float magnitude = Math.Abs(value);
-             			//If distance from zero is less than our delta,
-             			//go to zero to prevent overshooting:
-             			if (magnitude < delta)
+             			{
-             				return 0.0f;
+             			}
-             			else if (value > 0)
+             			{
-             				return value - delta;
+             			}
-             			else if (value < 0)
+             			{
-             				return value + delta;
+             			}
-             			else
+             			{
-             				return 0.0f;
+             			}
+             		}
+                         //If distance from zero is less than our delta,
+                         //go to zero to prevent overshooting:
+                         if (magnitude < delta)
+                         {
+                             return 0.0f;
+                         }
+                         else if (value > 0)
+                         {
+                             return value - delta;
+                         }
+                         else if (value < 0)
+                         {
+                             return value + delta;
+                         }
+                         else
+                         {
+                             return 0.0f;
+                         }
+                     }
                      public static System.Collections.Generic.IEnumerable<Double> NextNormalEnumerator(Random random, float mean, float variation)
                      {
-             			while (true) {
+                         while (true)
+                         {
                              double u1 = random.NextDouble();
                              double u2 = random.NextDouble();
                              double z1 = Math.Sqrt(-2 * Math.Log(u1)) * Math.Cos(2 * Math.PI * u2);
                              double z2 = Math.Sqrt(-2 * Math.Log(u1)) * Math.Sin(2 * Math.PI * u2);
-             				yield return (variation * z1) + mean;
-             				yield return (variation * z2) + mean;
+             			}
+                             yield return (variation * z1) + mean;
+                             yield return (variation * z2) + mean;
+                         }
                      }
                      public static Double NextNormal(Random random, float mean, float variation)
                      {
-             			//Uses Box-Muller to scale the default uniform distribution
-             			double u1 = random.NextDouble();
-             			double u2 = random.NextDouble();
+                         //Uses Box-Muller to scale the default uniform distribution
+                         double u1 = random.NextDouble();
+                         double u2 = random.NextDouble();
-             			double z1 = Math.Sqrt(-2 * Math.Log(u1)) * Math.Cos(2 * Math.PI * u2);
-             			double z2 = Math.Sqrt(-2 * Math.Log(u1)) * Math.Sin(2 * Math.PI * u2);
+                         double z1 = Math.Sqrt(-2 * Math.Log(u1)) * Math.Cos(2 * Math.PI * u2);
+                         double z2 = Math.Sqrt(-2 * Math.Log(u1)) * Math.Sin(2 * Math.PI * u2);
-             			if(random.NextDouble() > 0.5d) {
-             				return (variation * z1) + mean;
+             			}
-             			else {
-             				return (variation * z2) + mean;
+             			}
+                         if (random.NextDouble() > 0.5d)
+                         {
+                             return (variation * z1) + mean;
+                         }
+                         else
+                         {
+                             return (variation * z2) + mean;
+                         }
                      }
+             	}
+                 }
              }

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

r224:edc55e821257 - Thu, 29 Apr 2021 02:34:18

Sign in to your account

Commit r224:edc55e821257 public

Author

r224:edc55e821257 - Thu, 29 Apr 2021 02:34:18

Commit `r224:edc55e821257` public