Skip to content
This repository has been archived by the owner on Jan 24, 2019. It is now read-only.

Commit

Permalink
Attempt at full reformat, crash at 80%
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jofairden
Jofairden committed Jul 11, 2017
1 parent d7e719a commit 821ebd6
Show file tree
Hide file tree
Showing 2,211 changed files with 103,460 additions and 93,114 deletions.
162 changes: 81 additions & 81 deletions AlchemistGlobalItem.cs
View file

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions AlchemistItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,80 +12,80 @@

namespace Tremor
{
public abstract class AlchemistItem : ModItem
{
public abstract class AlchemistItem : ModItem
{

public override void ModifyTooltips(System.Collections.Generic.List<TooltipLine> tooltips)
{
for (int i = 0; i < tooltips.Count; ++i)
{
if (tooltips[i].Name == "Damage")
{
MPlayer mp = Main.LocalPlayer.GetModPlayer<MPlayer>(mod);
tooltips[i].text = ((int)(item.damage * mp.alchemistDamage)).ToString() + " alchemic damage";
}
public override void ModifyTooltips(System.Collections.Generic.List<TooltipLine> tooltips)
{
for (int i = 0; i < tooltips.Count; ++i)
{
if (tooltips[i].Name == "Damage")
{
MPlayer mp = Main.LocalPlayer.GetModPlayer<MPlayer>(mod);
tooltips[i].text = ((int)(item.damage * mp.alchemistDamage)).ToString() + " alchemic damage";
}

if (tooltips[i].Name == "CritChance")
{
MPlayer mp = Main.LocalPlayer.GetModPlayer<MPlayer>(mod);
tooltips[i].text = ((int)(item.crit + mp.alchemistCrit)).ToString() + "% critical strike chance";
}
}
MPlayer mp2 = Main.LocalPlayer.GetModPlayer<MPlayer>(mod);
TooltipLine tip = new TooltipLine(mod, "Tremor:Tooltip", ((int)(item.crit + mp2.alchemistCrit)).ToString() + "% critical strike chance");
tooltips.Insert(2, tip);
}
public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
if (modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
{
if (player.FindBuffIndex(mod.BuffType("BottledSpirit")) != -1)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 2, speedY + 2, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
}
if (player.FindBuffIndex(mod.BuffType("BigBottledSpirit")) != -1)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 3, speedY + 3, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX + 2, speedY + 2, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 2, speedY - 2, 297, damage, knockBack, Main.myPlayer);
}
Projectile.NewProjectile(position.X, position.Y, speedX + 1, speedY + 1, type, damage, knockBack, Main.myPlayer);
int k = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, type, damage, knockBack, Main.myPlayer);
Main.projectile[k].friendly = true;
}
return false;
}
if (player.FindBuffIndex(mod.BuffType("BottledSpirit")) != -1 && !modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 1, speedY + 1, 297, damage, knockBack, Main.myPlayer);
int k = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, type, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
Main.projectile[k].friendly = true;
}
return false;
}
if (player.FindBuffIndex(mod.BuffType("BigBottledSpirit")) != -1 && !modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 2, speedY + 2, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX + 1, speedY + 1, 297, damage, knockBack, Main.myPlayer);
int k = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, type, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 2, speedY - 2, 297, damage, knockBack, Main.myPlayer);
Main.projectile[k].friendly = true;
}
return false;
}
return true;
}
}
if (tooltips[i].Name == "CritChance")
{
MPlayer mp = Main.LocalPlayer.GetModPlayer<MPlayer>(mod);
tooltips[i].text = ((int)(item.crit + mp.alchemistCrit)).ToString() + "% critical strike chance";
}
}
MPlayer mp2 = Main.LocalPlayer.GetModPlayer<MPlayer>(mod);
TooltipLine tip = new TooltipLine(mod, "Tremor:Tooltip", ((int)(item.crit + mp2.alchemistCrit)).ToString() + "% critical strike chance");
tooltips.Insert(2, tip);
}

