Fix #47: Integrate individual option inventory sprites

cheeeeeeeeeen · Oct 10, 2019 · a817002 · a817002
1 parent 3fef486
commit a817002
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 4 deletions.
diff --git a/Items/Accessories/Options/Freeze/FreezeOptionBase.cs b/Items/Accessories/Options/Freeze/FreezeOptionBase.cs
@@ -1,9 +1,26 @@
 using Terraria;
+using Terraria.DataStructures;
 
 namespace ChensGradiusMod.Items.Accessories.Options.Freeze
 {
   public abstract class FreezeOptionBase : OptionBase
   {
+    public override void SetStaticDefaults()
+    {
+      base.SetStaticDefaults();
+      Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(6, 6));
+    }
+
+    public override void SetDefaults()
+    {
+      base.SetDefaults();
+
+      item.width = 48;
+      item.height = 60;
+    }
+
+    public override string Texture => $"ChensGradiusMod/Sprites/FreezeInv{OptionPosition}";
+
     protected override string OptionTooltip =>
       "Deploys an Option type Freeze.\n" +
       "Some projectiles you create are copied by the drone.\n" +

diff --git a/Items/Accessories/Options/OptionBase.cs b/Items/Accessories/Options/OptionBase.cs
@@ -8,18 +8,18 @@ public abstract class OptionBase : ParentGradiusAccessory
     public override void SetStaticDefaults()
     {
       Tooltip.SetDefault(OptionTooltip);
-      Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(5, 9));
+      Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(10, 5));
     }
 
     public override void SetDefaults()
     {
       base.SetDefaults();
 
-      item.width = 28;
-      item.height = 20;
+      item.width = 44;
+      item.height = 52;
     }
 
-    public override string Texture => "ChensGradiusMod/Sprites/OptionSheet";
+    public override string Texture => $"ChensGradiusMod/Sprites/OptionInv{OptionPosition}";
 
     public override void UpdateAccessory(Player player, bool hideVisual)
     {

diff --git a/Items/Accessories/Options/Rotate/RotateOptionBase.cs b/Items/Accessories/Options/Rotate/RotateOptionBase.cs
@@ -1,4 +1,5 @@
 using Terraria;
+using Terraria.DataStructures;
 
 namespace ChensGradiusMod.Items.Accessories.Options.Rotate
 {
@@ -10,6 +11,14 @@ public enum States : int { Following, Grouping, Rotating, Recovering };
     public const float Speed = 10f;
     public const float AcceptedThreshold = .01f;
 
+    public override void SetStaticDefaults()
+    {
+      base.SetStaticDefaults();
+      Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(4, 6));
+    }
+
+    public override string Texture => $"ChensGradiusMod/Sprites/RotateInv{OptionPosition}";
+
     protected override string OptionTooltip =>
       "Deploys an Option type Rotate.\n" +
       "Some projectiles you create are copied by the drone.\n" +

diff --git a/Sprites/FreezeInv1.png b/Sprites/FreezeInv1.png
diff --git a/Sprites/FreezeInv2.png b/Sprites/FreezeInv2.png
diff --git a/Sprites/FreezeInv3.png b/Sprites/FreezeInv3.png
diff --git a/Sprites/FreezeInv4.png b/Sprites/FreezeInv4.png
diff --git a/Sprites/FreezeSheet.png b/Sprites/FreezeSheet.png
diff --git a/Sprites/OptionInv1.png b/Sprites/OptionInv1.png
diff --git a/Sprites/OptionInv2.png b/Sprites/OptionInv2.png
diff --git a/Sprites/OptionInv3.png b/Sprites/OptionInv3.png
diff --git a/Sprites/OptionInv4.png b/Sprites/OptionInv4.png
diff --git a/Sprites/RotateInv1.png b/Sprites/RotateInv1.png
diff --git a/Sprites/RotateInv2.png b/Sprites/RotateInv2.png
diff --git a/Sprites/RotateInv3.png b/Sprites/RotateInv3.png
diff --git a/Sprites/RotateInv4.png b/Sprites/RotateInv4.png
diff --git a/description.txt b/description.txt
@@ -46,6 +46,9 @@ The mod is quite young, so the mod will focus in implementing features rather th
 
 Changelogs:
 
+0.6.4
+  - Update Option inventory sprites
+
 0.6.3
   - Fix a bug where melee interactions with Moais are misbehaving and not functioning properly
   - Optimize Moai code to improve multiplayer behavior