Skip to content

Commit b7cd3a7

Browse files
dragon3025dragon3025
committed
Shimmer changes, shadow chest, price changes, and code cleanup.
- Regular and Ancient Hallowed gear is now crafted into Hallowed Bar at Shimmering Star (to match current 1.4.4+ version. - If craft-able rare chests is on, you can craft Shadow Key to and from Shadow Chest at a Shimmering Star. - Item value modifications that match current 1.4.4+ version.
1 parent 62d6c12 commit b7cd3a7

8 files changed

Lines changed: 87 additions & 30 deletions

File tree

‎Config.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,8 @@ public class IOtherConfig : ModConfig
518518
"Regular Wooden Chests. Chance = 1 / configuration_setting. Set to 0 to disable.")]
519519
[DefaultValue(75)]
520520
public int TerragrimChestChance;
521-
522-
//TO-DO Remove after 1.4.4
521+
522+
//TO-DO Remove after 1.4.4
523523
[Label("Use 1.4.4 [i:4978] Fledgling Wings Chance")]
524524
[DefaultValue(true)]
525525
public bool FutureFledglingChestChance;

‎Global/Item.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public override void ModifyTooltips(Terraria.Item item, List<TooltipLine> toolti
2121
return;
2222
}
2323

24+
//TO-DO Shimmering makes it easier to get missing items, so this might not be necessary anymore.
2425
if (item.type == ItemID.Vitamins || item.type == ItemID.ArmorPolish || item.type == ItemID.AdhesiveBandage || item.type == ItemID.Bezoar || item.type == ItemID.Nazar || item.type == ItemID.Megaphone || item.type == ItemID.TrifoldMap || item.type == ItemID.FastClock || item.type == ItemID.Blindfold || item.type == ItemID.ArmorBracing || item.type == ItemID.MedicatedBandage || item.type == ItemID.CountercurseMantra || item.type == ItemID.ThePlan)
2526
{
2627
tooltips.Add(new TooltipLine(Mod, "AnkhMaterialUseFromInventory", "Ankh Material\n" +
@@ -197,11 +198,11 @@ public override void ModifyItemLoot(Terraria.Item item, ItemLoot itemLoot)
197198
if (rule2 is OneFromOptionsNotScaledWithLuckDropRule drop2 && drop2.dropIds.Contains(ItemID.Starfury))
198199
{
199200
List<int> newDropOptions = drop2.dropIds.ToList();
200-
201-
if (lootOtherConfig.FutureFledglingChestChance)
201+
202+
if (lootOtherConfig.FutureFledglingChestChance)
202203
{
203-
newDropOptions.Remove(ItemID.CreativeWings);
204-
}
204+
newDropOptions.Remove(ItemID.CreativeWings);
205+
}
205206
newDropOptions.Add(ItemID.LuckyHorseshoe);
206207
newDropOptions.Add(ItemID.CelestialMagnet);
207208

@@ -211,9 +212,9 @@ public override void ModifyItemLoot(Terraria.Item item, ItemLoot itemLoot)
211212
}
212213
}
213214
if (lootOtherConfig.FutureFledglingChestChance)
214-
{
215-
itemLoot.Add(ItemDropRule.NotScalingWithLuck(ItemID.CreativeWings, 40));
216-
}
215+
{
216+
itemLoot.Add(ItemDropRule.NotScalingWithLuck(ItemID.CreativeWings, 40));
217+
}
217218
itemLoot.Add(ItemDropRule.NotScalingWithLuck(ItemID.Cloud, 2, 50, 100));
218219
}
219220
if (item.type == ItemID.LavaCrate || item.type == ItemID.LavaCrateHard)

‎Global/NPCLoot.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Terraria.ID;
66
using Terraria.ModLoader;
77
using static Terraria.ModLoader.ModContent;
8-
using Terraria.GameContent.Bestiary;
98

109
//Note netID is sometimes used when involving NPCs with negative IDs (variant NPCs), otherwise it gives duplicate loot drops to multiple NPCs. Not always does this happen though.
1110
namespace ReducedGrinding.Global