public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
if (modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
{
if (player.FindBuffIndex(mod.BuffType("BottledSpirit")) != -1)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 2, speedY + 2, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
}
if (player.FindBuffIndex(mod.BuffType("BigBottledSpirit")) != -1)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 3, speedY + 3, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX + 2, speedY + 2, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 2, speedY - 2, 297, damage, knockBack, Main.myPlayer);
}
Projectile.NewProjectile(position.X, position.Y, speedX + 1, speedY + 1, type, damage, knockBack, Main.myPlayer);
int k = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, type, damage, knockBack, Main.myPlayer);
Main.projectile[k].friendly = true;
}
return false;
}
if (player.FindBuffIndex(mod.BuffType("BottledSpirit")) != -1 && !modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 1, speedY + 1, 297, damage, knockBack, Main.myPlayer);
int k = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, type, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
Main.projectile[k].friendly = true;
}
return false;
}
if (player.FindBuffIndex(mod.BuffType("BigBottledSpirit")) != -1 && !modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
{
Projectile.NewProjectile(position.X, position.Y, speedX + 2, speedY + 2, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX + 1, speedY + 1, 297, damage, knockBack, Main.myPlayer);
int k = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, type, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 1, speedY - 1, 297, damage, knockBack, Main.myPlayer);
Projectile.NewProjectile(position.X, position.Y, speedX - 2, speedY - 2, 297, damage, knockBack, Main.myPlayer);
Main.projectile[k].friendly = true;
}
return false;
}
return true;
}
}
}
87 changes: 44 additions & 43 deletions Angle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,52 @@

namespace Tremor
{
public struct Angle
{
public float Value;
public Angle(float angle)
{
Value = angle;
float remainder = Value % (2f * (float)Math.PI);
float rotations = Value - remainder;
Value -= rotations;
if(Value < 0f)
{
Value += 2f * (float)Math.PI;
}
}
public struct Angle
{
public float Value;
public Angle(float angle)
{
Value = angle;
float remainder = Value % (2f * (float)Math.PI);
float rotations = Value - remainder;
Value -= rotations;
if (Value < 0f)
{
Value += 2f * (float)Math.PI;
}
}

public static Angle operator +(Angle a1, Angle a2)
{
return new Angle(a1.Value + a2.Value);
}
public static Angle operator +(Angle a1, Angle a2)
{
return new Angle(a1.Value + a2.Value);
}

public static Angle operator -(Angle a1, Angle a2)
{
return new Angle(a1.Value - a2.Value);
}
public static Angle operator -(Angle a1, Angle a2)
{
return new Angle(a1.Value - a2.Value);
}

public Angle Opposite()
{
return new Angle(Value + (float)Math.PI);
}
public Angle Opposite()
{
return new Angle(Value + (float)Math.PI);
}

public bool ClockwiseFrom(Angle other)
{
if(other.Value >= (float)Math.PI)
{
return this.Value < other.Value && this.Value >= other.Opposite().Value;
}
return this.Value < other.Value || this.Value >= other.Opposite().Value;
}
public bool ClockwiseFrom(Angle other)
{
if (other.Value >= (float)Math.PI)
{
return this.Value < other.Value && this.Value >= other.Opposite().Value;
}
return this.Value < other.Value || this.Value >= other.Opposite().Value;
}

public bool Between(Angle cLimit, Angle ccLimit)
{
if(cLimit.Value < ccLimit.Value)
{
return this.Value >= cLimit.Value && this.Value <= ccLimit.Value;
}
return this.Value >= cLimit.Value || this.Value <= ccLimit.Value;
}
}}
public bool Between(Angle cLimit, Angle ccLimit)
{
if (cLimit.Value < ccLimit.Value)
{
return this.Value >= cLimit.Value && this.Value <= ccLimit.Value;
}
return this.Value >= cLimit.Value || this.Value <= ccLimit.Value;
}
}
}
2 changes: 1 addition & 1 deletion Buffs/AncientBannerBuff.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public override void SetDefaults()

