Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions worlds/terraria/Rules.dsv
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ Evil Pickaxe; Pickaxe(65);
Obsidian Armor; Armor Minions(1); Obsidian & Evil Boss Part;
Tavernkeep; Npc; Evil Boss;
Old One's Army Tier 1; Location | Item; Tavernkeep;
Meteorite; ; #Evil Boss | Evil Boss | Meteorite Bar | (@calamity & Astral Infection);
Meteorite Bar; ; Meteorite | (@calamity & Astral Infection) | Meteor Staff;
Meteorite; ; #Evil Boss | Evil Boss | Meteorite Bar;
Meteorite Bar; ; Meteorite | Meteor Staff;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Monolith Crate and Astral Crate were able to contain Meteorite or Meteorite Bars

Meteor Hamaxe; Hammer(60); Meteorite Bar;
Hellforge; ; @pickaxe(60);
Hellstone; ; @pickaxe(65) | Wall of Flesh | Hellstone Bar;
Expand Down Expand Up @@ -251,7 +251,7 @@ Pygmy Necklace; Minions(1);
The Hive Mind; Calamity | Location | Item;
The Perforators; Calamity | Location | Item;
Blood Sample; Calamity; #The Perforators;
Aerialite Ore; Calamity; The Hive Mind | The Perforators | Cobalt Ore | Aerialite Bar; // No pick needed; can be fished
Aerialite Ore; Calamity; The Hive Mind | The Perforators | Cobalt Ore | Aerialite Bar; // No pick needed; Aero Slime drops it
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, The Hive Mind or The Perforators flag allowed Sky Crate and Azure Crate to contain Aerialite. No logic change was needed, since those flags also allow Aero Slime to spawn, which drops Aerialite.

Aerialite Bar; Calamity; Aerialite Ore | Feather Crown;
Aerial Hamaxe; Calamity | Hammer(70); Aerialite Bar;
Skyfringe Pickaxe; Calamity | Pickaxe(75); Aerialite Bar;
Expand Down Expand Up @@ -351,8 +351,8 @@ Stardust; Calamity;
Lunic Eye; Calamity; (Cobalt Bar & Stardust) | Eye of Magnus;
Trapper Bulb; Calamity; Wall of Flesh;
Titan Heart; Calamity; Astral Infection;
Essence of Sunlight; Calamity; Wall of Flesh | Golem;
Essence of Eleum; Calamity; Wall of Flesh | Cryogen | #Cryogen | (@getfixedboi & #Duke Fishron);
Essence of Sunlight; Calamity; Wall of Flesh | #Golem;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.0.7 prevented some crates from dropping Essence of Sunlight, but that didn't require a logic change, since you can get it from other sources in Hardmode. This is an unrelated bug. Golem drops Essence of Sunlight; its flag doesn't give you access to it.

Essence of Eleum; Calamity; Wall of Flesh | #Frost Legion | Cryogen | #Cryogen | (@getfixedboi & #Duke Fishron);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.0.7 prevented some crates from dropping Essence of Eleum in Hardmode, but that didn't require a logic change, since you can get it from other sources in Hardmode. But I noticed that some Frost Legion enemies drop Essence of Eleum and I wanted that to be reflected in logic so it doesn't confuse me when I look at it later, even though that doesn't actually affect logic.

Essence of Havoc; Calamity; Wall of Flesh | #Calamitas Clone | #Brimstone Elemental | Ruin Medallion;
Dreadnautilus; Calamity | Location | Item; Wall of Flesh;
Don't Dread on Me; Not Calamity | Achievement; Wall of Flesh;
Expand Down Expand Up @@ -412,7 +412,7 @@ Old One's Army Tier 2; Location | Item;

// Brimstone Elemental
Infernal Suevite; Calamity; @pickaxe(150) | Brimstone Elemental;
Unholy Core; Calamity; (Infernal Suevite & Hellstone) | Brimstone Elemental;
Unholy Core; Calamity; Infernal Suevite & Hellstone;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Brimstone Elemental flag allowed Slag Crate and Brimstone Crate to drop Unholy Cores