‎Global/Recipes.cs‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -482,62 +482,62 @@ public override void AddRecipes()
482482
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
483483
recipe.Register();
484484

485-
recipe = Recipe.Create(ItemID.AncientHallowedMask);
485+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
486486
recipe.AddIngredient(ItemID.HallowedMask);
487487
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
488488
recipe.Register();
489489

490-
recipe = Recipe.Create(ItemID.AncientHallowedHelmet);
490+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
491491
recipe.AddIngredient(ItemID.HallowedHelmet);
492492
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
493493
recipe.Register();
494494

495-
recipe = Recipe.Create(ItemID.AncientHallowedHeadgear);
495+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
496496
recipe.AddIngredient(ItemID.HallowedHeadgear);
497497
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
498498
recipe.Register();
499499

500-
recipe = Recipe.Create(ItemID.AncientHallowedHood);
500+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
501501
recipe.AddIngredient(ItemID.HallowedHood);
502502
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
503503
recipe.Register();
504504

505-
recipe = Recipe.Create(ItemID.AncientHallowedPlateMail);
505+
recipe = Recipe.Create(ItemID.HallowedBar, 24);
506506
recipe.AddIngredient(ItemID.HallowedPlateMail);
507507
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
508508
recipe.Register();
509509

510-
recipe = Recipe.Create(ItemID.AncientHallowedGreaves);
510+
recipe = Recipe.Create(ItemID.HallowedBar, 18);
511511
recipe.AddIngredient(ItemID.HallowedGreaves);
512512
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
513513
recipe.Register();
514514

515-
recipe = Recipe.Create(ItemID.HallowedMask);
515+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
516516
recipe.AddIngredient(ItemID.AncientHallowedMask);
517517
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
518518
recipe.Register();
519519

520-
recipe = Recipe.Create(ItemID.HallowedHelmet);
520+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
521521
recipe.AddIngredient(ItemID.AncientHallowedHelmet);
522522
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
523523
recipe.Register();
524524

525-
recipe = Recipe.Create(ItemID.HallowedHeadgear);
525+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
526526
recipe.AddIngredient(ItemID.AncientHallowedHeadgear);
527527
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
528528
recipe.Register();
529529

530-
recipe = Recipe.Create(ItemID.HallowedHood);
530+
recipe = Recipe.Create(ItemID.HallowedBar, 12);
531531
recipe.AddIngredient(ItemID.AncientHallowedHood);
532532
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
533533
recipe.Register();
534534

535-
recipe = Recipe.Create(ItemID.HallowedPlateMail);
535+
recipe = Recipe.Create(ItemID.HallowedBar, 24);
536536
recipe.AddIngredient(ItemID.AncientHallowedPlateMail);
537537
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
538538
recipe.Register();
539539

540-
recipe = Recipe.Create(ItemID.HallowedGreaves);
540+
recipe = Recipe.Create(ItemID.HallowedBar, 18);
541541
recipe.AddIngredient(ItemID.AncientHallowedGreaves);
542542
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
543543
recipe.Register();
@@ -1171,6 +1171,19 @@ public override void AddRecipes()
11711171
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
11721172
recipe.Register();
11731173

1174+
if (GetInstance<IOtherConfig>().CraftableRareChests)
1175+
{
1176+
recipe = Recipe.Create(ItemID.ShadowChest);
1177+
recipe.AddIngredient(ItemID.ShadowKey);
1178+
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
1179+
recipe.Register();
1180+
1181+
recipe = Recipe.Create(ItemID.ShadowKey);
1182+
recipe.AddIngredient(ItemID.ShadowChest);
1183+
recipe.AddTile(TileType<Tiles.ShimmeringStar>());
1184+
recipe.Register();
1185+
}
1186+
11741187
#region Dungeon Furniture
11751188