public override void Update(Player player, ref int buffIndex)
{
player.lifeRegen += 40;
player.lifeRegen += 40;
}
}
}
28 changes: 14 additions & 14 deletions Buffs/AncientPredatorBuff.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace Tremor.Buffs
{
public class AncientPredatorBuff : ModBuff
{
int MinionType = -1;
int MinionID = -1;
int MinionType = -1;
int MinionID = -1;

public override void SetDefaults()
{
Expand All @@ -20,18 +20,18 @@ public override void SetDefaults()

public override void Update(Player player, ref int buffIndex)
{
if (MinionType == -1)
MinionType = mod.ProjectileType("AncientPredator");
if (MinionID == -1 || Main.projectile[MinionID].type != MinionType || !Main.projectile[MinionID].active || Main.projectile[MinionID].owner != player.whoAmI)
{
Projectile proj = new Projectile();
proj.SetDefaults(MinionType);
MinionID = Projectile.NewProjectile(player.Center.X, player.Center.Y, 0, 0, MinionType, 300, 3, player.whoAmI);
}
else
{
Main.projectile[MinionID].timeLeft = 5;
}
if (MinionType == -1)
MinionType = mod.ProjectileType("AncientPredator");
if (MinionID == -1 || Main.projectile[MinionID].type != MinionType || !Main.projectile[MinionID].active || Main.projectile[MinionID].owner != player.whoAmI)
{
Projectile proj = new Projectile();
proj.SetDefaults(MinionType);
MinionID = Projectile.NewProjectile(player.Center.X, player.Center.Y, 0, 0, MinionType, 300, 3, player.whoAmI);
}
else
{
Main.projectile[MinionID].timeLeft = 5;
}
}
}
}
26 changes: 13 additions & 13 deletions Buffs/BallnChainBuff.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
namespace Tremor.Buffs
{
public class BallnChainBuff : ModBuff
{
int MinionType = -1;
int MinionID = -1;
{
int MinionType = -1;
int MinionID = -1;

const int Damage = 30;
const float KB = 1;
const int Damage = 30;
const float KB = 1;

public override void SetDefaults()
public override void SetDefaults()
{
Main.buffNoTimeDisplay[Type] = true;
DisplayName.SetDefault("Ball n' Chain");
}

public override void Update(Player player, ref int buffIndex)
{
if (MinionType == -1)
MinionType = mod.ProjectileType("BallChainPro");
if (MinionID == -1 || Main.projectile[MinionID].type != MinionType || !Main.projectile[MinionID].active || Main.projectile[MinionID].owner != player.whoAmI)
MinionID = Projectile.NewProjectile(player.Center.X, player.Center.Y, 0, 0, MinionType, (int)(Damage * player.meleeDamage), KB, player.whoAmI);
else
Main.projectile[MinionID].timeLeft = 6;
}
if (MinionType == -1)
MinionType = mod.ProjectileType("BallChainPro");
if (MinionID == -1 || Main.projectile[MinionID].type != MinionType || !Main.projectile[MinionID].active || Main.projectile[MinionID].owner != player.whoAmI)
MinionID = Projectile.NewProjectile(player.Center.X, player.Center.Y, 0, 0, MinionType, (int)(Damage * player.meleeDamage), KB, player.whoAmI);
else
Main.projectile[MinionID].timeLeft = 6;
}
}
}
10 changes: 5 additions & 5 deletions Buffs/BarrierBuff.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ public override void SetDefaults()

public override void Update(Player player, ref int buffIndex)
{
player.statDefense += 500;
if(player.buffTime[buffIndex] == 0)
{
player.AddBuff(mod.BuffType("BarrierRechargeBuff"), 7200);
}
player.statDefense += 500;
if (player.buffTime[buffIndex] == 0)
{
player.AddBuff(mod.BuffType("BarrierRechargeBuff"), 7200);
}
}
}
}
2 changes: 1 addition & 1 deletion Buffs/BarrierRechargeBuff.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public override void SetDefaults()
{
DisplayName.SetDefault("Barrier Recharging");
Description.SetDefault("Magic barrier can't appear");
Main.debuff[Type] = true;
Main.debuff[Type] = true;
}
}
}
Loading

0 comments on commit 821ebd6

Please sign in to comment.