diff --git a/Content/Projectiles/Avali/AvaliHuntingDrone.cs b/Content/Projectiles/Avali/AvaliHuntingDrone.cs index 6750c11..0ece4f0 100644 --- a/Content/Projectiles/Avali/AvaliHuntingDrone.cs +++ b/Content/Projectiles/Avali/AvaliHuntingDrone.cs @@ -15,6 +15,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Avali private const float TargetRange = 920f; private const float ShotSpeed = 19.5f; + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetStaticDefaults() { ProjectileID.Sets.MinionSacrificable[Type] = false; diff --git a/Content/Projectiles/Avali/AvaliHuntingDrone.png b/Content/Projectiles/Avali/AvaliHuntingDrone.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Avali/AvaliHuntingDrone.png and /dev/null differ diff --git a/Content/Projectiles/Avali/AvaliHuntingDroneShot.cs b/Content/Projectiles/Avali/AvaliHuntingDroneShot.cs index f5f3e72..949a8b0 100644 --- a/Content/Projectiles/Avali/AvaliHuntingDroneShot.cs +++ b/Content/Projectiles/Avali/AvaliHuntingDroneShot.cs @@ -6,8 +6,12 @@ using Terraria.ModLoader; namespace ForgottenWawiTech.Content.Projectiles.Avali { + public class AvaliHuntingDroneShot : ModProjectile { + + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetStaticDefaults() { ProjectileID.Sets.MinionShot[Type] = true; diff --git a/Content/Projectiles/Avali/AvaliHuntingDroneShot.png b/Content/Projectiles/Avali/AvaliHuntingDroneShot.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Avali/AvaliHuntingDroneShot.png and /dev/null differ diff --git a/Content/Projectiles/Avali/AvaliThermalDrone.cs b/Content/Projectiles/Avali/AvaliThermalDrone.cs index b930af2..6d1ddf0 100644 --- a/Content/Projectiles/Avali/AvaliThermalDrone.cs +++ b/Content/Projectiles/Avali/AvaliThermalDrone.cs @@ -14,6 +14,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Avali private const int MarkCooldown = 45; private const float MarkRange = 700f; + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetStaticDefaults() { ProjectileID.Sets.MinionSacrificable[Type] = false; diff --git a/Content/Projectiles/Avali/AvaliThermalDrone.png b/Content/Projectiles/Avali/AvaliThermalDrone.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Avali/AvaliThermalDrone.png and /dev/null differ diff --git a/Content/Projectiles/Protogen/ProtogenOperativeNanite.cs b/Content/Projectiles/Protogen/ProtogenOperativeNanite.cs index 104a667..4a7ea18 100644 --- a/Content/Projectiles/Protogen/ProtogenOperativeNanite.cs +++ b/Content/Projectiles/Protogen/ProtogenOperativeNanite.cs @@ -11,6 +11,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Protogen private const float HomingStrength = 0.14f; private const float DesiredSpeed = 14f; + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetStaticDefaults() { ProjectileID.Sets.MinionShot[Type] = true; diff --git a/Content/Projectiles/Protogen/ProtogenOperativeNanite.png b/Content/Projectiles/Protogen/ProtogenOperativeNanite.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Protogen/ProtogenOperativeNanite.png and /dev/null differ diff --git a/Content/Projectiles/Protogen/ProtogenSentinelCore.cs b/Content/Projectiles/Protogen/ProtogenSentinelCore.cs index 35ed5d1..fff3852 100644 --- a/Content/Projectiles/Protogen/ProtogenSentinelCore.cs +++ b/Content/Projectiles/Protogen/ProtogenSentinelCore.cs @@ -16,6 +16,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Protogen private const float TargetRange = 950f; private const float BeamVelocity = 18f; + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetStaticDefaults() { ProjectileID.Sets.MinionSacrificable[Type] = false; diff --git a/Content/Projectiles/Protogen/ProtogenSentinelCore.png b/Content/Projectiles/Protogen/ProtogenSentinelCore.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Protogen/ProtogenSentinelCore.png and /dev/null differ diff --git a/Content/Projectiles/Protogen/ProtogenSentinelCoreBeam.cs b/Content/Projectiles/Protogen/ProtogenSentinelCoreBeam.cs index 1b489e2..15a990a 100644 --- a/Content/Projectiles/Protogen/ProtogenSentinelCoreBeam.cs +++ b/Content/Projectiles/Protogen/ProtogenSentinelCoreBeam.cs @@ -9,6 +9,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Protogen { public class ProtogenSentinelCoreBeam : ModProjectile { + + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; public override void SetStaticDefaults() { ProjectileID.Sets.MinionShot[Type] = true; diff --git a/Content/Projectiles/Protogen/ProtogenSentinelCoreBeam.png b/Content/Projectiles/Protogen/ProtogenSentinelCoreBeam.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Protogen/ProtogenSentinelCoreBeam.png and /dev/null differ diff --git a/Content/Projectiles/Protogen/ProtogenSentinelFragment.cs b/Content/Projectiles/Protogen/ProtogenSentinelFragment.cs index 94a0942..c400f8f 100644 --- a/Content/Projectiles/Protogen/ProtogenSentinelFragment.cs +++ b/Content/Projectiles/Protogen/ProtogenSentinelFragment.cs @@ -9,6 +9,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Protogen { public class ProtogenSentinelFragment : ModProjectile { + + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; private const float HomingRange = 560f; private const float HomingStrength = 0.18f; private const float DesiredSpeed = 15f; diff --git a/Content/Projectiles/Protogen/ProtogenSentinelFragment.png b/Content/Projectiles/Protogen/ProtogenSentinelFragment.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Protogen/ProtogenSentinelFragment.png and /dev/null differ diff --git a/Content/Projectiles/Singularity/SingularityOrb.cs b/Content/Projectiles/Singularity/SingularityOrb.cs index 96d4f2f..3ac4114 100644 --- a/Content/Projectiles/Singularity/SingularityOrb.cs +++ b/Content/Projectiles/Singularity/SingularityOrb.cs @@ -15,6 +15,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Singularity private const float TargetRange = 1000f; private const float BeamSpeed = 21f; + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetStaticDefaults() { ProjectileID.Sets.MinionSacrificable[Type] = false; diff --git a/Content/Projectiles/Singularity/SingularityOrb.png b/Content/Projectiles/Singularity/SingularityOrb.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Singularity/SingularityOrb.png and /dev/null differ diff --git a/Content/Projectiles/Singularity/SingularityOrbBeam.cs b/Content/Projectiles/Singularity/SingularityOrbBeam.cs index 5142eb3..cde26ad 100644 --- a/Content/Projectiles/Singularity/SingularityOrbBeam.cs +++ b/Content/Projectiles/Singularity/SingularityOrbBeam.cs @@ -12,6 +12,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Singularity ProjectileID.Sets.MinionShot[Type] = true; } + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetDefaults() { Projectile.width = 16; diff --git a/Content/Projectiles/Singularity/SingularityOrbBeam.png b/Content/Projectiles/Singularity/SingularityOrbBeam.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Singularity/SingularityOrbBeam.png and /dev/null differ diff --git a/Content/Projectiles/Transcendent/TranscendentAscendantBolt.cs b/Content/Projectiles/Transcendent/TranscendentAscendantBolt.cs index 5a48a0a..9301d86 100644 --- a/Content/Projectiles/Transcendent/TranscendentAscendantBolt.cs +++ b/Content/Projectiles/Transcendent/TranscendentAscendantBolt.cs @@ -11,10 +11,7 @@ namespace ForgottenWawiTech.Content.Projectiles.Transcendent private const float HomingStrength = 0.2f; private const float DesiredSpeed = 20f; -/* public override void SetStaticDefaults() - { - ProjectileID.Sets.MinionShot[Type] = true; - } */ + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; public override void SetDefaults() { diff --git a/Content/Projectiles/Transcendent/TranscendentAscendantBolt.png b/Content/Projectiles/Transcendent/TranscendentAscendantBolt.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Transcendent/TranscendentAscendantBolt.png and /dev/null differ diff --git a/Content/Projectiles/Transcendent/TranscendentAscendantDrone.cs b/Content/Projectiles/Transcendent/TranscendentAscendantDrone.cs index 9d7971a..f2c65e8 100644 --- a/Content/Projectiles/Transcendent/TranscendentAscendantDrone.cs +++ b/Content/Projectiles/Transcendent/TranscendentAscendantDrone.cs @@ -15,6 +15,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Transcendent private const float TargetRange = 1100f; private const float BoltSpeed = 19f; + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetStaticDefaults() { ProjectileID.Sets.MinionSacrificable[Type] = false; diff --git a/Content/Projectiles/Transcendent/TranscendentAscendantDrone.png b/Content/Projectiles/Transcendent/TranscendentAscendantDrone.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Transcendent/TranscendentAscendantDrone.png and /dev/null differ diff --git a/Content/Projectiles/Transcendent/TranscendentBladeShard.cs b/Content/Projectiles/Transcendent/TranscendentBladeShard.cs index 4d927aa..f830257 100644 --- a/Content/Projectiles/Transcendent/TranscendentBladeShard.cs +++ b/Content/Projectiles/Transcendent/TranscendentBladeShard.cs @@ -14,6 +14,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Transcendent ProjectileID.Sets.TrailingMode[Type] = 2; } + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetDefaults() { Projectile.width = 18; diff --git a/Content/Projectiles/Transcendent/TranscendentBladeShard.png b/Content/Projectiles/Transcendent/TranscendentBladeShard.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Transcendent/TranscendentBladeShard.png and /dev/null differ diff --git a/Content/Projectiles/Transcendent/TranscendentNaniteShard.cs b/Content/Projectiles/Transcendent/TranscendentNaniteShard.cs index 851b938..30a2294 100644 --- a/Content/Projectiles/Transcendent/TranscendentNaniteShard.cs +++ b/Content/Projectiles/Transcendent/TranscendentNaniteShard.cs @@ -16,6 +16,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Transcendent ProjectileID.Sets.MinionShot[Type] = true; } + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetDefaults() { Projectile.width = 14; diff --git a/Content/Projectiles/Transcendent/TranscendentNaniteShard.png b/Content/Projectiles/Transcendent/TranscendentNaniteShard.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Transcendent/TranscendentNaniteShard.png and /dev/null differ diff --git a/Content/Projectiles/Transcendent/TranscendentNova.cs b/Content/Projectiles/Transcendent/TranscendentNova.cs index 94f5e01..026e73b 100644 --- a/Content/Projectiles/Transcendent/TranscendentNova.cs +++ b/Content/Projectiles/Transcendent/TranscendentNova.cs @@ -15,6 +15,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Transcendent ProjectileID.Sets.TrailingMode[Type] = 2; } + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetDefaults() { Projectile.width = 28; diff --git a/Content/Projectiles/Transcendent/TranscendentNova.png b/Content/Projectiles/Transcendent/TranscendentNova.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Transcendent/TranscendentNova.png and /dev/null differ diff --git a/Content/Projectiles/Transcendent/TranscendentRailBolt.cs b/Content/Projectiles/Transcendent/TranscendentRailBolt.cs index c4c9c15..13be288 100644 --- a/Content/Projectiles/Transcendent/TranscendentRailBolt.cs +++ b/Content/Projectiles/Transcendent/TranscendentRailBolt.cs @@ -15,6 +15,8 @@ namespace ForgottenWawiTech.Content.Projectiles.Transcendent ProjectileID.Sets.TrailingMode[Type] = 3; } + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; + public override void SetDefaults() { Projectile.width = 14; diff --git a/Content/Projectiles/Transcendent/TranscendentRailBolt.png b/Content/Projectiles/Transcendent/TranscendentRailBolt.png deleted file mode 100644 index 9e0cf81..0000000 Binary files a/Content/Projectiles/Transcendent/TranscendentRailBolt.png and /dev/null differ diff --git a/Content/Projectiles/TridentOfTheSunken/TridentOfTheSunkenBlast.cs b/Content/Projectiles/TridentOfTheSunken/TridentOfTheSunkenBlast.cs index 79b6d56..b8e583e 100644 --- a/Content/Projectiles/TridentOfTheSunken/TridentOfTheSunkenBlast.cs +++ b/Content/Projectiles/TridentOfTheSunken/TridentOfTheSunkenBlast.cs @@ -8,7 +8,7 @@ namespace ForgottenWawiTech.Content.Projectiles.TridentOfTheSunken { public class TridentOfTheSunkenBlast : ModProjectile { - public override string Texture => "Terraria/Images/Projectile_647"; // Duke Fishron bubble burst as placeholder + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderProj"; public override void SetDefaults() { diff --git a/Content/Tiles/CraftingStations/HighTechMarvel.cs b/Content/Tiles/CraftingStations/HighTechMarvel.cs index d1ed46d..fcdc36d 100644 --- a/Content/Tiles/CraftingStations/HighTechMarvel.cs +++ b/Content/Tiles/CraftingStations/HighTechMarvel.cs @@ -4,15 +4,20 @@ using Terraria.ID; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Terraria.Localization; +using Terraria.DataStructures; +using Terraria.ObjectData; namespace ForgottenWawiTech.Content.Tiles.CraftingStations { public class HighTechMarvel : ModTile { + + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderTile"; public override void SetStaticDefaults() { Main.tileSolid[Type] = false; Main.tileNoAttach[Type] = true; + Main.tileFrameImportant[Type] = true; AdjTiles = new int[] { TileID.WorkBenches, TileID.Anvils, @@ -29,8 +34,11 @@ namespace ForgottenWawiTech.Content.Tiles.CraftingStations TileID.LunarCraftingStation }; - AddMapEntry(new Color(150, 50, 250), Language.GetText("High Tech Marvel")); - //TileObjectData.newTile.CopyFrom(TileObjectData.Style3x2); + TileObjectData.newTile.CopyFrom(TileObjectData.Style2x2); + // Register the object data so TileObjectData lookups succeed. + TileObjectData.addTile(Type); + + AddMapEntry(new Color(120, 85, 60), Language.GetText("HighTechMarvel")); } diff --git a/Content/Tiles/CraftingStations/SingularitySealingUnit.cs b/Content/Tiles/CraftingStations/SingularitySealingUnit.cs index 62cdf68..1a445f3 100644 --- a/Content/Tiles/CraftingStations/SingularitySealingUnit.cs +++ b/Content/Tiles/CraftingStations/SingularitySealingUnit.cs @@ -4,15 +4,19 @@ using Terraria.ID; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Terraria.Localization; +using Terraria.DataStructures; +using Terraria.ObjectData; namespace ForgottenWawiTech.Content.Tiles.CraftingStations { public class SingularitySealingUnit : ModTile { + public override string Texture => "ForgottenWawiTech/Assets/PlaceholderTile"; // 2x2 placeholder tile public override void SetStaticDefaults() { Main.tileSolid[Type] = false; Main.tileNoAttach[Type] = true; + Main.tileFrameImportant[Type] = true; AdjTiles = new int[] { TileID.WorkBenches, TileID.Anvils, @@ -27,17 +31,11 @@ namespace ForgottenWawiTech.Content.Tiles.CraftingStations TileID.CrystalBall, TileID.TinkerersWorkbench }; - AddMapEntry(new Color(150, 50, 250), Language.GetText("SingularitySealingUnitItem")); - //TileObjectData.newTile.CopyFrom(TileObjectData.Style3x2); + TileObjectData.newTile.CopyFrom(TileObjectData.Style2x2); + // Register the tile's placement data so the loader doesn't throw. + TileObjectData.addTile(Type); + + AddMapEntry(new Color(120, 85, 60), Language.GetText("SingularitySealingUnit")); } - - -/* public override void NearbyEffects(int i, int j, bool closer) - { - if (closer) - { - Main.LocalPlayer.AddBuff(BuffID.WellFed, 60); - } - } */ } } \ No newline at end of file