Ruin Medallion; Calamity; (Hardmode Anvil & Coin of Deceit & Unholy Core & Essence of Havoc) | Dark Matter Sheath;

// The Destroyer
Expand Down Expand Up @@ -455,10 +455,6 @@ Plantera; Location | Item | Goal;
# calamitas_clone
# plantera
Ashes of Calamity; Calamity; #Calamitas Clone | Sigil of Calamitas;
Depth Cells; Calamity; Calamitas Clone | Abyssal Mirror;
Lumenyl; Calamity; Calamitas Clone | Abyssal Mirror;
Abyssal Mirror; Calamity; (Hardmode Anvil & Mirage Mirror & Ink Bomb & Depth Cells & Lumenyl) | Eclipse Mirror;
Fathom Swarmer Armor; Calamity | Armor Minions(2); Hardmode Anvil & Sea Remains & Depth Cells;

// Plantera
The Axe; Hammer(100); #Plantera;
Expand All @@ -474,7 +470,7 @@ Shroomite Bar; ;
Shroomite Digging Claw; Pickaxe(200); Hardmode Anvil & Shroomite Bar;
Princess; Npc; Guide & Merchant & Nurse & Demolitionist & Dye Trader & Zoologist & Angler & Painter & Stylist & Golfer & Arms Dealer & Dryad & Party Girl & Tavernkeep & Goblin Tinkerer & Witch Doctor & Clothier & Wizard & Truffle & Tax Collector & Pirate & Steampunker & Cyborg;
Real Estate Agent; Achievement; Princess;
Ectoplasm; ; (((Dungeon & Wall of Flesh) | @calamity) & Plantera) | Spectre Bar;
Ectoplasm; ; (Dungeon & Wall of Flesh & Plantera) | Spectre Bar;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Plantera flag allowed Dungeon Crate and Stockade Crate to drop Ectoplasm

Paladin's Shield; ; Dungeon & Wall of Flesh & Plantera;
Core of Sunlight; Calamity; (Hardmode Anvil & Essence of Sunlight & Ectoplasm) | Fleshy Geode | Necromantic Geode | Core of Calamity | Statis' Blessing;
Core of Eleum; Calamity; (Hardmode Anvil & Essence of Eleum & Ectoplasm) | Fleshy Geode | Necromantic Geode | Core of Calamity;
Expand All @@ -494,7 +490,7 @@ Big Booty; Achievement;
Rainbow Gun; ; Dungeon & Wall of Flesh & Plantera & Hallowed Key;
Rainbows and Unicorns; Achievement; Blessed Apple & Rainbow Gun;
Perennial Ore; Calamity; Plantera | Perennial Bar;
Perennial Bar; Calamity; (Hardmode Forge & Perennial Ore) | Plantera | Life Alloy;
Perennial Bar; Calamity; (Hardmode Forge & Perennial Ore) | Fleshy Geode | Necromantic Geode | Life Alloy;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Plantera flag allowed Jungle Crate and Bramble Crate to drop Perennial. I also noticed that Fleshy Geode and Necromantic Geode logic wasn't accounted for here.

Beastial Pickaxe; Calamity | Pickaxe(200); Hardmode Anvil & Perennial Bar;

// Solar Eclipse
Expand All @@ -515,6 +511,10 @@ Sand Shark Tooth Necklace; Calamity;

// Leviathan and Anahita
Leviathan and Anahita; Calamity | Location | Item;
Depth Cells; Calamity; Leviathan and Anahita | Abyssal Mirror;
Lumenyl; Calamity; Leviathan and Anahita | Abyssal Mirror;
Abyssal Mirror; Calamity; (Hardmode Anvil & Mirage Mirror & Ink Bomb & Depth Cells & Lumenyl) | Eclipse Mirror;
Fathom Swarmer Armor; Calamity | Armor Minions(2); Hardmode Anvil & Sea Remains & Depth Cells;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually a change from 2.0.4 that I had missed. Depth Cells and Lumenyl were moved from Calamitas Clone flag to Leviathan flag.


