Implement Skirmisher armor set bonus
This commit is contained in:
@@ -0,0 +1,25 @@
|
|||||||
|
using Terraria;
|
||||||
|
using Terraria.ID;
|
||||||
|
using Terraria.ModLoader;
|
||||||
|
using ForgottenWawiTech.Content.GlobalNPCs;
|
||||||
|
|
||||||
|
namespace ForgottenWawiTech.Content.Buffs.Debuffs
|
||||||
|
{
|
||||||
|
public class ThermalMarkDebuff : ModBuff
|
||||||
|
{
|
||||||
|
public override void SetStaticDefaults()
|
||||||
|
{
|
||||||
|
Main.debuff[Type] = true;
|
||||||
|
Main.pvpBuff[Type] = true;
|
||||||
|
Main.buffNoSave[Type] = true;
|
||||||
|
BuffID.Sets.LongerExpertDebuff[Type] = true;
|
||||||
|
BuffID.Sets.NurseCannotRemoveDebuff[Type] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Update(NPC npc, ref int buffIndex)
|
||||||
|
{
|
||||||
|
npc.GetGlobalNPC<ThermalMarkGlobalNPC>().ThermalMarked = true;
|
||||||
|
Lighting.AddLight(npc.Center, 0.9f, 0.45f, 0.2f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
@@ -0,0 +1,26 @@
|
|||||||
|
using Terraria;
|
||||||
|
using Terraria.ModLoader;
|
||||||
|
using ForgottenWawiTech.Content.Buffs.Debuffs;
|
||||||
|
|
||||||
|
namespace ForgottenWawiTech.Content.GlobalNPCs
|
||||||
|
{
|
||||||
|
public class ThermalMarkGlobalNPC : GlobalNPC
|
||||||
|
{
|
||||||
|
public bool ThermalMarked { get; set; }
|
||||||
|
|
||||||
|
public override bool InstancePerEntity => true;
|
||||||
|
|
||||||
|
public override void ResetEffects(NPC npc)
|
||||||
|
{
|
||||||
|
ThermalMarked = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void ModifyIncomingHit(NPC npc, ref NPC.HitModifiers modifiers)
|
||||||
|
{
|
||||||
|
if (npc.HasBuff(ModContent.BuffType<ThermalMarkDebuff>()))
|
||||||
|
{
|
||||||
|
modifiers.FinalDamage *= 1.12f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,9 @@ using Terraria.ModLoader;
|
|||||||
using ForgottenWawiTech.Content.Items.Materials;
|
using ForgottenWawiTech.Content.Items.Materials;
|
||||||
using ForgottenWawiTech.Content.Rarities;
|
using ForgottenWawiTech.Content.Rarities;
|
||||||
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
||||||
|
using ForgottenWawiTech.Content.Players;
|
||||||
|
|
||||||
|
// Pre-hardmode
|
||||||
|
|
||||||
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
||||||
{
|
{
|
||||||
@@ -36,7 +39,7 @@ namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
|||||||
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+2 max minions and +20% summon damage";
|
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+2 max minions and +20% summon damage";
|
||||||
player.maxMinions += 2;
|
player.maxMinions += 2;
|
||||||
player.GetDamage(DamageClass.Summon) += 0.20f;
|
player.GetDamage(DamageClass.Summon) += 0.20f;
|
||||||
// TODO: Implement thermal vision drone marking system
|
player.GetModPlayer<AvaliSkirmisherPlayer>().EnableThermalDrones();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void AddRecipes()
|
public override void AddRecipes()
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using Terraria.ModLoader;
|
|||||||
using ForgottenWawiTech.Content.Items.Materials;
|
using ForgottenWawiTech.Content.Items.Materials;
|
||||||
using ForgottenWawiTech.Content.Rarities;
|
using ForgottenWawiTech.Content.Rarities;
|
||||||
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
||||||
|
using ForgottenWawiTech.Content.Players;
|
||||||
|
|
||||||
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
||||||
{
|
{
|
||||||
@@ -37,7 +38,7 @@ namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
|||||||
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+15% melee damage and speed";
|
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+15% melee damage and speed";
|
||||||
player.GetDamage(DamageClass.Melee) += 0.15f;
|
player.GetDamage(DamageClass.Melee) += 0.15f;
|
||||||
player.GetAttackSpeed(DamageClass.Melee) += 0.15f;
|
player.GetAttackSpeed(DamageClass.Melee) += 0.15f;
|
||||||
// TODO: Implement thermal vision drone marking system
|
player.GetModPlayer<AvaliSkirmisherPlayer>().EnableThermalDrones();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void AddRecipes()
|
public override void AddRecipes()
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using Terraria.ModLoader;
|
|||||||
using ForgottenWawiTech.Content.Items.Materials;
|
using ForgottenWawiTech.Content.Items.Materials;
|
||||||
using ForgottenWawiTech.Content.Rarities;
|
using ForgottenWawiTech.Content.Rarities;
|
||||||
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
||||||
|
using ForgottenWawiTech.Content.Players;
|
||||||
|
|
||||||
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
||||||
{
|
{
|
||||||
@@ -37,7 +38,7 @@ namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
|||||||
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+20% magic damage and -15% mana cost";
|
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+20% magic damage and -15% mana cost";
|
||||||
player.GetDamage(DamageClass.Magic) += 0.20f;
|
player.GetDamage(DamageClass.Magic) += 0.20f;
|
||||||
player.manaCost -= 0.15f;
|
player.manaCost -= 0.15f;
|
||||||
// TODO: Implement thermal vision drone marking system
|
player.GetModPlayer<AvaliSkirmisherPlayer>().EnableThermalDrones();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void AddRecipes()
|
public override void AddRecipes()
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using Terraria.ModLoader;
|
|||||||
using ForgottenWawiTech.Content.Items.Materials;
|
using ForgottenWawiTech.Content.Items.Materials;
|
||||||
using ForgottenWawiTech.Content.Rarities;
|
using ForgottenWawiTech.Content.Rarities;
|
||||||
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
using ForgottenWawiTech.Content.Items.Armor.AvaliScoutSet;
|
||||||
|
using ForgottenWawiTech.Content.Players;
|
||||||
|
|
||||||
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
||||||
{
|
{
|
||||||
@@ -36,7 +37,7 @@ namespace ForgottenWawiTech.Content.Items.Armor.AvaliSkirmisherSet
|
|||||||
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+18% ranged damage and critical strike chance";
|
player.setBonus = "Summons thermal vision drones that mark enemies\nMarked enemies take 12% more damage\n+18% ranged damage and critical strike chance";
|
||||||
player.GetDamage(DamageClass.Ranged) += 0.18f;
|
player.GetDamage(DamageClass.Ranged) += 0.18f;
|
||||||
player.GetCritChance(DamageClass.Ranged) += 18;
|
player.GetCritChance(DamageClass.Ranged) += 18;
|
||||||
// TODO: Implement thermal vision drone marking system
|
player.GetModPlayer<AvaliSkirmisherPlayer>().EnableThermalDrones();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void AddRecipes()
|
public override void AddRecipes()
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
using Microsoft.Xna.Framework;
|
||||||
|
using Terraria;
|
||||||
|
using Terraria.ID;
|
||||||
|
using Terraria.ModLoader;
|
||||||
|
using ForgottenWawiTech.Content.Projectiles.Avali;
|
||||||
|
|
||||||
|
namespace ForgottenWawiTech.Content.Players
|
||||||
|
{
|
||||||
|
public class AvaliSkirmisherPlayer : ModPlayer
|
||||||
|
{
|
||||||
|
private const int DroneCount = 2;
|
||||||
|
private const float SpawnRadius = 60f;
|
||||||
|
|
||||||
|
public bool ThermalDronesActive { get; private set; }
|
||||||
|
|
||||||
|
public override void ResetEffects()
|
||||||
|
{
|
||||||
|
ThermalDronesActive = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void EnableThermalDrones()
|
||||||
|
{
|
||||||
|
ThermalDronesActive = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void PostUpdate()
|
||||||
|
{
|
||||||
|
if (!ThermalDronesActive)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Player.whoAmI != Main.myPlayer)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int droneType = ModContent.ProjectileType<AvaliThermalDrone>();
|
||||||
|
int owned = Player.ownedProjectileCounts[droneType];
|
||||||
|
if (owned >= DroneCount)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var source = Player.GetSource_Misc("AvaliSkirmisherSet");
|
||||||
|
for (int i = owned; i < DroneCount; i++)
|
||||||
|
{
|
||||||
|
float rotationOffset = MathHelper.TwoPi * i / DroneCount;
|
||||||
|
Vector2 spawnPos = Player.Center + rotationOffset.ToRotationVector2() * SpawnRadius;
|
||||||
|
Projectile.NewProjectile(
|
||||||
|
source,
|
||||||
|
spawnPos,
|
||||||
|
Vector2.Zero,
|
||||||
|
droneType,
|
||||||
|
0,
|
||||||
|
0f,
|
||||||
|
Player.whoAmI,
|
||||||
|
i,
|
||||||
|
DroneCount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
using Microsoft.Xna.Framework;
|
||||||
|
using Terraria;
|
||||||
|
using Terraria.ID;
|
||||||
|
using Terraria.ModLoader;
|
||||||
|
using ForgottenWawiTech.Content.Buffs.Debuffs;
|
||||||
|
using ForgottenWawiTech.Content.Players;
|
||||||
|
|
||||||
|
namespace ForgottenWawiTech.Content.Projectiles.Avali
|
||||||
|
{
|
||||||
|
public class AvaliThermalDrone : ModProjectile
|
||||||
|
{
|
||||||
|
private const float OrbitSpeed = 0.06f;
|
||||||
|
private const float OrbitRadius = 72f;
|
||||||
|
private const int MarkCooldown = 45;
|
||||||
|
private const float MarkRange = 700f;
|
||||||
|
|
||||||
|
public override void SetStaticDefaults()
|
||||||
|
{
|
||||||
|
ProjectileID.Sets.MinionSacrificable[Type] = false;
|
||||||
|
ProjectileID.Sets.MinionShot[Type] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void SetDefaults()
|
||||||
|
{
|
||||||
|
Projectile.width = 26;
|
||||||
|
Projectile.height = 26;
|
||||||
|
Projectile.friendly = true;
|
||||||
|
Projectile.DamageType = DamageClass.Summon;
|
||||||
|
Projectile.penetrate = -1;
|
||||||
|
Projectile.tileCollide = false;
|
||||||
|
Projectile.ignoreWater = true;
|
||||||
|
Projectile.timeLeft = 2;
|
||||||
|
Projectile.netImportant = true;
|
||||||
|
Projectile.minion = true;
|
||||||
|
Projectile.minionSlots = 0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void AI()
|
||||||
|
{
|
||||||
|
Player owner = Main.player[Projectile.owner];
|
||||||
|
AvaliSkirmisherPlayer modPlayer = owner.GetModPlayer<AvaliSkirmisherPlayer>();
|
||||||
|
if (!owner.active || owner.dead || !modPlayer.ThermalDronesActive)
|
||||||
|
{
|
||||||
|
Projectile.Kill();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Projectile.timeLeft = 2;
|
||||||
|
|
||||||
|
float index = Projectile.ai[0];
|
||||||
|
float total = Projectile.ai[1];
|
||||||
|
if (total <= 0f)
|
||||||
|
{
|
||||||
|
total = 2f;
|
||||||
|
}
|
||||||
|
|
||||||
|
float rotation = (Main.GameUpdateCount * OrbitSpeed) + index * MathHelper.TwoPi / total;
|
||||||
|
Vector2 offset = rotation.ToRotationVector2() * OrbitRadius;
|
||||||
|
Projectile.Center = owner.Center + offset;
|
||||||
|
Projectile.velocity = owner.velocity;
|
||||||
|
|
||||||
|
Lighting.AddLight(Projectile.Center, 0.55f, 0.2f, 0.15f);
|
||||||
|
|
||||||
|
if (Projectile.localAI[0]++ >= MarkCooldown)
|
||||||
|
{
|
||||||
|
Projectile.localAI[0] = 0f;
|
||||||
|
if (Projectile.owner == Main.myPlayer)
|
||||||
|
{
|
||||||
|
NPC target = FindTarget(Projectile.Center, MarkRange);
|
||||||
|
if (target != null)
|
||||||
|
{
|
||||||
|
target.AddBuff(ModContent.BuffType<ThermalMarkDebuff>(), 300);
|
||||||
|
Vector2 burstDirection = (target.Center - Projectile.Center).SafeNormalize(Vector2.UnitY);
|
||||||
|
for (int i = 0; i < 6; i++)
|
||||||
|
{
|
||||||
|
Dust dust = Dust.NewDustDirect(Projectile.Center, 0, 0, DustID.Torch, burstDirection.X * 4f, burstDirection.Y * 4f, 120, default, 1.1f);
|
||||||
|
dust.noGravity = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static NPC FindTarget(Vector2 center, float range)
|
||||||
|
{
|
||||||
|
NPC selected = null;
|
||||||
|
float sqrRange = range * range;
|
||||||
|
for (int i = 0; i < Main.maxNPCs; i++)
|
||||||
|
{
|
||||||
|
NPC npc = Main.npc[i];
|
||||||
|
if (!npc.active || npc.friendly || npc.dontTakeDamage || npc.life <= 0)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
float dist = Vector2.DistanceSquared(center, npc.Center);
|
||||||
|
if (dist < sqrRange && Collision.CanHitLine(center, 0, 0, npc.Center, 0, 0))
|
||||||
|
{
|
||||||
|
sqrRange = dist;
|
||||||
|
selected = npc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return selected;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 504 B |
@@ -991,6 +991,7 @@ Projectiles: {
|
|||||||
TranscendentBladeShard.DisplayName: Transcendent Blade Shard
|
TranscendentBladeShard.DisplayName: Transcendent Blade Shard
|
||||||
TranscendentNova.DisplayName: Transcendent Nova
|
TranscendentNova.DisplayName: Transcendent Nova
|
||||||
TranscendentRailBolt.DisplayName: Transcendent Rail Bolt
|
TranscendentRailBolt.DisplayName: Transcendent Rail Bolt
|
||||||
|
AvaliThermalDrone.DisplayName: Avali Thermal Drone
|
||||||
}
|
}
|
||||||
|
|
||||||
Prefixes: {
|
Prefixes: {
|
||||||
@@ -1003,4 +1004,9 @@ Buffs: {
|
|||||||
DisplayName: Nullified
|
DisplayName: Nullified
|
||||||
Description: Your wings feel heavy and unresponsive, alongside a general sense of numbness.
|
Description: Your wings feel heavy and unresponsive, alongside a general sense of numbness.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ThermalMarkDebuff: {
|
||||||
|
DisplayName: Thermal Mark
|
||||||
|
Description: You are tagged by Avali thermal drones, making you vulnerable.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user