diff --git a/src/Blaze-Brigade/Blaze_Brigade/Animation.cs b/src/Blaze-Brigade/Blaze_Brigade/Animation.cs
index ae2622769ca595c92b824aa59234671801025422..0085856246efe0712c922c8fbf34c8db51beff7b 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Animation.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Animation.cs
@@ -7,7 +7,7 @@ namespace View
/// <summary>
/// Static class containing all animation methods
/// </summary>
- class Animation
+ public class Animation
{
/**
Animates attack of unit in specified direction. The animation consists of moving 10 pixels towards that direction, then moving back to original location.
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Archer.cs b/src/Blaze-Brigade/Blaze_Brigade/Archer.cs
index 435b2195905db1f94a00b0377d42386c0a8451de..4e9f57b4d8ab3e597cb18cfb0047ff34e84c28e5 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Archer.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Archer.cs
@@ -10,7 +10,7 @@ namespace Model
/// The Archer model class, extends Unit
/// This unit has a high skill and speed, and excels in dealing accurate ranged, high critical, physical attacks, but suffers from overall defense against physical attacks.
/// </summary>
- class Archer : Unit
+ public class Archer : Unit
{
/**
Sets and returns whether or not unit is alive
diff --git a/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs b/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs
index a6adee6e21bf6f2ed8c61ee6ae96e0513fee3a88..ee673db3aa8703962247c7a4beae1ff691b9dfb6 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs
@@ -8,7 +8,7 @@
* This class represents a melee weapon.
* It implements the Weapon interface.
*/
- class BronzeSword : Weapon
+ public class BronzeSword : Weapon
{
private weaponType weapType; // weapon type
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Button.cs b/src/Blaze-Brigade/Blaze_Brigade/Button.cs
index fae65fbd31da4d48788037f0fe392a7672ffdb04..9ade65301f6270f203f4af8c9a2942c60a0cb94d 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Button.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Button.cs
@@ -8,7 +8,7 @@ namespace View
/// <summary>
/// Buttons for the drop down menu buttons when selecting units
/// </summary>
- class Button
+ public class Button
{
private ButtonType buttonType; // holds the button type
private Vector2 pixelCoordinates; // holds the coordinates of the menu button in question
@@ -100,7 +100,7 @@ namespace View
/**
Enumerated list for the possible button types
*/
- enum ButtonType
+ public enum ButtonType
{
Attack,
AttackConfirm,
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Camera.cs b/src/Blaze-Brigade/Blaze_Brigade/Camera.cs
index c294a6ddeb72fb12382fb1b76a0901512a9137b1..2ab7c7407d538d12ded45957de6fdb4abdd53c5c 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Camera.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Camera.cs
@@ -5,7 +5,7 @@ namespace View
/// <summary>
/// Camera class for making the scrollable camera
/// </summary>
- class Camera
+ public class Camera
{
/**
Sets and gets the camera position.
diff --git a/src/Blaze-Brigade/Blaze_Brigade/DamageCalculations.cs b/src/Blaze-Brigade/Blaze_Brigade/DamageCalculations.cs
index 99c9f0f9f2e12b79288fdf844c6be983fc4b1ff8..9ba2614a9048ca28f88d0f74dd32c3664528cd4e 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/DamageCalculations.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/DamageCalculations.cs
@@ -5,7 +5,7 @@ namespace Model
/// <summary>
/// This class calculates all damage related calculations
/// </summary>
- static class DamageCalculations
+ public static class DamageCalculations
{
/**
passes in the 2 units, and a boolean on whether attack is physical (false). Damage is then calculated by taking attacker's Str/int,
diff --git a/src/Blaze-Brigade/Blaze_Brigade/DrawClass.cs b/src/Blaze-Brigade/Blaze_Brigade/DrawClass.cs
index 8298226e60a1e1a6f340e014fd39471201b1a118..e1c511aece19e8b1c178e1f6f35a3f5bb6b4eef6 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/DrawClass.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/DrawClass.cs
@@ -10,7 +10,7 @@ namespace View
/// <summary>
/// Draw Class containing all the different draw methods
/// </summary>
- static class DrawClass
+ public static class DrawClass
{
/**
Draw unit sprites, by taking in spriteBatch, and the Player who's units are to be drawn along with their healthbar. All the player's units will
diff --git a/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs b/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs
index 4ff97741117825d4ca75d67568c544902034a5e6..56db58ac386490fcafe8975dc506ac6a1ce46162 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs
@@ -8,7 +8,7 @@
* This class represents a magic based weapon.
* It implements the Weapon interface.
*/
- class Fireball : Weapon
+ public class Fireball : Weapon
{
private weaponType weapType;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/FireBlast.cs b/src/Blaze-Brigade/Blaze_Brigade/FireBlast.cs
index 5a16e296c6db541e9054b886e5e212d9d7f335af..b599cdcd10ac0e9999a6e42a2cc26c351de6c3fb 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/FireBlast.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/FireBlast.cs
@@ -8,7 +8,7 @@
* This class represents a magic based weapon.
* It implements the Weapon interface.
*/
- class Fireblast : Weapon
+ public class Fireblast : Weapon
{
private weaponType weapType;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index 813340fcfb706bb1eeda0a468b399ba66596dbb5..f8023208ae1aec06e30b5ae13c0be504a4c6261a 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -484,7 +484,7 @@ namespace Controller
}
// method to return a unit: takes in unit type (warrior/mage/ranger), unit position, and which player's unit (since different model/colors)
- private Unit getNewUnit(UnitType unitType, Vector2 unitPosition, Player player)
+ public Unit getNewUnit(UnitType unitType, Vector2 unitPosition, Player player)
{
Button[] unitButtons = new Button[9];
unitButtons[0] = new Button(ButtonType.Attack, unitPosition, Content.Load<Texture2D>("attack"));
diff --git a/src/Blaze-Brigade/Blaze_Brigade/GameFunction.cs b/src/Blaze-Brigade/Blaze_Brigade/GameFunction.cs
index 997c2e88f1fbc7a9e7d6ccee9ff63f9df3f8bd72..d5840b9c3d17a54f0708cff349657ee8f3ecb2b3 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/GameFunction.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/GameFunction.cs
@@ -16,7 +16,7 @@ namespace Controller
/**
* This class holds useable functions in the scope of the entire gameplay. Such functions include updates to the Model. This is done through updating of the GameState or parameters passed into a function.
*/
- static class GameFunction
+ public static class GameFunction
{
/**
Returns a boolean value indicating whether or not the specified enemy unit is within attack range of the specified unit. \n\n
diff --git a/src/Blaze-Brigade/Blaze_Brigade/GameState.cs b/src/Blaze-Brigade/Blaze_Brigade/GameState.cs
index 4e2115e77ae0029ef6b6f2d206547a910a211315..4d18dc4697d8eb2d58e34d01b5e6730d82867608 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/GameState.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/GameState.cs
@@ -7,7 +7,7 @@ namespace Model
/// <summary>
/// This class holds states in the scope of the entire gameplay
/// </summary>
- static class GameState
+ public static class GameState
{
public static readonly int SCREEN_HEIGHT = 640;
public static readonly int SCREEN_WIDTH = 960;
@@ -171,7 +171,7 @@ namespace Model
/**
enumerated list for different possible Game States
*/
- enum GameMenuState
+ public enum GameMenuState
{
MainMenu, // menu screen
HowToPlay, // Instruction Screen 1
@@ -182,7 +182,7 @@ namespace Model
/**
enumerated list for what the current turn state is (per unit)
*/
- enum TurnState
+ public enum TurnState
{
Wait,
AttackMenu,
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Graph.cs b/src/Blaze-Brigade/Blaze_Brigade/Graph.cs
index a64f55b97f69b12c552c46f2ff3ad05d6d42db5d..15e62849387801a9d9e9adf712fcedc0f5d8f074 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Graph.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Graph.cs
@@ -11,7 +11,7 @@ namespace Model
* Programmatical representation of the map grid.
* Composed of Nodes that represent each tile on the grid.
*/
- class Graph
+ public class Graph
{
private Node[,] nodes;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/IronSword.cs b/src/Blaze-Brigade/Blaze_Brigade/IronSword.cs
index d0aecacf9c4830fe65d05d951f44fedbe352cf1e..1ef7f44e5cb639c3d040ad341a67074edca6f0f8 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/IronSword.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/IronSword.cs
@@ -8,7 +8,7 @@
* This class represents a melee weapon.
* It implements the Weapon interface.
*/
- class IronSword : Weapon
+ public class IronSword : Weapon
{
private weaponType weapType;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/LongBow.cs b/src/Blaze-Brigade/Blaze_Brigade/LongBow.cs
index 115c2446ac1802f61574f3290ce88e7b9a455f25..0747fd03fdf32b16098d038383fa6625b7189614 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/LongBow.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/LongBow.cs
@@ -8,7 +8,7 @@
* This class represents a ranged weapon.
* It implements the Weapon interface.
*/
- class LongBow : Weapon
+ public class LongBow : Weapon
{
private weaponType weapType;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Mage.cs b/src/Blaze-Brigade/Blaze_Brigade/Mage.cs
index 86e4de9b737f7d0580a196e7e195fc4f2d7dc05d..b7b814f707694338313638fdf80468d044fc75c7 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Mage.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Mage.cs
@@ -10,7 +10,7 @@ namespace Model
/// The Mage model class, extends Unit
/// \n This Unit has strong magical capabilities, and is capable of powerful ranged magic attacks, but makes up with poor physical stats
/// </summary>
- class Mage : Unit
+ public class Mage : Unit
{
/**
Sets and returns whether or not unit is alive
diff --git a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
index f1ee92299835103212c6373319c6e00a3918da10..3d79b436267fcc199fcad960d8e4db1bd9604a3b 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
@@ -17,7 +17,7 @@ namespace Controller
* Additionally, it updates GameState (in the Model) in order to reflect an update in the game's current status based upon specific conditions in addition to mouse input. \n
* All of the mouse handling is done within one function, the updateMouse() function, as mouse handling only consists of checking conditionals to perform calls to the GameFunction (which performs further actions) or an update in the GameState.
*/
- static class MouseHandler
+ public static class MouseHandler
{
private static MouseState lastMouseState; // this state allows for detection of a single click (not click and hold)
private static MouseState currentMouseState;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Node.cs b/src/Blaze-Brigade/Blaze_Brigade/Node.cs
index bfd60d04c5de05fbc38b777a6c508fd7c490623a..b92cedcd5f776492e79d8075150b6d84e08d22a1 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Node.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Node.cs
@@ -10,7 +10,7 @@ namespace Model
* Programmatical representation of a tile on the map grid.
* Holds information pertaining to the tile.
*/
- class Node
+ public class Node
{
/**
Index for hindrance of the movability of a unit.
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Player.cs b/src/Blaze-Brigade/Blaze_Brigade/Player.cs
index f940d2e16b1fc036540ffd1ddc5d4dce54e46d04..f43cd2a9509224da8d8c9c385e604bab79d36fcf 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Player.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Player.cs
@@ -9,7 +9,7 @@ namespace Model
/**
* Holds information pertaining to a Player in the game.
*/
- class Player
+ public class Player
{
private LinkedList<Unit> ownedUnits; // units that the player owns
// if a unit dies, REMOVE from this list and put into a "dead" pile.
diff --git a/src/Blaze-Brigade/Blaze_Brigade/RunProgram.cs b/src/Blaze-Brigade/Blaze_Brigade/RunProgram.cs
index 8d79a95d1afc74fff7ed7473207318ede630736d..eee29b8df3b8d7e4bfcd59f048a96f3dfc4fb782 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/RunProgram.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/RunProgram.cs
@@ -3,7 +3,7 @@ using System;
namespace Controller
{
#if WINDOWS || XBOX
- static class Program
+ public static class Program
{
/// <summary>
/// The main entry point for the application.
diff --git a/src/Blaze-Brigade/Blaze_Brigade/ShortBow.cs b/src/Blaze-Brigade/Blaze_Brigade/ShortBow.cs
index a40d20f5190b45e86adb0f3ce595fe5252424b15..35c88b4a4b5baf395225e40651a6ee0f8164eb8d 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/ShortBow.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/ShortBow.cs
@@ -8,7 +8,7 @@
* This class represents a ranged weapon.
* It implements the Weapon interface.
*/
- class ShortBow : Weapon
+ public class ShortBow : Weapon
{
private weaponType weapType;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs b/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs
index 971cfb183bded49af2f7ce858c4c2adefcf50fdb..c3479a0f30e1611c8fc14a54e771e26c0ff7cbac 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs
@@ -6,7 +6,7 @@ namespace View
/// <summary>
/// Sound class containing methods to play all different sounds to be used in the game
/// </summary>
- static class Sounds
+ public static class Sounds
{
/**
This method takes in a unit, and plays an attacking sound corresponding to the unit's weapon. The weapon sounds include Sword, Bow, and Magic
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Unit.cs b/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
index 2bccae716409542541300d990b4cfddf1dfd8210..c58f203cdbf18a9289b39c31e690cf69a117c53e 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
@@ -17,7 +17,7 @@ namespace Model
* This is the interface for the 3 playable unit classes, where the only
differences in the units will be their statistics and graphical assets
*/
- interface Unit
+ public interface Unit
{
#region Stats
/**
@@ -204,6 +204,6 @@ namespace Model
/**
defines the possible classes of a unit
*/
- enum UnitType { Warrior, Archer, Mage };
- enum Direction { Down, Left, Right, Up };
+ public enum UnitType { Warrior, Archer, Mage };
+ public enum Direction { Down, Left, Right, Up };
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs b/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
index 538edfe3eeb82ed5750d8e686a9ae56c2ad75d50..51395c9ff1b2422722b93ba2c4c5ffe885dc21a7 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
@@ -10,7 +10,7 @@ namespace Model
/// The Warrior model class, extends Unit
/// This unit excels in dealing melee physical damage, with a high defense, but suffers from lack of any magical attack or resistance
/// </summary>
- class Warrior : Unit
+ public class Warrior : Unit
{
/**
Sets and returns whether or not unit is alive
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs b/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
index 654aa311ca69c1a88a0e5de3e07fe7ff9dad18b0..49cb63e67ecbe2e60cb26390c0124086896e1973 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
@@ -10,7 +10,7 @@ namespace Model
* This is the interface to be used when creating new weapons.
* The only differences in weapons will be their statistics.
*/
- interface Weapon
+ public interface Weapon
{
/**
Returns the name of the weapon.
@@ -44,5 +44,5 @@ namespace Model
}
//Enum for different weapon types
- enum weaponType { Sword, Bow, Magic };
+ public enum weaponType { Sword, Bow, Magic };
}
diff --git a/src/BlazeBrigadeTest/GameFunctionTest.cs b/src/BlazeBrigadeTest/GameFunctionTest.cs
index 87cab9dc3d46ea0ea13fe720813773a13f1d7459..4a65afefd94d6941de780eae885846cab17d1214 100644
--- a/src/BlazeBrigadeTest/GameFunctionTest.cs
+++ b/src/BlazeBrigadeTest/GameFunctionTest.cs
@@ -1,6 +1,8 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Blaze_Brigade;
+using Controller;
+using Model;
+using Microsoft.Xna.Framework;
namespace ControllerTest
{
@@ -10,10 +12,8 @@ namespace ControllerTest
[TestMethod]
public void isEnemyUnitInRange_WhenEnemyInRange_ShouldReturnTrue()
{
- //Unit unit = getNewUnit(UnitType.Warrior, new Vector2(17 * 32f, 15 * 32f), player1);
- //Unit enemyUnit = getNewUnit(UnitType.Warrior, new Vector2(18 * 32f, 15 * 32f), player2);
-
-
+ Unit unit = Controller.Game.Instance.getNewUnit(UnitType.Warrior, new Vector2(17 * 32f, 15 * 32f), new Player());
+ Unit enemyUnit = Controller.Game.Instance.getNewUnit(UnitType.Warrior, new Vector2(18 * 32f, 15 * 32f), new Player());
}
}
}
diff --git a/src/BlazeBrigadeTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/BlazeBrigadeTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index cb2a331662311cf52ae5cd41cb65ad266d5d03ca..91e9b2e7010c4a1762f407bed8e391728b733ac5 100644
Binary files a/src/BlazeBrigadeTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/src/BlazeBrigadeTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