diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index 2781cac587d4d9dcbc213136710d82c1b58818d6..15f73f6d762afaf000c57480f3633df187072ad7 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -21,7 +21,7 @@ namespace Controller
Texture2D backGround, unit1;
// Set the coordinates to draw the sprite at.
- Vector2 spritePosition = new Vector2(50.0f, 50.0f);
+ Vector2 spritePosition = new Vector2(32.0f, 32.0f);
// Store some information about the sprite's motion.
// Vector2 spriteSpeed = new Vector2(50.0f, 50.0f);
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Graph.cs b/src/Blaze-Brigade/Blaze_Brigade/Graph.cs
index 213c4a9cc0d6e275e1fac0ceaabee3bd09e88d50..2d41260a1cfa452bc4035a55728cb6804f928774 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Graph.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Graph.cs
@@ -7,5 +7,20 @@ namespace Model
{
class Graph
{
+ private int numberOfNodes; // total number of nodes in the graph
+ private int width; // width of the graph (by number of nodes)
+ private int height; // height of the graph (by number of nodes)
+
+ public Graph(int x, int y)
+ {
+ this.width = x;
+ this.height = y;
+ numberOfNodes = x * y;
+ }
+
+ public int getNumberOfNodes()
+ {
+ return numberOfNodes;
+ }
}
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/MapFunction.cs b/src/Blaze-Brigade/Blaze_Brigade/MapFunction.cs
index cf34a6b8d39def6b823bbd361ba0b507caf4828b..dad42339fb1bbac54b25cdc0ade4c7bb18187b5a 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/MapFunction.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/MapFunction.cs
@@ -7,5 +7,13 @@ namespace Model
{
class MapFunction
{
+ public LinkedList<Node> pathFinder(Graph graph, Node start, Node end)
+ {
+ LinkedList<Node> path = new LinkedList<Node>();
+ path.AddFirst(start);
+ //TODO: finds path to highlight for unit movement; returns list of nodes representing the path from start node to end node
+ path.AddLast(end);
+ return path;
+ }
}
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Node.cs b/src/Blaze-Brigade/Blaze_Brigade/Node.cs
index e2e9eb674b36078f6ff31acaf6c3e32d122d2435..c758510b4625046b8ede56767197956853c87fba 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Node.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Node.cs
@@ -7,5 +7,27 @@ namespace Model
{
class Node
{
+ private int movability; // index of how far a unit can move within the tile
+ private bool isObstacle; // indicates whether a unit can stand inside the tile
+
+ public void setMovability(int m)
+ {
+ movability = m;
+ }
+
+ public void setIsObstacle(bool b)
+ {
+ isObstacle = b;
+ }
+
+ public int getMovability()
+ {
+ return movability;
+ }
+
+ public bool getIsObstacle()
+ {
+ return isObstacle;
+ }
}
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs b/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs
index b6197a0d716873174bc2404c7afa7f8bec1ae3e1..e1d450755c5b0dc23e0cbbb2b8da2c92356c3264 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs
@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
-namespace Blaze_Brigade {
+namespace View {
using System;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs b/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
index a1e9d6b17c2e582f25e73e7ca98015673a697c81..1e01ae1e3bd127ab81732c4b797636dcbc68f482 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
@@ -7,5 +7,9 @@ namespace Model
{
interface Weapon
{
+ int getPhysicalDamage();
+ int getMagicDamage();
+ int getCritRate();
+ int getHitRate();
}
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.exe b/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.exe
index 0a217d3301e4adc348b7cc4e27458188fbb6e511..5de49992b00d538e340145eb39b79768f9382502 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.exe and b/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.exe differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.pdb b/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.pdb
index 86d1bf3fc2b634545abdc1e403145298b67e595e..d784fa8ef4eab2acc912b647fe57d69b5dd796c3 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.pdb and b/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Blaze_Brigade.pdb differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Content/Game Map.xnb b/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Content/Game Map.xnb
index a01002ec4c5d9a7bcca892c26fc175dfeb521082..483f8787bf6b7d1fb1c2ec9a42841fee067b5cb2 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Content/Game Map.xnb and b/src/Blaze-Brigade/Blaze_Brigade/bin/x86/Debug/Content/Game Map.xnb differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.FileListAbsolute.txt b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.FileListAbsolute.txt
index da49e803f865d2dd676e18d1b7f21c8839bdd616..9ff1898838e432be41638a9ec3df1ab70a68b21b 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.FileListAbsolute.txt
+++ b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.FileListAbsolute.txt
@@ -57,3 +57,4 @@ C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\ob
C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\obj\x86\Debug\Blaze_Brigade.exe
C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\obj\x86\Debug\Blaze_Brigade.pdb
C:\Users\chaos\Documents\Git\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\charSprite.xnb
+C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\charSprite.xnb
diff --git a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.GenerateResource.Cache b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.GenerateResource.Cache
index 4eb90188fe518f05f717ffa82db9f04ffda596c7..3e3eef58014888c3bf5d60e3d3cc0cda56ac54c2 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.GenerateResource.Cache and b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csproj.GenerateResource.Cache differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csprojResolveAssemblyReference.cache b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csprojResolveAssemblyReference.cache
index 9abd5a8c47c0d0c684837272147dc85653f59913..77e3e112746ede004c2c5067cd636c120c0a44f7 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csprojResolveAssemblyReference.cache and b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.csprojResolveAssemblyReference.cache differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.exe b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.exe
index 0a217d3301e4adc348b7cc4e27458188fbb6e511..5de49992b00d538e340145eb39b79768f9382502 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.exe and b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.exe differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.pdb b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.pdb
index 86d1bf3fc2b634545abdc1e403145298b67e595e..d784fa8ef4eab2acc912b647fe57d69b5dd796c3 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.pdb and b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/Blaze_Brigade.pdb differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/ContentPipeline-{B867170A-1ADD-4151-BFDA-06E292F28986}.xml b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/ContentPipeline-{B867170A-1ADD-4151-BFDA-06E292F28986}.xml
index afa796ccc4f9bb00b0826140f62a6e90bad467b7..8550e2e996bd1f83f4f3ed0c8ed353cc386935d0 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/ContentPipeline-{B867170A-1ADD-4151-BFDA-06E292F28986}.xml
+++ b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/ContentPipeline-{B867170A-1ADD-4151-BFDA-06E292F28986}.xml
@@ -7,8 +7,8 @@
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
<Options>None</Options>
- <Output>C:\Users\chaos\Documents\Git\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\Game Map.xnb</Output>
- <Time>2015-07-22T20:51:38-04:00</Time>
+ <Output>C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\Game Map.xnb</Output>
+ <Time>2016-10-18T12:43:29.1631294-04:00</Time>
</Item>
<Item>
<Source>charSprite.png</Source>
@@ -16,8 +16,8 @@
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
<Options>None</Options>
- <Output>C:\Users\chaos\Documents\Git\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\charSprite.xnb</Output>
- <Time>2016-10-18T13:51:08.0660613-04:00</Time>
+ <Output>C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\charSprite.xnb</Output>
+ <Time>2016-10-18T14:25:36.1902902-04:00</Time>
</Item>
<BuildSuccessful>true</BuildSuccessful>
<Settings>
@@ -26,10 +26,10 @@
<TargetProfile>Reach</TargetProfile>
<BuildConfiguration>Debug</BuildConfiguration>
<CompressContent>false</CompressContent>
- <RootDirectory>C:\Users\chaos\Documents\Git\Blaze-Brigade\src\Blaze-Brigade\Blaze_BrigadeContent\</RootDirectory>
- <LoggerRootDirectory>C:\Users\chaos\Documents\Git\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\</LoggerRootDirectory>
- <IntermediateDirectory>C:\Users\chaos\Documents\Git\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\obj\x86\Debug\</IntermediateDirectory>
- <OutputDirectory>C:\Users\chaos\Documents\Git\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\</OutputDirectory>
+ <RootDirectory>C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_BrigadeContent\</RootDirectory>
+ <LoggerRootDirectory>C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\</LoggerRootDirectory>
+ <IntermediateDirectory>C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\obj\x86\Debug\</IntermediateDirectory>
+ <OutputDirectory>C:\Users\Susan\Documents\GitHub\Blaze-Brigade\src\Blaze-Brigade\Blaze_Brigade\bin\x86\Debug\Content\</OutputDirectory>
</Settings>
<Assemblies>
<Assembly>
@@ -58,7 +58,7 @@
</Assembly>
<Assembly>
<Key>C:\WINDOWS\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
- <Value>2016-10-18T10:51:30.2111439-04:00</Value>
+ <Value>2016-10-18T11:11:33.4375035-04:00</Value>
</Assembly>
</Assemblies>
</Asset>
diff --git a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index e8f10aa3a2946ea2cf16da7d3d4380a5ddbdfcac..58653763a1373a2c421d44efb806e29f314df9d9 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/src/Blaze-Brigade/Blaze_Brigade/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/Game Map.png b/src/Blaze-Brigade/Blaze_BrigadeContent/Game Map.png
index cad10bb524da5d5b88b3165a4a43e6d9bc328d33..873ad2246ce38c10733fa166365061ae2a57fc24 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/Game Map.png and b/src/Blaze-Brigade/Blaze_BrigadeContent/Game Map.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/Blaze_BrigadeContent.contentprojResolveAssemblyReference.cache b/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/Blaze_BrigadeContent.contentprojResolveAssemblyReference.cache
index 1029c5050cf912cd1df227122028b349778516dc..9ca874294c33366a5058c57249ba5d3a8412bbc5 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/Blaze_BrigadeContent.contentprojResolveAssemblyReference.cache and b/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/Blaze_BrigadeContent.contentprojResolveAssemblyReference.cache differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 7a71c0332faaa20ae0fa4f18772e58656d64a3d1..eeeccce2eb4a97591a40075c167a5b8121d4a768 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/src/Blaze-Brigade/Blaze_BrigadeContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