From b175beb7ec0579017be22b85169bf81d10c846a0 Mon Sep 17 00:00:00 2001 From: Jofairden Date: Sat, 14 Oct 2017 22:57:24 +0200 Subject: [PATCH] updated MPlayer calls --- AlchemistGlobalItem.cs | 2 +- AlchemistItem.cs | 8 ++++---- Buffs/FlaskCoreBuff.cs | 5 +++++ Items/BasicFlask.cs | 4 ++-- Items/BasicSprayer.cs | 5 +++-- Items/BigHealingFlack.cs | 4 ++-- Items/BigManaFlask.cs | 4 ++-- Items/BigPoisonFlask.cs | 4 ++-- Items/BigVenomFlask.cs | 4 ++-- Items/BoomFlask.cs | 3 ++- Items/BurningFlask.cs | 4 ++-- Items/ClusterFlask.cs | 4 ++-- Items/CrystalFlask.cs | 4 ++-- Items/DukeFlask.cs | 3 ++- Items/ExtendedBurningFlask.cs | 4 ++-- Items/ExtendedFreezeFlask.cs | 4 ++-- Items/FlaskCore.cs | 3 --- Items/FreezeFlask.cs | 4 ++-- Items/GoldFlask.cs | 4 ++-- Items/HealthSupportFlask.cs | 4 ++-- Items/LesserHealingFlack.cs | 4 ++-- Items/LesserManaFlask.cs | 4 ++-- Items/LesserPoisonFlask.cs | 4 ++-- Items/LesserVenomFlask.cs | 4 ++-- Items/ManaSupportFlask.cs | 4 ++-- Items/MartianSprayer.cs | 5 +++-- Items/MechaSprayer.cs | 5 +++-- Items/MoonDustFlask.cs | 3 ++- Items/NightmareSprayer.cs | 7 +++---- Items/PhantomFlask.cs | 4 ++-- Items/PlagueFlask.cs | 4 ++-- Items/SparkingFlask.cs | 4 ++-- Items/SuperHealingFlask.cs | 4 ++-- Items/SuperManaFlask.cs | 4 ++-- Items/ToxicFlask.cs | 3 ++- NPCs/Bosses/Motherboard/Motherboard.cs | 2 +- NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs | 4 ++-- NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs | 5 +++-- NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs | 2 +- 39 files changed, 83 insertions(+), 74 deletions(-) diff --git a/AlchemistGlobalItem.cs b/AlchemistGlobalItem.cs index 786e8336..82bd51fa 100644 --- a/AlchemistGlobalItem.cs +++ b/AlchemistGlobalItem.cs @@ -7,7 +7,7 @@ public class AlchemistGlobalItem : GlobalItem { public override bool ConsumeItem(Item item, Player player) { - MPlayer modPlayer = player.GetModPlayer(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaChestplate) { if (player.FindBuffIndex(mod.BuffType("SuperFlask")) != -1) diff --git a/AlchemistItem.cs b/AlchemistItem.cs index b78d1804..be8d89fb 100644 --- a/AlchemistItem.cs +++ b/AlchemistItem.cs @@ -43,7 +43,7 @@ public override void SetDefaults() public override void GetWeaponKnockback(Player player, ref float knockback) { - MPlayer modPlayer = player.GetModPlayer(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); knockback += modPlayer.alchemicalKbAddition; knockback *= modPlayer.alchemicalKbMult; } @@ -51,13 +51,13 @@ public override void GetWeaponKnockback(Player player, ref float knockback) // todo: borked, tml requires update, manual work still needed public override void GetWeaponCrit(Player player, ref int crit) { - MPlayer modPlayer = player.GetModPlayer(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); crit += modPlayer.alchemicalCrit; } public override void GetWeaponDamage(Player player, ref int damage) { - MPlayer modPlayer = player.GetModPlayer(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); @@ -106,7 +106,7 @@ public override void ModifyTooltips(List 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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.glove) { for (int i = 0; i < 1; ++i) diff --git a/Buffs/FlaskCoreBuff.cs b/Buffs/FlaskCoreBuff.cs index db72a1db..65f77a79 100644 --- a/Buffs/FlaskCoreBuff.cs +++ b/Buffs/FlaskCoreBuff.cs @@ -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; + } } } \ No newline at end of file diff --git a/Items/BasicFlask.cs b/Items/BasicFlask.cs index 9daf84a5..6ff2de32 100644 --- a/Items/BasicFlask.cs +++ b/Items/BasicFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/BasicSprayer.cs b/Items/BasicSprayer.cs index cd2f1503..922e93aa 100644 --- a/Items/BasicSprayer.cs +++ b/Items/BasicSprayer.cs @@ -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; } @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.glove) { for (int i = 0; i < 1; ++i) diff --git a/Items/BigHealingFlack.cs b/Items/BigHealingFlack.cs index 6695173a..8516e10f 100644 --- a/Items/BigHealingFlack.cs +++ b/Items/BigHealingFlack.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/BigManaFlask.cs b/Items/BigManaFlask.cs index f7ef3fd1..1ca330b7 100644 --- a/Items/BigManaFlask.cs +++ b/Items/BigManaFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/BigPoisonFlask.cs b/Items/BigPoisonFlask.cs index 9f7a661e..74377b8f 100644 --- a/Items/BigPoisonFlask.cs +++ b/Items/BigPoisonFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/BigVenomFlask.cs b/Items/BigVenomFlask.cs index a83e0ffa..73535a26 100644 --- a/Items/BigVenomFlask.cs +++ b/Items/BigVenomFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/BoomFlask.cs b/Items/BoomFlask.cs index f7150a41..4f0da35a 100644 --- a/Items/BoomFlask.cs +++ b/Items/BoomFlask.cs @@ -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; @@ -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; } diff --git a/Items/BurningFlask.cs b/Items/BurningFlask.cs index 5a2e02d2..551fce6e 100644 --- a/Items/BurningFlask.cs +++ b/Items/BurningFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/ClusterFlask.cs b/Items/ClusterFlask.cs index 78f07a50..35d5f106 100644 --- a/Items/ClusterFlask.cs +++ b/Items/ClusterFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/CrystalFlask.cs b/Items/CrystalFlask.cs index 8bd43252..bf90cdc2 100644 --- a/Items/CrystalFlask.cs +++ b/Items/CrystalFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/DukeFlask.cs b/Items/DukeFlask.cs index 6e2d3880..bc98a16d 100644 --- a/Items/DukeFlask.cs +++ b/Items/DukeFlask.cs @@ -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; @@ -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; } diff --git a/Items/ExtendedBurningFlask.cs b/Items/ExtendedBurningFlask.cs index cac18827..e1e09bfd 100644 --- a/Items/ExtendedBurningFlask.cs +++ b/Items/ExtendedBurningFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/ExtendedFreezeFlask.cs b/Items/ExtendedFreezeFlask.cs index cda454e3..c475a23a 100644 --- a/Items/ExtendedFreezeFlask.cs +++ b/Items/ExtendedFreezeFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/FlaskCore.cs b/Items/FlaskCore.cs index 4b1cd6d0..e3202f9d 100644 --- a/Items/FlaskCore.cs +++ b/Items/FlaskCore.cs @@ -20,7 +20,6 @@ public override bool CanEquipAccessory(Player player, int slot) public override void SetDefaults() { - item.width = 22; item.height = 24; @@ -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; } } } diff --git a/Items/FreezeFlask.cs b/Items/FreezeFlask.cs index 1d4a616f..089624cc 100644 --- a/Items/FreezeFlask.cs +++ b/Items/FreezeFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/GoldFlask.cs b/Items/GoldFlask.cs index e521df01..dad61e67 100644 --- a/Items/GoldFlask.cs +++ b/Items/GoldFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/HealthSupportFlask.cs b/Items/HealthSupportFlask.cs index 1db1a454..9e83280d 100644 --- a/Items/HealthSupportFlask.cs +++ b/Items/HealthSupportFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/LesserHealingFlack.cs b/Items/LesserHealingFlack.cs index f7ead88e..fb83da6a 100644 --- a/Items/LesserHealingFlack.cs +++ b/Items/LesserHealingFlack.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/LesserManaFlask.cs b/Items/LesserManaFlask.cs index a1c6962f..e66c2363 100644 --- a/Items/LesserManaFlask.cs +++ b/Items/LesserManaFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/LesserPoisonFlask.cs b/Items/LesserPoisonFlask.cs index 9cf84004..18e60f42 100644 --- a/Items/LesserPoisonFlask.cs +++ b/Items/LesserPoisonFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/LesserVenomFlask.cs b/Items/LesserVenomFlask.cs index e57afc71..927a8e50 100644 --- a/Items/LesserVenomFlask.cs +++ b/Items/LesserVenomFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/ManaSupportFlask.cs b/Items/ManaSupportFlask.cs index 629245f3..cc534ea7 100644 --- a/Items/ManaSupportFlask.cs +++ b/Items/ManaSupportFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/MartianSprayer.cs b/Items/MartianSprayer.cs index fca15824..a33d1c8e 100644 --- a/Items/MartianSprayer.cs +++ b/Items/MartianSprayer.cs @@ -57,7 +57,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; } @@ -77,7 +78,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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.glove) { for (int i = 0; i < 1; ++i) diff --git a/Items/MechaSprayer.cs b/Items/MechaSprayer.cs index 2a1b873f..8b82dc3b 100644 --- a/Items/MechaSprayer.cs +++ b/Items/MechaSprayer.cs @@ -57,7 +57,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; } @@ -77,7 +78,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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.glove) { for (int i = 0; i < 1; ++i) diff --git a/Items/MoonDustFlask.cs b/Items/MoonDustFlask.cs index 2843f9b2..3482ca47 100644 --- a/Items/MoonDustFlask.cs +++ b/Items/MoonDustFlask.cs @@ -38,6 +38,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; @@ -46,7 +47,7 @@ public override void UpdateInventory(Player player) { item.shootSpeed = 8f; } - if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1) + if (modPlayer.core) { item.autoReuse = true; } diff --git a/Items/NightmareSprayer.cs b/Items/NightmareSprayer.cs index cae3accb..e8df1528 100644 --- a/Items/NightmareSprayer.cs +++ b/Items/NightmareSprayer.cs @@ -7,10 +7,8 @@ namespace Tremor.Items { public class NightmareSprayer : AlchemistItem { - public override void SetDefaults() { - item.damage = 120; item.width = 80; item.height = 36; @@ -73,7 +71,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; } @@ -93,7 +92,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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.glove) { for (int i = 0; i < 1; ++i) diff --git a/Items/PhantomFlask.cs b/Items/PhantomFlask.cs index acc62a0d..9ca880fd 100644 --- a/Items/PhantomFlask.cs +++ b/Items/PhantomFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/PlagueFlask.cs b/Items/PlagueFlask.cs index adfe5537..750b79e6 100644 --- a/Items/PlagueFlask.cs +++ b/Items/PlagueFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/SparkingFlask.cs b/Items/SparkingFlask.cs index 218a0343..ad1e3d61 100644 --- a/Items/SparkingFlask.cs +++ b/Items/SparkingFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/SuperHealingFlask.cs b/Items/SuperHealingFlask.cs index 1522e783..699f8228 100644 --- a/Items/SuperHealingFlask.cs +++ b/Items/SuperHealingFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/SuperManaFlask.cs b/Items/SuperManaFlask.cs index f5d6ca97..d835ebdd 100644 --- a/Items/SuperManaFlask.cs +++ b/Items/SuperManaFlask.cs @@ -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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -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; } diff --git a/Items/ToxicFlask.cs b/Items/ToxicFlask.cs index 6f00928f..c130d0bd 100644 --- a/Items/ToxicFlask.cs +++ b/Items/ToxicFlask.cs @@ -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; @@ -44,7 +45,7 @@ public override void UpdateInventory(Player player) { item.shootSpeed = 9f; } - if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1) + if (modPlayer.core) { item.autoReuse = true; } diff --git a/NPCs/Bosses/Motherboard/Motherboard.cs b/NPCs/Bosses/Motherboard/Motherboard.cs index 77c60a02..1c9209d2 100644 --- a/NPCs/Bosses/Motherboard/Motherboard.cs +++ b/NPCs/Bosses/Motherboard/Motherboard.cs @@ -26,9 +26,9 @@ public class Stage public int GetStateTime => appearingTime + disappearingTime + followPlayerTime; - protected const int AnimationRate = 6; // Animation rate protected int _currentFrame; // Current frame protected int _timeToAnimation = 6; // Animation rate + protected const int AnimationRate = 6; // Animation rate protected const int LaserYOffset = 95; // Laser spawn offset by Y value protected const int LaserDamage = 25; // Laser damage diff --git a/NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs index 5efc7bca..9f9d331c 100644 --- a/NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs +++ b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs @@ -36,7 +36,7 @@ public override void SetStaticDefaults() public override void UpdateInventory(Player player) { - MPlayer modPlayer = player.GetModPlayer(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.novaHelmet) { item.autoReuse = true; @@ -54,7 +54,7 @@ public override void UpdateInventory(Player player) { item.shootSpeed = 13f; } - if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1) + if (modPlayer.core) { item.autoReuse = true; } diff --git a/NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs index f234d149..eefec949 100644 --- a/NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs +++ b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs @@ -46,7 +46,8 @@ public override void SetStaticDefaults() public override void UpdateInventory(Player player) { - if (player.FindBuffIndex(mod.BuffType("FlaskCoreBuff")) != -1) + MPlayer modPlayer = MPlayer.GetModPlayer(player); + if (modPlayer.core) { item.autoReuse = true; } @@ -66,7 +67,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(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (modPlayer.glove) { for (int i = 0; i < 1; ++i) diff --git a/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs index ac052729..b3c1197c 100644 --- a/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs @@ -41,7 +41,7 @@ public override void AI() } bool Flag1 = projectile.type == mod.ProjectileType("NovaCauldron"); Player player = Main.player[projectile.owner]; - MPlayer modPlayer = player.GetModPlayer(mod); + MPlayer modPlayer = MPlayer.GetModPlayer(player); if (Flag1) { if (player.dead)