diff --git a/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj b/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj
index 7fa863957fa955bd5a5b3371ed48efebe06bb80b..8432ebf64dbf6432dfc3cacceaf39747760c24b8 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj
+++ b/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj
@@ -126,25 +126,27 @@
<Content Include="GameThumbnail.png">
<XnaPlatformSpecific>true</XnaPlatformSpecific>
</Content>
+ <None Include="Resources\warrior_stats.png" />
+ <None Include="Resources\mage_stats.png" />
+ <None Include="Resources\2warrior_stats.png" />
+ <None Include="Resources\2mage_stats.png" />
+ <None Include="Resources\2archer_stats.png" />
+ <None Include="Resources\archer_stats.png" />
+ <None Include="Resources\confirm_attack.png" />
+ <None Include="Resources\attack_confirm.png" />
<None Include="Resources\warrior_attack.png" />
<None Include="Resources\mage_attack.png" />
<None Include="Resources\archer_attack.png" />
- <None Include="Resources\2warrior_stats.png" />
<None Include="Resources\2warrior_attack.png" />
<None Include="Resources\2warrior_art.png" />
<None Include="Resources\2warrior.png" />
- <None Include="Resources\2mage_stats.png" />
<None Include="Resources\2mage_attack.png" />
<None Include="Resources\2mage_art.png" />
<None Include="Resources\2mage.png" />
- <None Include="Resources\2archer_stats.png" />
<None Include="Resources\2archer_attack.png" />
<None Include="Resources\2archer.png" />
<None Include="Resources\mage.png" />
- <None Include="Resources\mage_stats.png" />
<None Include="Resources\archer.png" />
- <None Include="Resources\archer_stats.png" />
- <None Include="Resources\warrior_stats.png" />
<None Include="Resources\instructions3.png" />
<None Include="Resources\instructions2.png" />
<None Include="Resources\instructions1.png" />
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj.Debug.cachefile b/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj.Debug.cachefile
index ca10893f64f218d6c6afdf354be066d2134ffd51..eb4ef8122cde2b2dc951926e6f7198ced073dd71 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj.Debug.cachefile
+++ b/src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj.Debug.cachefile
@@ -29,3 +29,5 @@ Content\2warrior_stats.xnb
Content\archer_attack.xnb
Content\mage_attack.xnb
Content\warrior_attack.xnb
+Content\attack_confirm.xnb
+Content\confirm_attack.xnb
diff --git a/src/Blaze-Brigade/Blaze_Brigade/BronzeBow.cs b/src/Blaze-Brigade/Blaze_Brigade/BronzeBow.cs
index 5e1beb15c5be3c2168a1f9a7834169a9f9222146..1a57e9a2447d8def426d7af6fcf96525e2141ef7 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/BronzeBow.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/BronzeBow.cs
@@ -4,52 +4,27 @@ using System.Linq;
using System.Text;
namespace Model
-{
- class BronzeBow : Weapon
{
- private int minRange;
- private int maxRange;
- private int modStr;
- private int modSkill;
- private int modInt;
- private int[] range;
-
- public BronzeBow()
- {
- minRange = 2;
- maxRange = 2;
- modStr = 3;
- modSkill = 15;
- modInt = 0;
- range = new int[2];
- range[0] = minRange;
- range[1] = maxRange;
- }
-
- public int getInt()
- {
- return modInt;
- }
-
-
- public int[] getRange()
+ class BronzeBow : Weapon
{
- return range;
+ private int minRange;
+ private int maxRange;
+ public int modStr { get; }
+ public int modInt { get; }
+ public int modSkill { get; }
+ public string name { get; }
+ public int[] range { get; }
+
+ public BronzeBow()
+ {
+ modStr = 3;
+ modSkill = 10;
+ modInt = 0;
+ range = new int[2] { 2, 2 };
+ name = "Bronze Bow";
+ }
}
+ }
- public int getSkill()
- {
- return modSkill;
- }
- public int getStrength()
- {
- return modStr;
- }
- public string getName()
- {
- return "Bronze Bow";
- }
- }
-}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs b/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs
index 62f5bb26c21d9056e24a3f37d4f52a89adbaff6c..e75d5cd8e55a91a26977a57aa008a4a1f720d66a 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/BronzeSword.cs
@@ -8,52 +8,19 @@ namespace Model
{
private int minRange;
private int maxRange;
- private int modStr;
- private int modSkill;
- private int modInt;
- private int[] range;
-
-
-
+ public int modStr { get; }
+ public int modInt { get; }
+ public int modSkill { get; }
+ public string name { get; }
+ public int[] range { get; }
public BronzeSword()
{
- minRange = 1;
- maxRange = 1;
modStr = 5;
- modSkill = 10;
+ modSkill = 5;
modInt = 0;
- range = new int[2];
- range[0] = minRange;
- range[1] = maxRange;
- }
-
- public int[] getRange()
- {
- return range;
+ range = new int[2] { 1, 1 };
+ name = "Bronze Sword";
}
-
- public int getStrength()
- {
- return modStr;
- }
-
- public int getSkill()
- {
- return modSkill;
- }
-
- public int getInt()
- {
- return modInt;
- }
- // perhaps put this in visual for inventory?
- public string getName()
- {
- return "Bronze Sword";
- }
-
-
-
}
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs b/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs
index b6e556833499a0d5ab3ad900b9d85f680a73e5f8..9d87188584aabc43fcfdb03301d3060e3187bbd3 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/FireBall.cs
@@ -9,46 +9,22 @@ namespace Model
{
private int minRange;
private int maxRange;
- private int modStr;
- private int modSkill;
- private int modInt;
- private int[] range;
+ public int modStr { get; }
+ public int modInt { get; }
+ public int modSkill { get; }
+ public string name { get; }
+ public int[] range { get; }
public Fireball()
{
- minRange = 1;
- maxRange = 2;
- modStr = 0;
- modSkill = 5;
+ modStr = 1;
+ modSkill = 2;
modInt = 5;
- range = new int[2];
- range[0] = minRange;
- range[1] = maxRange;
- }
-
- public int getInt()
- {
- return modInt;
- }
-
- public string getName()
- {
- return "Fireball";
+ range = new int[2] { 1, 2 };
+ name = "Fireball";
}
+ }
+}
- public int[] getRange()
- {
- return range;
- }
- public int getSkill()
- {
- return modSkill;
- }
- public int getStrength()
- {
- return modStr;
- }
- }
-}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index 320ba1a54d556f75699327994084953e9eab8043..01dd8e01c923b63cbb6d59998c29c44c6f53475c 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -318,7 +318,7 @@ namespace Controller
spriteBatch.Draw(unit.getCharAttackInfo(), attackInfoLocation2, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground texture for current character
spriteBatch.Draw(attackedUnit.getCharAttackInfo(), Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground for unit being attacked
}
- spriteBatch.Draw(confirmButton.getImage(), confirmButton.getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0f);
+ spriteBatch.Draw(confirmButton.getImage(), confirmButton.getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f);
}
#endregion
}
@@ -328,16 +328,23 @@ namespace Controller
//if player 1, prints info screen for player 1
if ((GameState.currentPlayer == player1)&&(!GameState.attackConfirmOpen))
{
- Vector2 statLocation = new Vector2(180, 533); //starting location for first stat
- Vector2 increment = new Vector2(0, 11.5f); //increment downwards for each stat
+ Vector2 statLocation = new Vector2(170, 535); //starting location for first stat
+ Vector2 statLocation2 = new Vector2(235, 535); //starting location for first stat
+ Vector2 increment = new Vector2(0, 20); //increment downwards for each stat
Vector2 infoLocation = new Vector2(20, 513);
- for (int k = 0; k < 7; k++) //for 6 stats - str, int, skill, speed, def, res
+ for (int k = 0; k < 4; k++) //for stats - level, str, int, skill,
{
spriteBatch.DrawString(font, unit.getStats(k).ToString(), statLocation, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
statLocation = statLocation + increment; //increment downwards
}
- spriteBatch.DrawString(largeFont, unit.Hp.ToString(), new Vector2(249, 512), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
+ for (int t = 4; t < 7; t++) //for stats - speed, defense, resistance
+ {
+ spriteBatch.DrawString(font, unit.getStats(t).ToString(), statLocation2, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
+ statLocation2 = statLocation2 + increment; //increment downwards
+ }
+
+ spriteBatch.DrawString(largeFont, unit.Hp.ToString(), new Vector2(278, 532), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
spriteBatch.Draw(unit.getCharInfo(), infoLocation, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charInfoBackground texture
}
@@ -347,15 +354,22 @@ namespace Controller
if (!GameState.attackConfirmOpen)
{
Vector2 statLocation = new Vector2(795, 533); //starting location for first stat
- Vector2 increment = new Vector2(0, 11.5f); //increment downwards for each stat
+ Vector2 statLocation2 = new Vector2(860, 533); //starting location for first stat
+ Vector2 increment = new Vector2(0, 20); //increment downwards for each stat
Vector2 infoLocation = new Vector2(635, 513);
- for (int k = 0; k < 7; k++) //for 6 stats - str, int, skill, speed, def, res
- {
- spriteBatch.DrawString(font, unit.getStats(k).ToString(), statLocation, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
- statLocation = statLocation + increment; //increment downwards
- }
- spriteBatch.DrawString(largeFont, unit.Hp.ToString(), new Vector2(864, 512), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
+ for (int k = 0; k < 4; k++) //for stats - level, str, int, skill,
+ {
+ spriteBatch.DrawString(font, unit.getStats(k).ToString(), statLocation, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
+ statLocation = statLocation + increment; //increment downwards
+ }
+ for (int t = 4; t < 7; t++) //for stats - speed, defense, resistance
+ {
+ spriteBatch.DrawString(font, unit.getStats(t).ToString(), statLocation2, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
+ statLocation2 = statLocation2 + increment; //increment downwards
+ }
+
+ spriteBatch.DrawString(largeFont, unit.Hp.ToString(), new Vector2(893, 532), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
spriteBatch.Draw(unit.getCharInfo(), infoLocation, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charInfoBackground texture
}
}
@@ -380,7 +394,7 @@ namespace Controller
Button moveButton = new Button(ButtonType.Move, unitPosition, Content.Load<Texture2D>("move"));
Button itemButton = new Button(ButtonType.Items, unitPosition, Content.Load<Texture2D>("items")); ;
Button waitButton = new Button(ButtonType.Wait, unitPosition, Content.Load<Texture2D>("wait")); ;
- Button attackConfirmButton = new Button(ButtonType.AttackConfirm, new Vector2(425, 250), Content.Load<Texture2D>("attack"));
+ Button attackConfirmButton = new Button(ButtonType.AttackConfirm, new Vector2(328, 130), Content.Load<Texture2D>("confirm_attack"));
if (player == 1)
{
@@ -388,6 +402,8 @@ namespace Controller
{
Unit unit = new Warrior(Content.Load<Texture2D>("warrior"), attackButton, moveButton,
itemButton, waitButton, attackConfirmButton, Content.Load<Texture2D>("warrior_stats"), Content.Load<Texture2D>("warrior_attack"), unitPosition, 1);
+ Weapon startingWeap = new BronzeSword();
+ unit.equippedWeapon = startingWeap;
graph.getNode(unitPosition).unitOnNode = (unit);
return unit;
}
@@ -398,6 +414,8 @@ namespace Controller
{
Unit unit = new Warrior(Content.Load<Texture2D>("2warrior"), attackButton, moveButton,
itemButton, waitButton, attackConfirmButton, Content.Load<Texture2D>("2warrior_stats"), Content.Load<Texture2D>("2warrior_attack"), unitPosition, 2);
+ Weapon startingWeap = new BronzeSword();
+ unit.equippedWeapon = startingWeap;
graph.getNode(unitPosition).unitOnNode = (unit);
return unit;
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
index 3373bce4ba0d611b4e7afb82dbdafd1a36419e69..913ed9976ffcd33c8d936e52efcd8d693935ceed 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
@@ -316,7 +316,7 @@ namespace Controller
int ButtonX = (int)unit.getButtonOfType(ButtonType.AttackConfirm).getPixelCoordinates().X;
int ButtonY = (int)unit.getButtonOfType(ButtonType.AttackConfirm).getPixelCoordinates().Y;
- if (ButtonX <= clickX && clickX < ButtonX + 128 && ButtonY <= clickY && clickY < ButtonY + 32)
+ if (ButtonX+90 <= clickX && clickX < ButtonX + 214 && ButtonY+127 <= clickY && clickY < ButtonY + 172)
{
if (GameState.attackConfirmOpen)
{
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs b/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs
index 88d3e0be06b7805c6bfe1f481d16faf41b0a28e5..1b5b60f9bd6dbafec0901d57f7e7975834702df6 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Resource1.Designer.cs
@@ -190,6 +190,16 @@ namespace Blaze_Brigade {
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap attack_confirm {
+ get {
+ object obj = ResourceManager.GetObject("attack_confirm", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -200,6 +210,16 @@ namespace Blaze_Brigade {
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap confirm_attack {
+ get {
+ object obj = ResourceManager.GetObject("confirm_attack", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resource1.resx b/src/Blaze-Brigade/Blaze_Brigade/Resource1.resx
index e0fdc81742b285fc9b56320545dd9d06e7d84295..ff76eb1b07691a9bebd67bfb98713b791fe12dbf 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Resource1.resx
+++ b/src/Blaze-Brigade/Blaze_Brigade/Resource1.resx
@@ -160,48 +160,54 @@
<data name="archer_attack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\archer_attack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="archer_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\archer_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="mage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mage_attack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mage_attack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="mage_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mage_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="warrior_attack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\warrior_attack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="warrior_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\warrior_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="_2archer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\2archer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_2archer_attack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\2archer_attack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="_2archer_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\2archer_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="_2mage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\2mage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_2mage_attack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\2mage_attack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="_2mage_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\2mage_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="_2warrior" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\2warrior.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_2warrior_attack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\2warrior_attack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="archer_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\archer_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="attack_confirm" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\attack_confirm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="confirm_attack" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\confirm_attack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="mage_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mage_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="warrior_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\warrior_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="_2archer_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\2archer_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="_2mage_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\2mage_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="_2warrior_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\2warrior_stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/2archer_stats.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/2archer_stats.png
index b0b724d3c28dd6e8f34098fd4c674b72c83cb01a..79b668ab06f59c6c1d8ad3be91f224141246f4c3 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/Resources/2archer_stats.png and b/src/Blaze-Brigade/Blaze_Brigade/Resources/2archer_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/2mage_stats.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/2mage_stats.png
index 799cb61cf141c92d97cdb8b650a8bb07cce07e74..c407ccc722b2a797a4d9383f2b17b36d60a5913b 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/Resources/2mage_stats.png and b/src/Blaze-Brigade/Blaze_Brigade/Resources/2mage_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/2warrior_stats.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/2warrior_stats.png
index 56210cf3d8bc8d4bc536c204cd537b92319d1a5b..9f86a7a12ff1d9d8c839945ec718d97f44d5b9a0 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/Resources/2warrior_stats.png and b/src/Blaze-Brigade/Blaze_Brigade/Resources/2warrior_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/archer_stats.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/archer_stats.png
index 617714e67d06ff7a77ed8cfc6b4ac0adc7ff29f6..79e29a8dd5d5fe6c9dcc336079f9ec67650b68ad 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/Resources/archer_stats.png and b/src/Blaze-Brigade/Blaze_Brigade/Resources/archer_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/attack_confirm.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/attack_confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c87afec3e33b91270496b8b9cc6a2efe7da000c
Binary files /dev/null and b/src/Blaze-Brigade/Blaze_Brigade/Resources/attack_confirm.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/confirm_attack.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/confirm_attack.png
new file mode 100644
index 0000000000000000000000000000000000000000..a237a4c7b19fca6887596279ea426bf92388e65b
Binary files /dev/null and b/src/Blaze-Brigade/Blaze_Brigade/Resources/confirm_attack.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/mage_stats.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/mage_stats.png
index fb0d43237c5f9556b491f72071055c9d6c993e8a..78948eef31b85eba03f7f67571f2273994165fbb 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/Resources/mage_stats.png and b/src/Blaze-Brigade/Blaze_Brigade/Resources/mage_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Resources/warrior_stats.png b/src/Blaze-Brigade/Blaze_Brigade/Resources/warrior_stats.png
index 3b5e408ab1367668ff09da6d3e55b68c292387f7..2f3a019dad74d3f11bfa1e0a3b2b4a3ab1a41eea 100644
Binary files a/src/Blaze-Brigade/Blaze_Brigade/Resources/warrior_stats.png and b/src/Blaze-Brigade/Blaze_Brigade/Resources/warrior_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Unit.cs b/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
index ced93d7e257947e303d721d86c652299ddfa24ad..14946ffdb2700f29922030422f6d2bfcb3ff8596 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
@@ -22,8 +22,7 @@ namespace Model
int Level { get; set; } // returns and sets unit's level
int getMovability(); // returns the unit's movability (number of spaces the unit can move in one turn)
int getStats(int i); // returns stat located at i (in order from 0-6: lvl, str, mag, skill, spd, def, res)
-
- void setEquippedWeapon(Weapon w); // sets the unit's currently equipped weapon
+ Weapon equippedWeapon { get; set; } // returns weapon the unit is currently equipping
//void setEquipableWeapons(Weapon add); // need to update the weapon array, put new weapon into it
bool isButtonActive(ButtonType buttonType); // indicates whether a button has already been previously selected or not
void setButtonCoordinates(Vector2 pixelCoordinates); // sets the coordinates of menu buttons
@@ -39,7 +38,6 @@ namespace Model
Button getButtonOfType(ButtonType buttonType);
Rectangle getCurrentFrame(); // returns the current sprite frame in animation sequence
Weapon[] getEquipableWeapons(); // returns array of equipable weapons
- Weapon getEquippedWeapon(); // returns weapon the unit is currently equipping
UnitType getClass(); // returns unit's class (warrior, mage, archer)
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs b/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
index 819aada0d3ce289edf805f793c2add09e2f8de22..31026be3ba76be859e8cd8fa1539cedab9ec720a 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
@@ -14,16 +14,16 @@ namespace Model
{
public bool Alive { get; set; }
public int Hp { get; set; }
- public int Str { get; set; }
- public int Int { get; set; }
- public int Skill { get; set; }
+ private int str;
+ private int intelligence;
+ private int skill;
public int Speed { get; set; }
public int Def { get; set; }
public int Res { get; set; }
public int Level { get; set; }
private readonly int movability = 4; // all warriors will have 4 movability
private Weapon[] equipableWeapons;
- private Weapon equippedWeapon;
+ public Weapon equippedWeapon { get; set; }
private Texture2D spriteImage;
private Vector2 pixelCoordinates;
private Tuple<int, int> position;
@@ -67,6 +67,45 @@ namespace Model
Res = 4;
}
+ //sets and gets unit effective str
+ public int Str
+ {
+ get
+ {
+ return str + equippedWeapon.modStr;
+ }
+ set
+ {
+ str = value;
+ }
+ }
+
+ //sets and gets unit effective int
+ public int Int
+ {
+ get
+ {
+ return intelligence + equippedWeapon.modInt;
+ }
+ set
+ {
+ intelligence = value;
+ }
+ }
+
+ //sets and gets unit effective skill
+ public int Skill
+ {
+ get
+ {
+ return skill + equippedWeapon.modSkill;
+ }
+ set
+ {
+ skill = value;
+ }
+ }
+
public int getMovability()
{
return movability;
@@ -91,11 +130,6 @@ namespace Model
return equipableWeapons;
}
- public Weapon getEquippedWeapon()
- {
- return equippedWeapon;
- }
-
public UnitType getClass()
{
return UnitType.Warrior;
@@ -184,11 +218,6 @@ namespace Model
}
}
- public void setEquippedWeapon(Weapon w)
- {
- equippedWeapon = w;
- }
-
public Button[] getButtons()
{
return buttons;
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs b/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
index 04a8f648418c2134723e8c66c37c7d468bb368c4..f02612294fc1c1165b8a40a1ceaaaa07c9debbce 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Weapon.cs
@@ -7,10 +7,10 @@ namespace Model
{
interface Weapon
{
- int[] getRange(); // get the range of the weapon, i believe that using Unit.equippedWeapon
- int getStrength();
- int getSkill();
- int getInt();
- String getName(); // for inventory
+ String name { get; } // for inventory
+ int modStr { get; } //weapon strength
+ int modInt { get; } //weapon int
+ int modSkill { get; } //weapon skill
+ int[] range { get; } //weapon range[minimum range, maximum range]
}
}
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/2archer_stats.png b/src/Blaze-Brigade/Blaze_BrigadeContent/2archer_stats.png
index b0b724d3c28dd6e8f34098fd4c674b72c83cb01a..79b668ab06f59c6c1d8ad3be91f224141246f4c3 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/2archer_stats.png and b/src/Blaze-Brigade/Blaze_BrigadeContent/2archer_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/2mage_stats.png b/src/Blaze-Brigade/Blaze_BrigadeContent/2mage_stats.png
index 799cb61cf141c92d97cdb8b650a8bb07cce07e74..c407ccc722b2a797a4d9383f2b17b36d60a5913b 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/2mage_stats.png and b/src/Blaze-Brigade/Blaze_BrigadeContent/2mage_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/2warrior_stats.png b/src/Blaze-Brigade/Blaze_BrigadeContent/2warrior_stats.png
index 56210cf3d8bc8d4bc536c204cd537b92319d1a5b..9f86a7a12ff1d9d8c839945ec718d97f44d5b9a0 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/2warrior_stats.png and b/src/Blaze-Brigade/Blaze_BrigadeContent/2warrior_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/Blaze_BrigadeContent.contentproj b/src/Blaze-Brigade/Blaze_BrigadeContent/Blaze_BrigadeContent.contentproj
index 429c9b6d93c1ab2736dc078faecd1d0c4f51c0fe..3cda57cb96072da1f5f7743a18b35c200d3b70a6 100644
--- a/src/Blaze-Brigade/Blaze_BrigadeContent/Blaze_BrigadeContent.contentproj
+++ b/src/Blaze-Brigade/Blaze_BrigadeContent/Blaze_BrigadeContent.contentproj
@@ -93,13 +93,6 @@
<SubType>Designer</SubType>
</Compile>
</ItemGroup>
- <ItemGroup>
- <Compile Include="warrior_stats.png">
- <Name>warrior_stats</Name>
- <Importer>TextureImporter</Importer>
- <Processor>TextureProcessor</Processor>
- </Compile>
- </ItemGroup>
<ItemGroup>
<Compile Include="PixelFontLarge.spritefont">
<Name>PixelFontLarge</Name>
@@ -136,113 +129,134 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="mage_stats.png">
- <Name>mage_stats</Name>
+ <Compile Include="archer.png">
+ <Name>archer</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="archer_stats.png">
- <Name>archer_stats</Name>
+ <Compile Include="mage.png">
+ <Name>mage</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="archer.png">
- <Name>archer</Name>
+ <Compile Include="2archer.png">
+ <Name>2archer</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="mage.png">
- <Name>mage</Name>
+ <Compile Include="2archer_attack.png">
+ <Name>2archer_attack</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2archer.png">
- <Name>2archer</Name>
+ <Compile Include="2mage.png">
+ <Name>2mage</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2archer_attack.png">
- <Name>2archer_attack</Name>
+ <Compile Include="2mage_attack.png">
+ <Name>2mage_attack</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2archer_stats.png">
- <Name>2archer_stats</Name>
+ <Compile Include="2warrior.png">
+ <Name>2warrior</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2mage.png">
- <Name>2mage</Name>
+ <Compile Include="2warrior_attack.png">
+ <Name>2warrior_attack</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2mage_attack.png">
- <Name>2mage_attack</Name>
+ <Compile Include="archer_attack.png">
+ <Name>archer_attack</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2mage_stats.png">
- <Name>2mage_stats</Name>
+ <Compile Include="mage_attack.png">
+ <Name>mage_attack</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2warrior.png">
- <Name>2warrior</Name>
+ <Compile Include="warrior_attack.png">
+ <Name>warrior_attack</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2warrior_attack.png">
- <Name>2warrior_attack</Name>
+ <Compile Include="attack_confirm.png">
+ <Name>attack_confirm</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="2warrior_stats.png">
- <Name>2warrior_stats</Name>
+ <Compile Include="confirm_attack.png">
+ <Name>confirm_attack</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="archer_attack.png">
- <Name>archer_attack</Name>
+ <Compile Include="archer_stats.png">
+ <Name>archer_stats</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="mage_attack.png">
- <Name>mage_attack</Name>
+ <Compile Include="2archer_stats.png">
+ <Name>2archer_stats</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
</ItemGroup>
<ItemGroup>
- <Compile Include="warrior_attack.png">
- <Name>warrior_attack</Name>
+ <Compile Include="2mage_stats.png">
+ <Name>2mage_stats</Name>
+ <Importer>TextureImporter</Importer>
+ <Processor>TextureProcessor</Processor>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="2warrior_stats.png">
+ <Name>2warrior_stats</Name>
+ <Importer>TextureImporter</Importer>
+ <Processor>TextureProcessor</Processor>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="mage_stats.png">
+ <Name>mage_stats</Name>
+ <Importer>TextureImporter</Importer>
+ <Processor>TextureProcessor</Processor>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="warrior_stats.png">
+ <Name>warrior_stats</Name>
<Importer>TextureImporter</Importer>
<Processor>TextureProcessor</Processor>
</Compile>
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFont.spritefont b/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFont.spritefont
index 7d73b053672634c197796c050ae7ccf25064714e..a3637c90ec54e95b413a2ee8b6536f539f098623 100644
--- a/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFont.spritefont
+++ b/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFont.spritefont
@@ -17,7 +17,7 @@ with.
Size is a float value, measured in points. Modify this value to change
the size of the font.
-->
- <Size>9</Size>
+ <Size>13</Size>
<!--
Spacing is a float value, measured in pixels. Modify this value to change
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFontLarge.spritefont b/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFontLarge.spritefont
index 2840938e857a193c44da862529303b2add203780..b5853966c6771a4067a8b75d5904dbb171300f62 100644
--- a/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFontLarge.spritefont
+++ b/src/Blaze-Brigade/Blaze_BrigadeContent/PixelFontLarge.spritefont
@@ -17,7 +17,7 @@ with.
Size is a float value, measured in points. Modify this value to change
the size of the font.
-->
- <Size>45</Size>
+ <Size>25</Size>
<!--
Spacing is a float value, measured in pixels. Modify this value to change
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/archer_stats.png b/src/Blaze-Brigade/Blaze_BrigadeContent/archer_stats.png
index 617714e67d06ff7a77ed8cfc6b4ac0adc7ff29f6..79e29a8dd5d5fe6c9dcc336079f9ec67650b68ad 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/archer_stats.png and b/src/Blaze-Brigade/Blaze_BrigadeContent/archer_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/attack_confirm.png b/src/Blaze-Brigade/Blaze_BrigadeContent/attack_confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c87afec3e33b91270496b8b9cc6a2efe7da000c
Binary files /dev/null and b/src/Blaze-Brigade/Blaze_BrigadeContent/attack_confirm.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/buttons/attack_confirm.png b/src/Blaze-Brigade/Blaze_BrigadeContent/buttons/attack_confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c87afec3e33b91270496b8b9cc6a2efe7da000c
Binary files /dev/null and b/src/Blaze-Brigade/Blaze_BrigadeContent/buttons/attack_confirm.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/buttons/confirm_attack.png b/src/Blaze-Brigade/Blaze_BrigadeContent/buttons/confirm_attack.png
new file mode 100644
index 0000000000000000000000000000000000000000..a237a4c7b19fca6887596279ea426bf92388e65b
Binary files /dev/null and b/src/Blaze-Brigade/Blaze_BrigadeContent/buttons/confirm_attack.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/confirm_attack.png b/src/Blaze-Brigade/Blaze_BrigadeContent/confirm_attack.png
new file mode 100644
index 0000000000000000000000000000000000000000..a237a4c7b19fca6887596279ea426bf92388e65b
Binary files /dev/null and b/src/Blaze-Brigade/Blaze_BrigadeContent/confirm_attack.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/mage_stats.png b/src/Blaze-Brigade/Blaze_BrigadeContent/mage_stats.png
index fb0d43237c5f9556b491f72071055c9d6c993e8a..78948eef31b85eba03f7f67571f2273994165fbb 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/mage_stats.png and b/src/Blaze-Brigade/Blaze_BrigadeContent/mage_stats.png differ
diff --git a/src/Blaze-Brigade/Blaze_BrigadeContent/warrior_stats.png b/src/Blaze-Brigade/Blaze_BrigadeContent/warrior_stats.png
index 3b5e408ab1367668ff09da6d3e55b68c292387f7..2f3a019dad74d3f11bfa1e0a3b2b4a3ab1a41eea 100644
Binary files a/src/Blaze-Brigade/Blaze_BrigadeContent/warrior_stats.png and b/src/Blaze-Brigade/Blaze_BrigadeContent/warrior_stats.png differ