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

Commit

Permalink
updated MPlayer calls
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jofairden
Jofairden committed Oct 14, 2017
1 parent 366d303 commit b175beb
Show file tree
Hide file tree
Showing 39 changed files with 83 additions and 74 deletions.
2 changes: 1 addition & 1 deletion AlchemistGlobalItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class AlchemistGlobalItem : GlobalItem
{
public override bool ConsumeItem(Item item, Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaChestplate)
{
if (player.FindBuffIndex(mod.BuffType("SuperFlask")) != -1)
Expand Down
8 changes: 4 additions & 4 deletions AlchemistItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ public override void SetDefaults()

public override void GetWeaponKnockback(Player player, ref float knockback)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
knockback += modPlayer.alchemicalKbAddition;
knockback *= modPlayer.alchemicalKbMult;
}

// todo: borked, tml requires update, manual work still needed
public override void GetWeaponCrit(Player player, ref int crit)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
crit += modPlayer.alchemicalCrit;
}

public override void GetWeaponDamage(Player player, ref int damage)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
// We want to multiply the damage we do by our alchemicalDamage modifier.
// todo: ? do we want magic damage to also have effect here?
damage = (int)(damage * modPlayer.alchemicalDamage + 5E-06f);
Expand Down Expand Up @@ -106,7 +106,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)

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);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
Expand Down
5 changes: 5 additions & 0 deletions Buffs/FlaskCoreBuff.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,10 @@ public override void SetDefaults()
Main.buffNoSave[Type] = true;
Main.buffNoTimeDisplay[Type] = true;
}

public override void Update(Player player, ref int buffIndex)
{
MPlayer.GetModPlayer(player).core = true;
}
}
}
4 changes: 2 additions & 2 deletions Items/BasicFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
5 changes: 3 additions & 2 deletions Items/BasicSprayer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ public override bool ConsumeAmmo(Player player)

public override void UpdateInventory(Player player)
{
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand All @@ -117,7 +118,7 @@ public override void UpdateInventory(Player player)

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);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.glove)
{
for (int i = 0; i < 1; ++i)
Expand Down
4 changes: 2 additions & 2 deletions Items/BigHealingFlack.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/BigManaFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref
}
public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -60,7 +60,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/BigPoisonFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/BigVenomFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
3 changes: 2 additions & 1 deletion Items/BoomFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public override void SetStaticDefaults()

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (player.FindBuffIndex(mod.BuffType("LongFuseBuff")) != -1)
{
item.shootSpeed = 11f;
Expand All @@ -45,7 +46,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/BurningFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -61,7 +61,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/ClusterFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -61,7 +61,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/CrystalFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -61,7 +61,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
3 changes: 2 additions & 1 deletion Items/DukeFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public override void SetStaticDefaults()

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (player.FindBuffIndex(mod.BuffType("LongFuseBuff")) != -1)
{
item.shootSpeed = 11f;
Expand All @@ -44,7 +45,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/ExtendedBurningFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/ExtendedFreezeFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
3 changes: 0 additions & 3 deletions Items/FlaskCore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public override bool CanEquipAccessory(Player player, int slot)

public override void SetDefaults()
{

item.width = 22;
item.height = 24;

Expand All @@ -37,9 +36,7 @@ public override void SetStaticDefaults()

public override void UpdateAccessory(Player player, bool hideVisual)
{
MPlayer modPlayer = (MPlayer)player.GetModPlayer(mod, "MPlayer");
player.AddBuff(mod.BuffType("FlaskCoreBuff"), 2);
modPlayer.core = true;
}
}
}
4 changes: 2 additions & 2 deletions Items/FreezeFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -61,7 +61,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/GoldFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -61,7 +61,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/HealthSupportFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -60,7 +60,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/LesserHealingFlack.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
4 changes: 2 additions & 2 deletions Items/LesserManaFlask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void PickAmmo(Player player, ref int type, ref float speed, ref

public override void UpdateInventory(Player player)
{
MPlayer modPlayer = player.GetModPlayer<MPlayer>(mod);
MPlayer modPlayer = MPlayer.GetModPlayer(player);
if (modPlayer.novaHelmet)
{
item.autoReuse = true;
Expand All @@ -62,7 +62,7 @@ public override void UpdateInventory(Player player)
{
item.shootSpeed = 8f;
}
if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1)
if (modPlayer.core)
{
item.autoReuse = true;
}
Expand Down
Loading

0 comments on commit b175beb

Please sign in to comment.