Add files via upload

Changes: - New Stationary Merchant Sprite (and Alternate Sprite) by Lonely Star. - Configuration Bug Fix: Battle Potion spawn rate multiplier can now go above 1.
dragon3025 · Jan 28, 2020 · e7ab6fc · e7ab6fc
1 parent eee45c8
commit e7ab6fc
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/Config.cs b/Config.cs
@@ -552,8 +552,8 @@ public class HOtherModdedItemsConfig : ModConfig
 		[DefaultValue(false)] public bool MerchantSellsGoldReflectionMirrorForCraftingGoldCrittersItem;
 		[DefaultValue(true)] public bool PirateSellsPirateRetreatOrder;
 		[DefaultValue(true)] public bool WizardSellsMoonBall;
-		[Increment(.0001f)] [DefaultValue(1f)] public float BattlePotionMaxSpawnsMultiplier;
-		[Increment(.0001f)] [DefaultValue(1f)] public float BattlePotionSpawnrateMultiplier;
+		[Increment(.0001f)] [Range(1f, 100f)] [DefaultValue(1f)] public float BattlePotionMaxSpawnsMultiplier;
+		[Increment(.0001f)] [Range(1f, 100f)] [DefaultValue(1f)] public float BattlePotionSpawnrateMultiplier;
 		[Increment(.0001f)] [DefaultValue(0.1f)] public float BloodZombieAndDripplerDropsBloodMoonMedallion;
 		[Increment(.0001f)] [Range(1f, 100f)] [DefaultValue(20f)] public float ChaosPotionMaxSpawnsMultiplier;
 		[Increment(.0001f)] [Range(1f, 100f)] [DefaultValue(20f)] public float ChaosPotionSpawnrateMultiplier;

diff --git a/NPCs/StationaryMerchant.cs b/NPCs/StationaryMerchant.cs
@@ -7,8 +7,11 @@ namespace ReducedGrinding.NPCs
 {
 	[AutoloadHead]
     public class StationaryMerchant : ModNPC
-    {
-
+	{
+		public override string Texture => "ReducedGrinding/NPCs/StationaryMerchant";
+
+		public override string[] AltTextures => new[] { "ReducedGrinding/NPCs/StationaryMerchant_alt" };
+
 		public static bool baseshop = false;
 
 		public override void SetStaticDefaults()
@@ -42,7 +45,7 @@ public override bool CanTownNPCSpawn(int numTownNPCs, int money)
 
         public override string TownNPCName()
         {										//NPC names
-            switch (Main.rand.Next(14))
+            switch (Main.rand.Next(18))
             {
                 case 0:
                     return "Abe";
@@ -68,16 +71,21 @@ public override string TownNPCName()
 					return "Galahan";
                 case 11:
 					return "Mervin";
-                case 12:
+				case 12:
 					return "Rico";
-                default:
+				case 13:
+					return "Albert";
+				case 14:
+					return "Archibald";
+				case 15:
+					return "Graham";
+				case 16:
+					return "Gray";
+				default:
 					return "Stephan";
             }
         }
 
-
-
-
         public override string GetChat()
 		{
 			if (!ReducedGrindingWorld.smItemDecorShopNotEmpty && !ReducedGrindingWorld.smItemShopNotEmpty)

diff --git a/NPCs/StationaryMerchant.png b/NPCs/StationaryMerchant.png
diff --git a/NPCs/StationaryMerchant_Head.png b/NPCs/StationaryMerchant_Head.png
diff --git a/NPCs/StationaryMerchant_alt.png b/NPCs/StationaryMerchant_alt.png
diff --git a/NPCs/StationaryMerchant_alt_Head.png b/NPCs/StationaryMerchant_alt_Head.png
diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 author = Dragon3025
-version = 5.4
+version = 5.5
 displayName = Reduced Grinding
 homepage = http://forums.terraria.org/index.php?threads/reduced-grinding.51082/
 hideCode = false