v0.3, cleanup, twins fix, icon

JavidPack · Jan 6, 2018 · 7064cc5 · 7064cc5
1 parent 5fdc823
commit 7064cc5
Show file tree

Hide file tree

Showing 6 changed files with 209 additions and 219 deletions.
diff --git a/Models/MinionModel.cs b/Models/MinionModel.cs
@@ -4,17 +4,17 @@
 
 namespace SummonersAssociation.Models
 {
-    public class MinionModel 
-    {
-        public int ItemID { get; set; }
-        public int BuffID { get; set; }
-        public List<int> ProjectileIDs { get; set; }
+	public class MinionModel
+	{
+		public int ItemID { get; set; }
+		public int BuffID { get; set; }
+		public List<int> ProjectileIDs { get; set; }
 
-        public MinionModel(int itemID, int buffID, List<int> projectileIDs) 
-        {
-            this.ItemID = itemID;
-            this.BuffID = buffID;
-            this.ProjectileIDs = projectileIDs;
-        }
-    }
+		public MinionModel(int itemID, int buffID, List<int> projectileIDs)
+		{
+			this.ItemID = itemID;
+			this.BuffID = buffID;
+			this.ProjectileIDs = projectileIDs;
+		}
+	}
 }
diff --git a/Projectiles/BloodTailismanGlobalProjectile.cs b/Projectiles/BloodTailismanGlobalProjectile.cs
@@ -49,39 +49,40 @@ public override void ModifyHitNPC(Projectile projectile, NPC target, ref int dam
 				{
 					if (Main.projectile[j].active && Main.projectile[j].owner == projectile.owner)
 					{
-						if (Main.projectile[j].type == mod.ProjectileType<Projectiles.BloodTalismanTargetProjectile>()){
+						if (Main.projectile[j].type == mod.ProjectileType<Projectiles.BloodTalismanTargetProjectile>())
+						{
 							p = Main.projectile[j];
 							break;
 						}
-                    }
+					}
 				}
 				if (p != null)
 				{
-					if(Vector2.Distance(p.Center , target.Center/*projectile.Center*/) < 50)
+					if (Vector2.Distance(p.Center, target.Center/*projectile.Center*/) < 50)
 					{
 						// 155 max
 						// 10x damage
-						if(p.alpha == 155)
+						if (p.alpha == 155)
 						{
 							damage *= 10;
 							knockback *= 2.5f; // 1.5
 						}
 						// 5 to almost 10x
-						else if(p.alpha < 170)
+						else if (p.alpha < 170)
 						{
 							damage = (int)((5 + ((170 - p.alpha) / 5f)) * damage); // 5 to 10
-							knockback *= (1.75f + .75f*((195 - p.alpha) / 25f)); // .75 to 1.5
+							knockback *= (1.75f + .75f * ((195 - p.alpha) / 25f)); // .75 to 1.5
 						}
 						//
 						else if (p.alpha < 195)
 						{
 							damage = (int)((2.5 + ((195 - p.alpha) / 10f)) * damage);
-							knockback *= ((1.3f + .3f*((195 - p.alpha) / 25f)) );
+							knockback *= ((1.3f + .3f * ((195 - p.alpha) / 25f)));
 						}
 						else if (p.alpha < 220)
 						{
 							damage = (int)((1.25 + ((220 - p.alpha) / 20f)) * damage);
-							knockback *= ((1.15f + .15f*((195 - p.alpha) / 25f)));
+							knockback *= ((1.15f + .15f * ((195 - p.alpha) / 25f)));
 						}
 						else /*if (p.alpha < 255)*/
 						{