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

Commit

Permalink
Restructured NovaPillar dir
Browse files Browse the repository at this point in the history
  • Loading branch information
Jofairden committed Jul 13, 2017
1 parent c076d2b commit 934cc1a
Show file tree
Hide file tree
Showing 89 changed files with 139 additions and 144 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Accessories
{
[AutoloadEquip(EquipType.Wings)]
public class NovaWings : ModItem
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Armor
{
[AutoloadEquip(EquipType.Body)]
public class NovaBreastplate : ModItem
{

public override void SetDefaults()
{

item.width = 36;
item.height = 24;


item.rare = 10;
item.defense = 22;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Armor
{
[AutoloadEquip(EquipType.Head)]
public class NovaHelmet : ModItem
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Armor
{
[AutoloadEquip(EquipType.Legs)]
public class NovaLeggings : ModItem
Expand Down
File renamed without changes
2 changes: 1 addition & 1 deletion NovaPillar/NovaDye.cs → NovaPillar/Items/NovaDye.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items
{
public class NovaDye : ModItem
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items
{
public class NovaFragment : ModItem
{
Expand Down
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Placeable
{
public class NovaFragmentBlock : ModItem
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Placeable
{
public class NovaMonolith : ModItem
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Weapons
{
public class NovaFlask : AlchemistItem
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Weapons
{
public class NovaHamaxe : ModItem
{
Expand Down Expand Up @@ -30,7 +30,7 @@ public override void SetStaticDefaults()
{
DisplayName.SetDefault("Nova Hamaxe");
Tooltip.SetDefault("");
TremorGlowMask.AddGlowMask(item.type,"Tremor/NovaPillar/NovaHamaxe_Glow");
TremorGlowMask.AddGlowMask(item.type, "Tremor/NovaPillar/Items/Weapons/NovaHamaxe_Glow");
}


Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Weapons
{
public class NovaPickaxe : ModItem
{
Expand Down Expand Up @@ -30,7 +30,7 @@ public override void SetStaticDefaults()
{
DisplayName.SetDefault("Nova Pickaxe");
Tooltip.SetDefault("");
TremorGlowMask.AddGlowMask(item.type,"Tremor/NovaPillar/NovaPickaxe_Glow");
TremorGlowMask.AddGlowMask(item.type, "Tremor/NovaPillar/Items/Weapons/NovaPickaxe_Glow");
}


Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Items.Weapons
{
public class NovaSprayer : AlchemistItem
{
Expand Down
File renamed without changes
4 changes: 2 additions & 2 deletions NovaPillar/Deadling.cs → NovaPillar/NPCs/Deadling.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{
public class Deadling : ModNPC
{
Expand Down Expand Up @@ -57,7 +57,7 @@ public override bool PreAI()

public override void PostDraw(SpriteBatch spriteBatch, Color drawColor)
{
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/Deadling_GlowMask"));
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Deadling_GlowMask"));
}

public override void OnHitPlayer(Player player, int damage, bool crit)
Expand Down
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{
public class NovaAlchemist : ModNPC
{
Expand Down Expand Up @@ -116,7 +116,7 @@ public override void AI()

public override void PostDraw(SpriteBatch spriteBatch, Color drawColor)
{
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NovaAlchemist_GlowMask"));
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/NovaAlchemist_GlowMask"));
}

public void NovaAnimation()
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{

public class NovaAlchemistC : ModNPC
Expand Down
File renamed without changes
4 changes: 2 additions & 2 deletions NovaPillar/NovaBat.cs → NovaPillar/NPCs/NovaBat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{
public class NovaBat : ModNPC
{
Expand Down Expand Up @@ -36,7 +36,7 @@ public override float SpawnChance(NPCSpawnInfo spawnInfo)

public override void PostDraw(SpriteBatch spriteBatch, Color drawColor)
{
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NovaBat_GlowMask"));
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/NovaBat_GlowMask"));
}

public override void HitEffect(int hitDirection, double damage)
Expand Down
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions NovaPillar/NovaFlier.cs → NovaPillar/NPCs/NovaFlier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{
public class NovaFlier : ModNPC
{
Expand Down Expand Up @@ -73,7 +73,7 @@ public override void AI()

public override void PostDraw(SpriteBatch spriteBatch, Color drawColor)
{
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NovaFlier_GlowMask"));
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/NovaFlier_GlowMask"));
}

public override void HitEffect(int hitDirection, double damage)
Expand Down
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions NovaPillar/Varki.cs → NovaPillar/NPCs/Varki.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{
public class Varki : ModNPC
{
Expand Down Expand Up @@ -60,7 +60,7 @@ public override void AI()

public override void PostDraw(SpriteBatch spriteBatch, Color drawColor)
{
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/Varki_GlowMask"));
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Varki_GlowMask"));
}

public override void HitEffect(int hitDirection, double damage)
Expand Down
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions NovaPillar/Youwarkee.cs → NovaPillar/NPCs/Youwarkee.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{
public class Youwarkee : ModNPC
{
Expand Down Expand Up @@ -110,7 +110,7 @@ public override void AI()

public override void PostDraw(SpriteBatch spriteBatch, Color drawColor)
{
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/Youwarkee_GlowMask"));
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Youwarkee_GlowMask"));
}

public override void HitEffect(int hitDirection, double damage)
Expand Down
File renamed without changes
4 changes: 2 additions & 2 deletions NovaPillar/Youwarkee2.cs → NovaPillar/NPCs/Youwarkee2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.NPCs
{
public class Youwarkee2 : ModNPC
{
Expand Down Expand Up @@ -98,7 +98,7 @@ public override void AI()

public override void PostDraw(SpriteBatch spriteBatch, Color drawColor)
{
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/Youwarkee2_GlowMask"));
TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Youwarkee2_GlowMask"));
}

public override void HitEffect(int hitDirection, double damage)
Expand Down
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaAlchemistCloud : ModProjectile
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaAlchemistProjectile : ModProjectile
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar.Alchemic
namespace Tremor.NovaPillar.Projectiles
{
public class NovaBlast : ModProjectile
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaBottle : ModProjectile
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar.Alchemic
namespace Tremor.NovaPillar.Projectiles
{
public class NovaBurst : ModProjectile
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaCauldron : ModProjectile
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaCauldron_Fire : ModProjectile
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaFlask_Proj : ModProjectile
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaFlask_ProjBall : ModProjectile
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaFlask_ProjFire : ModProjectile
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Projectiles
{
public class NovaFlierProj : ModProjectile
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar.Alchemic
namespace Tremor.NovaPillar.Projectiles
{
public class NovaSkull : ModProjectile
{
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Terraria;
using Terraria.ModLoader;

namespace Tremor.NovaPillar.Alchemic
namespace Tremor.NovaPillar.Projectiles
{
public class NovaSkullburst : ModProjectile
{
Expand Down
2 changes: 1 addition & 1 deletion NovaPillar/NovaBlock.cs → NovaPillar/Tiles/NovaBlock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Terraria.ID;
using Terraria.ModLoader;

namespace Tremor.NovaPillar
namespace Tremor.NovaPillar.Tiles
{
public class NovaBlock : ModTile
{
Expand Down
File renamed without changes
Loading

0 comments on commit 934cc1a

Please sign in to comment.