11761189
#region Blue to Green
@@ -1545,6 +1558,8 @@ public override void AddRecipes()
15451558
#region Craftable Rare Chests
15461559
if (GetInstance<IOtherConfig>().CraftableRareChests)
15471560
{
1561+
//Shadow Chest also requires this condition, but is crafted using shimmering, so it's in the shimmering section above.
1562+
15481563
recipe = Recipe.Create(ItemID.IvyChest);
15491564
recipe.AddIngredient(ItemID.RichMahogany, 8);
15501565
recipe.AddRecipeGroup(RecipeGroupID.IronBar, 2);

‎Global/Shops.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ public override void GetChat(NPC npc, ref string chat)
1616
if (npc.type == NPCID.Angler)
1717
{
1818
if (GetInstance<CFishingConfig>().AnglerTellsQuestCompleted)
19+
{
1920
Main.NewText("Quests completed: " + player.anglerQuestsFinished.ToString(), 0, 255, 255);
21+
}
2022

2123
if (GetInstance<CFishingConfig>().FishCoinsRewardedForQuest > 0)
2224
{

‎Global/ValueModification.cs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,46 @@ void FindNewValue(float oldChance, int newChance)
352352
{
353353
item.value = Item.sellPrice(0, 0, 54);
354354
}
355+
356+
if (item.type == ItemID.ImpStaff)
357+
{
358+
item.value = Item.sellPrice(0, 0, 54);
359+
}
360+
361+
if (item.type == ItemID.BeeWax)
362+
{
363+
item.value = Item.sellPrice(0, 0, 5);
364+
}
365+
366+
if (item.type == ItemID.BeeHeadgear)
367+
{
368+
item.value = Item.sellPrice(0, 0, 40);
369+
}
370+
371+
if (item.type == ItemID.BeeBreastplate)
372+
{
373+
item.value = Item.sellPrice(0, 0, 60);
374+
}
375+
376+
if (item.type == ItemID.BeeGreaves)
377+
{
378+
item.value = Item.sellPrice(0, 0, 50);
379+
}
380+
381+
if (item.type == ItemID.Beenade)
382+
{
383+
item.value = Item.sellPrice(0, 0, 5);
384+
}
385+
386+
if (item.type == 5294) //Hive-Five
387+
{
388+
item.value = Item.sellPrice(0, 0, 70);
389+
}
390+
391+
if (item.type == ItemID.HornetStaff)
392+
{
393+
item.value = Item.sellPrice(0, 0, 70);
394+
}
355395
#endregion
356396
}
357397
}

‎Global/WorldGen.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ protected override void ApplyPass(GenerationProgress progress, GameConfiguration
149149
ItemID.LuckyHorseshoe,
150150
ItemID.CelestialMagnet
151151
}; //Vanilla Skyware items will generate making sure to add rare items that haven't been added yet by going down the list, then it will be random.
152-
153-
if (!GetInstance<IOtherConfig>().FutureFledglingChestChance)
154-
{
155-
missingSkywareItems.Add(ItemID.CreativeWings);
156-
}
157-
152+
153+
if (!GetInstance<IOtherConfig>().FutureFledglingChestChance)
154+
{
155+
missingSkywareItems.Add(ItemID.CreativeWings);
156+
}
157+
158158
List<int> terragrimChests = new();
159159
List<int> nonSkywareChests = new(); //TO-DO Remove when 1.4.4+ comes out
160160
List<int> lockedGoldChest = new();
@@ -715,7 +715,7 @@ void tryToPlaceMushroomChest(int mushroomBiome, int item = -1)
715715
}
716716
else
717717
{
718-
int chance = GetInstance<IOtherConfig>().FutureFledglingChestChance ? 4 : 5;
718+
int chance = GetInstance<IOtherConfig>().FutureFledglingChestChance ? 4 : 5;
719719
switch (WorldGen.genRand.Next(chance))
720720
{
721721
case 0:

‎build.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
author = Dragon3025
2-
version = 8.13.2
2+
version = 8.13.3
33
displayName = Reduced Grinding
44
homepage = http://forums.terraria.org/index.php?threads/reduced-grinding.51082/
55
hideCode = false

0 commit comments

Comments
 (0)