// Astrum Aureus
Astrum Aureus; Calamity | Location | Item; Hardmode Anvil & Stardust & Astral Infection;
Expand All @@ -526,7 +526,7 @@ Golem; Location | Item | Goal;
Picksaw; Pickaxe(210); #Golem;
Lihzahrd Brick; ; @pickaxe(210) | (Lihzahrd Furniture & Golem) | (@calamity & Lihzahrd Temple);
Scoria Ore; Calamity; Golem | @pickaxe(210) | Astral Ore | Luminite | Scoria Bar;
Scoria Bar; Calamity; (Hardmode Forge & Scoria Ore) | Golem | Life Alloy | Sigil of Calamitas | Fire Gauntlet;
Scoria Bar; Calamity; (Hardmode Forge & Scoria Ore) | Fleshy Geode | Necromantic Geode | Life Alloy | Sigil of Calamitas | Fire Gauntlet;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Golem flag allowed Hydrothermal Crate to drop Scoria. I also noticed that Fleshy Geode and Necromantic Geode logic wasn't accounted for here.

Seismic Hampick; Calamity | Pickaxe(210) | Hammer(95); Hardmode Anvil & Scoria Bar;
Hydrothermic Armor; Calamity | Armor Minions(2); Hardmode Anvil & Scoria Bar & Core of Havoc;
Fire Gauntlet; ; (Tinkerer's Workshop & Magma Stone & Mechanical Glove & (~@calamity | Scoria Bar)) | (@calamity & Elemental Gauntlet);
Expand Down Expand Up @@ -597,13 +597,13 @@ Eye of Magnus; Calamity;
Stardust Fragment; ; Fragment | (@calamity & Statis' Curse);
Statis' Curse; Calamity; (Ancient Manipulator & Statis' Blessing & The First Shadowflame & Stardust Fragment) | Nucleogenesis;
Galactica Singularity; Calamity; (Ancient Manipulator & Fragment) | Elemental Gauntlet | Elemental Quiver | Nucleogenesis | Moonstone Crown | Ethereal Talisman;
Meld Blob; Calamity; #Lunar Events | #Astrum Deus | (Astral Infection & Astrum Deus) | Meld Construct;
Meld Blob; Calamity; #Lunar Events | #Astrum Deus | Meld Construct;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Astrum Deus flag allowed Astral Crate to drop Meld Blobs

Meld Construct; Calamity; (Ancient Manipulator & Meld Blob & Stardust) | Dark Matter Sheath;
Dark Matter Sheath; Calamity; (Ancient Manipulator & Silencing Sheath & Ruin Medallion & Meld Construct) | Eclipse Mirror;

// Astrum Deus
Astral Ore; Calamity; (Astral Infection & Astrum Deus) | Astral Bar; // No pick needed; you can fish it
Astral Bar; Calamity; (Ancient Manipulator & Stardust & Astral Ore) | (Astral Infection & Astrum Deus);
Astral Ore; Calamity; (Astral Infection & Astrum Deus) | Astral Bar; // No pick needed; Astral Slime drops it
Astral Bar; Calamity; Ancient Manipulator & Stardust & Astral Ore;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Astrum Deus flag allowed Astral Crate to drop Astral Ore and Astral Bars. I changed logic for Astral Bar, but Astral Ore is still obtainable from Astral Slime, which is also blocked behind Astral Infection and Astrum Deus flag.

Astral Hamaxe; Calamity | Hammer(100); Ancient Manipulator & Astral Bar;
Astral Pickaxe; Calamity | Pickaxe(220); Ancient Manipulator & Astral Bar;
Astral Armor; Calamity | Armor Minions(3); Ancient Manipulator & Astral Bar & Meteorite Bar;
Expand All @@ -624,9 +624,9 @@ Terrarian; ;
Sick Throw; Achievement; Terrarian;
Meowmere; ; #Moon Lord;
Star Wrath; ; #Moon Lord;
Exodium Cluster; Calamity; Moon Lord | Uelibloom Ore; // No pick needed; can be fished
Exodium Cluster; Calamity; (Moon Lord & (Wall of Flesh | @pickaxe(225))) | Uelibloom Ore;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Moon Lord flag allowed Sky Crate and Azure Crate to drop Exodium Clusters. The Moon Lord flag still spawns Exodium Clusters and allows Shockstorm Shuttles to drop them, but the former requires mining and the latter only spawns in Hardmode.

Normality Relocator; Calamity; Ancient Manipulator & Rod of Discord & Exodium Cluster & Fragment;
Unholy Essence; Calamity; Moon Lord | #Providence, the Profaned Goddess | (Hallow & Providence, the Profaned Goddess) | (@getfixedboi & Plantera);
Unholy Essence; Calamity; Moon Lord | #Providence, the Profaned Goddess | (@getfixedboi & Plantera);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Providence flag allowed Hallowed Crate and Divine Crate to drop Unholy Essence. Fortunately, that was removed, since this was a particularly annoying piece of logic.

Polterplasm; Calamity; (Moon Lord & Wall of Flesh) | (Dungeon & (Polterghast | Moon Lord)) | #Polterghast;
Eldritch Soul Artifact; Calamity | Minions(1); Exodium Cluster & Navyplate & Polterplasm;

Expand All @@ -650,7 +650,7 @@ Blossom Pickaxe; Calamity | Pickaxe(250);
Voltage Regulation System; Calamity; Ancient Manipulator & Mysterious Circuitry & Dubious Plating & Uelibloom Bar & Luminite Bar & Advanced Display;
Tarragon Armor; Calamity | Armor Minions(3); Ancient Manipulator & Uelibloom Bar & Divine Geode;
Necromantic Geode; Calamity; #Ravager & Providence, the Profaned Goddess;
Bloodstone; Calamity; Providence, the Profaned Goddess;
Bloodstone; Calamity; Providence, the Profaned Goddess | Necromantic Geode;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bloodstone was obtainable from crates with Providence flag, but that never affected logic, since enemies drop it with that flag anyway. I just noticed Necromantic Geode logic was missing. In this case, I don't think that meaningfully affects logic, since Necromantic Geode is only obtainable with Providence flag anyway.

Bloodstone Core; Calamity; Hardmode Forge & Bloodstone & Polterplasm;

// Sentinels of the Devourer
Expand Down Expand Up @@ -699,7 +699,7 @@ Yharon, Dragon of Rebirth; Calamity | Location | Item | Goal;
# yharon_dragon_of_rebirth
Yharon Soul Fragment; Calamity; #Yharon, Dragon of Rebirth | The Wand | Auric Bar;
The Wand; Calamity; (Cosmic Anvil & Wand of Sparking & Yharon Soul Fragment) | (@getfixedboi & #The Devourer of Gods);
Auric Ore; Calamity; (Yharon, Dragon of Rebirth & (@pickaxe(250) | Wall of Flesh)) | Auric Bar;
Auric Ore; Calamity; (Yharon, Dragon of Rebirth & @pickaxe(250)) | Auric Bar | Yharon Soul Fragment;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until 2.0.7, Yharon flag allowed Titanium Crate to drop Auric Ore. Also, 2.0.7 allows you to craft Auric Ore from Yharon Soul Fragments at Shimmer.

Auric Bar; Calamity; (Cosmic Anvil & Auric Ore & Yharon Soul Fragment) | Shadowspec Bar;
Auric Tesla Armor; Calamity | Armor Minions(6); Cosmic Anvil & Silva Armor & Bloodflare Armor & Tarragon Armor & Auric Bar;
Infinity +1 Sword; Achievement | Grindy | Item(Has Zenith) | Goal(zenith); Hardmode Anvil & Terra Blade & Meowmere & Star Wrath & Influx Waver & The Horseman's Blade & Seedler & Starfury & Bee Keeper & Enchanted Sword & Copper Shortsword & (~@calamity | Auric Bar);
Expand Down