Fixed Nova placeables

IAmBatby · Jul 13, 2017 · 918003f · 918003f
1 parent 934cc1a
commit 918003f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/NovaPillar/Items/Placeable/NovaFragmentBlock.cs b/NovaPillar/Items/Placeable/NovaFragmentBlock.cs
@@ -1,5 +1,6 @@
 using Terraria.ID;
 using Terraria.ModLoader;
+using Tremor.NovaPillar.Tiles;
 
 namespace Tremor.NovaPillar.Items.Placeable
 {
@@ -18,13 +19,12 @@ public override void SetDefaults()
 			item.useStyle = 1;
 			item.rare = 0;
 			item.consumable = true;
-			item.createTile = mod.TileType("NovaBlock");
+			item.createTile = mod.TileType<NovaBlock>();
 		}
 
 		public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("Nova Fragment Block");
-			Tooltip.SetDefault("");
 		}
 
 

diff --git a/NovaPillar/Items/Placeable/NovaMonolith.cs b/NovaPillar/Items/Placeable/NovaMonolith.cs
@@ -1,5 +1,6 @@
 using Terraria;
 using Terraria.ModLoader;
+using Tremor.NovaPillar.Tiles;
 
 namespace Tremor.NovaPillar.Items.Placeable
 {
@@ -18,7 +19,7 @@ public override void SetDefaults()
 			item.consumable = true;
 			item.rare = 10;
 			item.value = Item.buyPrice(0, 10, 0, 0);
-			item.createTile = mod.TileType("NovaMonolith_Tile");
+			item.createTile = mod.TileType<NovaMonolithTile>();
 		}
 
 		public override void SetStaticDefaults()

diff --git a/Tremor.csproj b/Tremor.csproj
@@ -185,7 +185,7 @@
     <Compile Include="Buffs\ZephyrhornBuff.cs" />
     <Compile Include="Buffs\ZombatBuff.cs" />
     <Compile Include="Buffs\ZootalooBuff.cs" />
-    <Compile Include="CustomDrop.cs" />
+    <Compile Include="TremorGlobalTile.cs" />
     <Compile Include="DungeonGenn\DungeonWorld.cs" />
     <Compile Include="Dusts\Ball.cs" />
     <Compile Include="Dusts\ClusterFlame.cs" />
@@ -236,7 +236,7 @@
     <Compile Include="NovaPillar\Projectiles\NovaSkull.cs" />
     <Compile Include="NovaPillar\Projectiles\NovaSkullburst.cs" />
     <Compile Include="NovaPillar\Tiles\NovaBlock.cs" />
-    <Compile Include="NovaPillar\Tiles\NovaMonolith_Tile.cs" />
+    <Compile Include="NovaPillar\Tiles\NovaMonolithTile.cs" />
     <Compile Include="RecipeWrapper.cs" />
     <Compile Include="TremorGlobalItem.cs" />
     <Compile Include="Gores\IceDroplet.cs" />
@@ -5869,8 +5869,8 @@
     <Content Include="NovaPillar\Projectiles\NovaSkull.png" />
     <Content Include="NovaPillar\Projectiles\NovaSkullburst.png" />
     <Content Include="NovaPillar\Tiles\NovaBlock.png" />
-    <Content Include="NovaPillar\Tiles\NovaMonolith_Tile.png" />
-    <Content Include="NovaPillar\Tiles\NovaMonolith_TileGlow.png" />
+    <Content Include="NovaPillar\Tiles\NovaMonolithTile.png" />
+    <Content Include="NovaPillar\Tiles\NovaMonolithTile_Glowmask.png" />
     <Content Include="NPCs\Abomination.png" />
     <Content Include="NPCs\Agloomination.png" />
     <Content Include="NPCs\Alchemaster.png" />

diff --git a/TremorGlobalTile.cs b/TremorGlobalTile.cs
@@ -0,0 +1,22 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Tremor
+{
+	class TremorGlobalTile : GlobalTile
+	{
+		public override bool Drop(int i, int j, int type)
+		{
+			if (type == TileID.Emerald)
+			{
+				if (Main.rand.Next(20) == 1)
+				{
+					Item.NewItem(i * 16, j * 16, 48, 32, mod.ItemType("EmeraldStone"));
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+}