v1.4, add new painting

Ouroel · Jun 28, 2021 · 1f2a928 · 1f2a928
1 parent a3acfbe
commit 1f2a928
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 8 deletions.
diff --git a/Items/Placeable/CuteSlimeStatueItem.cs b/Items/Placeable/CuteSlimeStatueItem.cs
@@ -4,6 +4,7 @@
 
 namespace AssortedCrazyThings.Items.Placeable
 {
+    //TODO RegularCuteSlimes config
     [Content(ContentType.Placeables | ContentType.CuteSlimes)]
     public class CuteSlimeStatueItem : PlaceableItem<CuteSlimeStatueTile>
     {

diff --git a/Items/Placeable/Paintings/PaintingItemBase.cs b/Items/Placeable/Paintings/PaintingItemBase.cs
@@ -27,18 +27,12 @@ public sealed override void SetStaticDefaults()
 
 		public sealed override void SetDefaults()
 		{
+			Item.DefaultToPlacableTile(TileType);
 			Item.value = Item.buyPrice(gold: 1);
 			Item.width = 32;
 			Item.height = 32;
 			Item.maxStack = 999;
-			Item.useTurn = true;
-			Item.autoReuse = true;
-			Item.useAnimation = 15;
-			Item.useTime = 10;
-			Item.useStyle = ItemUseStyleID.Swing;
-			Item.consumable = true;
 			Item.rare = ItemRarityID.Blue;
-			Item.createTile = TileType;
 		}
 	}
 }
diff --git a/Items/Placeable/Paintings/SCP099Item.cs b/Items/Placeable/Paintings/SCP099Item.cs
@@ -0,0 +1,12 @@
+using AssortedCrazyThings.Tiles.Paintings;
+
+namespace AssortedCrazyThings.Items.Placeable.Paintings
+{
+	//TODO aquisition
+	public class SCP099Item : PaintingItemBase<SCP099>
+	{
+		public override string PaintingName => "The Portrait";
+
+		public override string PaintingAuthor => "R. Magritte";
+	}
+}
diff --git a/Items/Placeable/Paintings/SCP099Item.png b/Items/Placeable/Paintings/SCP099Item.png
diff --git a/Tiles/Paintings/SCP099.cs b/Tiles/Paintings/SCP099.cs
@@ -0,0 +1,10 @@
+using AssortedCrazyThings.Items.Placeable.Paintings;
+using Terraria.ModLoader;
+
+namespace AssortedCrazyThings.Tiles.Paintings
+{
+	public class SCP099 : PaintingTileBase<SCP099Item>
+	{
+
+	}
+}
diff --git a/Tiles/Paintings/SCP099.png b/Tiles/Paintings/SCP099.png
diff --git a/Wiki/Placeable/SCP099.png b/Wiki/Placeable/SCP099.png
diff --git a/Wiki/Placeable/SCP099Item.png b/Wiki/Placeable/SCP099Item.png
diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 author = Harblesnargits, direwolf420
-version = 1.3.1.2
+version = 1.4
 displayName = Assorted Crazy Things
 hideResources = true
 buildIgnore = *.csproj, *.user, *.md, obj\*, bin\*, .vs\*, Wiki\*, Guides\*, .gitignore, sample.png

diff --git a/icon.png b/icon.png