BTH/depthsbelow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shooting calculation displayed, needs work

Browse Source
This commit is contained in:
Niklas Ulf Anders Cullberg
2012-10-20 13:01:57 +02:00
parent 6034dbf3b2
commit 2fe63f51c0
5 changed files with 74 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DepthsBelow/DepthsBelow/Component/Stat.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace DepthsBelow.Component
public int GetAim public int GetAim
{ {
get { return soldierAim + weaponAccuracy; } get { return soldierAim + weaponAccuracy; }
set { soldierAim = value; } set { weaponAccuracy = value; }
} }
public int GetDodge public int GetDodge
DepthsBelow/DepthsBelow/KeyboardInput.cs
+2 -2
View File
@@ -86,7 +86,7 @@ namespace DepthsBelow
{ {
if (soldier.Selected == true && soldier.Fired == false) if (soldier.Selected == true && soldier.Fired == false)
{ {
core.Volley.Add(new Shot(core.EntityManager)); core.Volley.Add(new Shot(core.EntityManager, soldier.GetComponent<Component.Stat>()));
soldier.Fired = true; soldier.Fired = true;
foreach (var shot in core.Volley) foreach (var shot in core.Volley)
{ {
@@ -143,7 +143,7 @@ namespace DepthsBelow
current = 0; current = 0;
if (soldier.Selected == true && soldier.Fired == false && hit == true) if (soldier.Selected == true && soldier.Fired == false && hit == true)
{ {
core.Volley.Add(new Shot(core.EntityManager)); core.Volley.Add(new Shot(core.EntityManager, soldier.GetComponent<Component.Stat>()));
soldier.Fired = true; soldier.Fired = true;
foreach (var shot in core.Volley) foreach (var shot in core.Volley)
{ {
DepthsBelow/DepthsBelow/MouseInput.cs
+9 -8
View File
@@ -118,21 +118,22 @@ namespace DepthsBelow
readjust = false; readjust = false;
} }
} }
//Calculating chance to hit if holding cursor over enemy }
foreach (var unit in core.Squad) //Calculating chance to hit if holding cursor over enemy
foreach (var unit in core.Squad)
{
if (unit.Selected == true && unit.Fired == false)
{ {
if (unit.Selected == true && unit.Fired == false) foreach (var enemy in core.Swarm)
{ {
foreach (var enemy in core.Swarm) if (gridRectangle.Intersects(enemy.GetComponent<Component.Collision>().Rectangle))
{ {
if (gridRectangle.Intersects(enemy.GetComponent<Component.Collision>().Rectangle)) Console.WriteLine(Utility.CalculateHitChance(unit, enemy));
{
Utility.CalculateHitChance(unit, enemy);
}
} }
} }
} }
} }
// When the mouse is released // When the mouse is released
if (ms.LeftButton == ButtonState.Released && selectionRectangle != Rectangle.Empty) if (ms.LeftButton == ButtonState.Released && selectionRectangle != Rectangle.Empty)
{ {
DepthsBelow/DepthsBelow/Shot.cs
+11 -1
View File
@@ -14,6 +14,14 @@ namespace DepthsBelow
public Color Color; public Color Color;
public static Point Origin; public static Point Origin;
Stat soldierStat;
public Stat Stat
{
get { return soldierStat; }
set { soldierStat = value; }
}
private bool _selected = false; //I guess as in "currently doing something" private bool _selected = false; //I guess as in "currently doing something"
public bool select public bool select
@@ -29,7 +37,7 @@ namespace DepthsBelow
public Vector2 direction = Vector2.Zero; public Vector2 direction = Vector2.Zero;
public Shot(EntityManager entityManager) public Shot(EntityManager entityManager, Stat _soldierStat)
: base(entityManager) : base(entityManager)
{ {
if (Texture == null) if (Texture == null)
@@ -37,6 +45,8 @@ namespace DepthsBelow
Transform.World.Origin = new Vector2(16, 16); Transform.World.Origin = new Vector2(16, 16);
Stat = _soldierStat;
this.Color = Color.White; this.Color = Color.White;
var rc = new SpriteRenderer(this) { Texture = Texture, Color = Color.White }; var rc = new SpriteRenderer(this) { Texture = Texture, Color = Color.White };
AddComponent(rc); AddComponent(rc);
DepthsBelow/DepthsBelow/Utility.cs
+3 -1
View File
@@ -29,7 +29,9 @@ namespace DepthsBelow
} }
int baseHitChance = shooting.GetAim; int baseHitChance = shooting.GetAim;
int baseDodgeChance = dodging.GetDodge; int baseDodgeChance = dodging.GetDodge;
int basePenalty = shooting.Penalty((int)Vector2.Distance(attacker.GetComponent<Transform>().World.Position, defender.GetComponent<Transform>().World.Position) / Grid.TileSize); int distance = (int)Vector2.Distance(attacker.GetComponent<Transform>().World.Position, defender.GetComponent<Transform>().World.Position);
int basePenalty = shooting.Penalty(distance / (Grid.TileSize / 2));
Console.WriteLine("Penalty = " + basePenalty);
int chanceToHit = baseHitChance - baseDodgeChance - basePenalty; int chanceToHit = baseHitChance - baseDodgeChance - basePenalty;
//Console.WriteLine(chanceToHit); //Console.WriteLine(chanceToHit);
return chanceToHit; return chanceToHit;