diff --git a/Items/AbyssBreastplate.cs b/Items/Abyss/AbyssBreastplate.cs similarity index 97% rename from Items/AbyssBreastplate.cs rename to Items/Abyss/AbyssBreastplate.cs index c3852cc6..7757e4e1 100644 --- a/Items/AbyssBreastplate.cs +++ b/Items/Abyss/AbyssBreastplate.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Abyss { [AutoloadEquip(EquipType.Body)] public class AbyssBreastplate : ModItem diff --git a/Items/AbyssBreastplate.png b/Items/Abyss/AbyssBreastplate.png similarity index 100% rename from Items/AbyssBreastplate.png rename to Items/Abyss/AbyssBreastplate.png diff --git a/Items/AbyssBreastplate_Arms.png b/Items/Abyss/AbyssBreastplate_Arms.png similarity index 100% rename from Items/AbyssBreastplate_Arms.png rename to Items/Abyss/AbyssBreastplate_Arms.png diff --git a/Items/AbyssBreastplate_Body.png b/Items/Abyss/AbyssBreastplate_Body.png similarity index 100% rename from Items/AbyssBreastplate_Body.png rename to Items/Abyss/AbyssBreastplate_Body.png diff --git a/Items/AbyssBreastplate_FemaleBody.png b/Items/Abyss/AbyssBreastplate_FemaleBody.png similarity index 100% rename from Items/AbyssBreastplate_FemaleBody.png rename to Items/Abyss/AbyssBreastplate_FemaleBody.png diff --git a/Items/AbyssGreaves.cs b/Items/Abyss/AbyssGreaves.cs similarity index 97% rename from Items/AbyssGreaves.cs rename to Items/Abyss/AbyssGreaves.cs index 42c44431..7a47dc05 100644 --- a/Items/AbyssGreaves.cs +++ b/Items/Abyss/AbyssGreaves.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Abyss { [AutoloadEquip(EquipType.Legs)] public class AbyssGreaves : ModItem diff --git a/Items/AbyssGreaves.png b/Items/Abyss/AbyssGreaves.png similarity index 100% rename from Items/AbyssGreaves.png rename to Items/Abyss/AbyssGreaves.png diff --git a/Items/AbyssGreaves_Legs.png b/Items/Abyss/AbyssGreaves_Legs.png similarity index 100% rename from Items/AbyssGreaves_Legs.png rename to Items/Abyss/AbyssGreaves_Legs.png diff --git a/Items/AbyssHeadgear.cs b/Items/Abyss/AbyssHeadgear.cs similarity index 99% rename from Items/AbyssHeadgear.cs rename to Items/Abyss/AbyssHeadgear.cs index 46ebc24b..d542c551 100644 --- a/Items/AbyssHeadgear.cs +++ b/Items/Abyss/AbyssHeadgear.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Abyss { [AutoloadEquip(EquipType.Head)] public class AbyssHeadgear : ModItem diff --git a/Items/AbyssHeadgear.png b/Items/Abyss/AbyssHeadgear.png similarity index 100% rename from Items/AbyssHeadgear.png rename to Items/Abyss/AbyssHeadgear.png diff --git a/Items/AbyssHeadgear_Head.png b/Items/Abyss/AbyssHeadgear_Head.png similarity index 100% rename from Items/AbyssHeadgear_Head.png rename to Items/Abyss/AbyssHeadgear_Head.png diff --git a/Items/Abyss/desktop.ini b/Items/Abyss/desktop.ini new file mode 100644 index 00000000..39908b31 --- /dev/null +++ b/Items/Abyss/desktop.ini @@ -0,0 +1,9 @@ +[LocalizedFileNames] +AbyssHeadgear_Head.png=@AbyssHeadgear_Head.png,0 +AbyssGreaves.png=@AbyssGreaves.png,0 +AbyssGreaves_Legs.png=@AbyssGreaves_Legs.png,0 +AbyssHeadgear.png=@AbyssHeadgear.png,0 +AbyssBreastplate_Body.png=@AbyssBreastplate_Body.png,0 +AbyssBreastplate_FemaleBody.png=@AbyssBreastplate_FemaleBody.png,0 +AbyssBreastplate.png=@AbyssBreastplate.png,0 +AbyssBreastplate_Arms.png=@AbyssBreastplate_Arms.png,0 diff --git a/Items/AdamantiteDisc.cs b/Items/Adamantite/AdamantiteDisc.cs similarity index 97% rename from Items/AdamantiteDisc.cs rename to Items/Adamantite/AdamantiteDisc.cs index 2f82eaca..a5b77ecf 100644 --- a/Items/AdamantiteDisc.cs +++ b/Items/Adamantite/AdamantiteDisc.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Adamantite { public class AdamantiteDisc : ModItem { diff --git a/Items/AdamantiteDisc.png b/Items/Adamantite/AdamantiteDisc.png similarity index 100% rename from Items/AdamantiteDisc.png rename to Items/Adamantite/AdamantiteDisc.png diff --git a/Items/AdamantiteHat.cs b/Items/Adamantite/AdamantiteHat.cs similarity index 97% rename from Items/AdamantiteHat.cs rename to Items/Adamantite/AdamantiteHat.cs index 909bd804..f483d626 100644 --- a/Items/AdamantiteHat.cs +++ b/Items/Adamantite/AdamantiteHat.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Adamantite { [AutoloadEquip(EquipType.Head)] public class AdamantiteHat : ModItem diff --git a/Items/AdamantiteHat.png b/Items/Adamantite/AdamantiteHat.png similarity index 100% rename from Items/AdamantiteHat.png rename to Items/Adamantite/AdamantiteHat.png diff --git a/Items/AdamantiteHat_Head.png b/Items/Adamantite/AdamantiteHat_Head.png similarity index 100% rename from Items/AdamantiteHat_Head.png rename to Items/Adamantite/AdamantiteHat_Head.png diff --git a/Items/AdamantiteHeader.cs b/Items/Adamantite/AdamantiteHeader.cs similarity index 97% rename from Items/AdamantiteHeader.cs rename to Items/Adamantite/AdamantiteHeader.cs index e0b5957f..79757b2d 100644 --- a/Items/AdamantiteHeader.cs +++ b/Items/Adamantite/AdamantiteHeader.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Adamantite { [AutoloadEquip(EquipType.Head)] public class AdamantiteHeader : ModItem diff --git a/Items/AdamantiteHeader.png b/Items/Adamantite/AdamantiteHeader.png similarity index 100% rename from Items/AdamantiteHeader.png rename to Items/Adamantite/AdamantiteHeader.png diff --git a/Items/AdamantiteHeader_Head.png b/Items/Adamantite/AdamantiteHeader_Head.png similarity index 100% rename from Items/AdamantiteHeader_Head.png rename to Items/Adamantite/AdamantiteHeader_Head.png diff --git a/Items/AdamantiteRifle.cs b/Items/Adamantite/AdamantiteRifle.cs similarity index 96% rename from Items/AdamantiteRifle.cs rename to Items/Adamantite/AdamantiteRifle.cs index 9f03b6c7..88f57b14 100644 --- a/Items/AdamantiteRifle.cs +++ b/Items/Adamantite/AdamantiteRifle.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Adamantite { public class AdamantiteRifle : ModItem { diff --git a/Items/AdamantiteRifle.png b/Items/Adamantite/AdamantiteRifle.png similarity index 100% rename from Items/AdamantiteRifle.png rename to Items/Adamantite/AdamantiteRifle.png diff --git a/Items/AdamantiteStaff.cs b/Items/Adamantite/AdamantiteStaff.cs similarity index 96% rename from Items/AdamantiteStaff.cs rename to Items/Adamantite/AdamantiteStaff.cs index c9ff17cd..320dc36c 100644 --- a/Items/AdamantiteStaff.cs +++ b/Items/Adamantite/AdamantiteStaff.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Adamantite { public class AdamantiteStaff : ModItem { diff --git a/Items/AdamantiteStaff.png b/Items/Adamantite/AdamantiteStaff.png similarity index 100% rename from Items/AdamantiteStaff.png rename to Items/Adamantite/AdamantiteStaff.png diff --git a/Items/AdamantiteVisage.cs b/Items/Adamantite/AdamantiteVisage.cs similarity index 97% rename from Items/AdamantiteVisage.cs rename to Items/Adamantite/AdamantiteVisage.cs index 63a94c12..e92ff062 100644 --- a/Items/AdamantiteVisage.cs +++ b/Items/Adamantite/AdamantiteVisage.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Adamantite { [AutoloadEquip(EquipType.Head)] public class AdamantiteVisage : ModItem diff --git a/Items/AdamantiteVisage.png b/Items/Adamantite/AdamantiteVisage.png similarity index 100% rename from Items/AdamantiteVisage.png rename to Items/Adamantite/AdamantiteVisage.png diff --git a/Items/AdamantiteVisage_Head.png b/Items/Adamantite/AdamantiteVisage_Head.png similarity index 100% rename from Items/AdamantiteVisage_Head.png rename to Items/Adamantite/AdamantiteVisage_Head.png diff --git a/Items/AdamantiteWarhammer.cs b/Items/Adamantite/AdamantiteWarhammer.cs similarity index 95% rename from Items/AdamantiteWarhammer.cs rename to Items/Adamantite/AdamantiteWarhammer.cs index 00376aae..dbac0b3a 100644 --- a/Items/AdamantiteWarhammer.cs +++ b/Items/Adamantite/AdamantiteWarhammer.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Adamantite { public class AdamantiteWarhammer : ModItem { diff --git a/Items/AdamantiteWarhammer.png b/Items/Adamantite/AdamantiteWarhammer.png similarity index 100% rename from Items/AdamantiteWarhammer.png rename to Items/Adamantite/AdamantiteWarhammer.png diff --git a/Items/Adamantite/desktop.ini b/Items/Adamantite/desktop.ini new file mode 100644 index 00000000..cf7e2b9b --- /dev/null +++ b/Items/Adamantite/desktop.ini @@ -0,0 +1,11 @@ +[LocalizedFileNames] +AdamantiteStaff.png=@AdamantiteStaff.png,0 +AdamantiteVisage_Head.png=@AdamantiteVisage_Head.png,0 +AdamantiteVisage.png=@AdamantiteVisage.png,0 +AdamantiteWarhammer.png=@AdamantiteWarhammer.png,0 +AdamantiteHeader_Head.png=@AdamantiteHeader_Head.png,0 +AdamantiteRifle.png=@AdamantiteRifle.png,0 +AdamantiteHeader.png=@AdamantiteHeader.png,0 +AdamantiteHat.png=@AdamantiteHat.png,0 +AdamantiteHat_Head.png=@AdamantiteHat_Head.png,0 +AdamantiteDisc.png=@AdamantiteDisc.png,0 diff --git a/Items/AlchemasterMask.cs b/Items/Alchemist/AlchemasterMask.cs similarity index 91% rename from Items/AlchemasterMask.cs rename to Items/Alchemist/AlchemasterMask.cs index 61d799ee..28ae3c77 100644 --- a/Items/AlchemasterMask.cs +++ b/Items/Alchemist/AlchemasterMask.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { [AutoloadEquip(EquipType.Head)] public class AlchemasterMask : ModItem diff --git a/Items/AlchemasterMask.png b/Items/Alchemist/AlchemasterMask.png similarity index 100% rename from Items/AlchemasterMask.png rename to Items/Alchemist/AlchemasterMask.png diff --git a/Items/AlchemasterMask_Head.png b/Items/Alchemist/AlchemasterMask_Head.png similarity index 100% rename from Items/AlchemasterMask_Head.png rename to Items/Alchemist/AlchemasterMask_Head.png diff --git a/Items/AlchemasterTreasureBag.cs b/Items/Alchemist/AlchemasterTreasureBag.cs similarity index 97% rename from Items/AlchemasterTreasureBag.cs rename to Items/Alchemist/AlchemasterTreasureBag.cs index 206ebf32..db6cae0b 100644 --- a/Items/AlchemasterTreasureBag.cs +++ b/Items/Alchemist/AlchemasterTreasureBag.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemasterTreasureBag : ModItem { diff --git a/Items/AlchemasterTreasureBag.png b/Items/Alchemist/AlchemasterTreasureBag.png similarity index 100% rename from Items/AlchemasterTreasureBag.png rename to Items/Alchemist/AlchemasterTreasureBag.png diff --git a/Items/AlchemasterTrophy.cs b/Items/Alchemist/AlchemasterTrophy.cs similarity index 94% rename from Items/AlchemasterTrophy.cs rename to Items/Alchemist/AlchemasterTrophy.cs index 774f6278..20975116 100644 --- a/Items/AlchemasterTrophy.cs +++ b/Items/Alchemist/AlchemasterTrophy.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemasterTrophy : ModItem { diff --git a/Items/AlchemasterTrophy.png b/Items/Alchemist/AlchemasterTrophy.png similarity index 100% rename from Items/AlchemasterTrophy.png rename to Items/Alchemist/AlchemasterTrophy.png diff --git a/Items/Alchemator.cs b/Items/Alchemist/Alchemator.cs similarity index 97% rename from Items/Alchemator.cs rename to Items/Alchemist/Alchemator.cs index cc05e6d3..675a19f4 100644 --- a/Items/Alchemator.cs +++ b/Items/Alchemist/Alchemator.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class Alchemator : ModItem { diff --git a/Items/Alchemator.png b/Items/Alchemist/Alchemator.png similarity index 100% rename from Items/Alchemator.png rename to Items/Alchemist/Alchemator.png diff --git a/Items/AlchemistEmblem.cs b/Items/Alchemist/AlchemistEmblem.cs similarity index 96% rename from Items/AlchemistEmblem.cs rename to Items/Alchemist/AlchemistEmblem.cs index 8d804e19..b1fbebb3 100644 --- a/Items/AlchemistEmblem.cs +++ b/Items/Alchemist/AlchemistEmblem.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemistEmblem : ModItem { diff --git a/Items/AlchemistEmblem.png b/Items/Alchemist/AlchemistEmblem.png similarity index 100% rename from Items/AlchemistEmblem.png rename to Items/Alchemist/AlchemistEmblem.png diff --git a/Items/AlchemistFocus.cs b/Items/Alchemist/AlchemistFocus.cs similarity index 97% rename from Items/AlchemistFocus.cs rename to Items/Alchemist/AlchemistFocus.cs index 382ccc5b..fbd55611 100644 --- a/Items/AlchemistFocus.cs +++ b/Items/Alchemist/AlchemistFocus.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemistFocus : ModItem { diff --git a/Items/AlchemistFocus.png b/Items/Alchemist/AlchemistFocus.png similarity index 100% rename from Items/AlchemistFocus.png rename to Items/Alchemist/AlchemistFocus.png diff --git a/Items/AlchemistGlove.cs b/Items/Alchemist/AlchemistGlove.cs similarity index 96% rename from Items/AlchemistGlove.cs rename to Items/Alchemist/AlchemistGlove.cs index 3c11c02d..2e606624 100644 --- a/Items/AlchemistGlove.cs +++ b/Items/Alchemist/AlchemistGlove.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemistGlove : ModItem { diff --git a/Items/AlchemistGlove.png b/Items/Alchemist/AlchemistGlove.png similarity index 100% rename from Items/AlchemistGlove.png rename to Items/Alchemist/AlchemistGlove.png diff --git a/Items/AlchemistSoul.cs b/Items/Alchemist/AlchemistSoul.cs similarity index 97% rename from Items/AlchemistSoul.cs rename to Items/Alchemist/AlchemistSoul.cs index 9e2fc578..2aea0309 100644 --- a/Items/AlchemistSoul.cs +++ b/Items/Alchemist/AlchemistSoul.cs @@ -2,7 +2,7 @@ using Terraria.DataStructures; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemistSoul : ModItem { diff --git a/Items/AlchemistSoul.png b/Items/Alchemist/AlchemistSoul.png similarity index 100% rename from Items/AlchemistSoul.png rename to Items/Alchemist/AlchemistSoul.png diff --git a/Items/AlchemistSpark.cs b/Items/Alchemist/AlchemistSpark.cs similarity index 96% rename from Items/AlchemistSpark.cs rename to Items/Alchemist/AlchemistSpark.cs index 2e232e72..076c99a0 100644 --- a/Items/AlchemistSpark.cs +++ b/Items/Alchemist/AlchemistSpark.cs @@ -2,7 +2,7 @@ using Terraria.DataStructures; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemistSpark : ModItem { diff --git a/Items/AlchemistSpark.png b/Items/Alchemist/AlchemistSpark.png similarity index 100% rename from Items/AlchemistSpark.png rename to Items/Alchemist/AlchemistSpark.png diff --git a/Items/AlchemyStation.cs b/Items/Alchemist/AlchemyStation.cs similarity index 96% rename from Items/AlchemyStation.cs rename to Items/Alchemist/AlchemyStation.cs index cdc131f1..9e09478d 100644 --- a/Items/AlchemyStation.cs +++ b/Items/Alchemist/AlchemyStation.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist { public class AlchemyStation : ModItem { diff --git a/Items/AlchemyStation.png b/Items/Alchemist/AlchemyStation.png similarity index 100% rename from Items/AlchemyStation.png rename to Items/Alchemist/AlchemyStation.png diff --git a/Items/BasicFlask.cs b/Items/Alchemist/Flasks/BasicFlask.cs similarity index 97% rename from Items/BasicFlask.cs rename to Items/Alchemist/Flasks/BasicFlask.cs index c9aded64..d54aa632 100644 --- a/Items/BasicFlask.cs +++ b/Items/Alchemist/Flasks/BasicFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class BasicFlask : AlchemistItem { diff --git a/Items/BasicFlask.png b/Items/Alchemist/Flasks/BasicFlask.png similarity index 100% rename from Items/BasicFlask.png rename to Items/Alchemist/Flasks/BasicFlask.png diff --git a/Items/BigManaFlask.cs b/Items/Alchemist/Flasks/BigManaFlask.cs similarity index 97% rename from Items/BigManaFlask.cs rename to Items/Alchemist/Flasks/BigManaFlask.cs index 88889080..7c452ab9 100644 --- a/Items/BigManaFlask.cs +++ b/Items/Alchemist/Flasks/BigManaFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class BigManaFlask : AlchemistItem { diff --git a/Items/BigManaFlask.png b/Items/Alchemist/Flasks/BigManaFlask.png similarity index 100% rename from Items/BigManaFlask.png rename to Items/Alchemist/Flasks/BigManaFlask.png diff --git a/Items/BigPoisonFlask.cs b/Items/Alchemist/Flasks/BigPoisonFlask.cs similarity index 97% rename from Items/BigPoisonFlask.cs rename to Items/Alchemist/Flasks/BigPoisonFlask.cs index 50ec7f45..c3a027f9 100644 --- a/Items/BigPoisonFlask.cs +++ b/Items/Alchemist/Flasks/BigPoisonFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class BigPoisonFlask : AlchemistItem { diff --git a/Items/BigPoisonFlask.png b/Items/Alchemist/Flasks/BigPoisonFlask.png similarity index 100% rename from Items/BigPoisonFlask.png rename to Items/Alchemist/Flasks/BigPoisonFlask.png diff --git a/Items/BigVenomFlask.cs b/Items/Alchemist/Flasks/BigVenomFlask.cs similarity index 97% rename from Items/BigVenomFlask.cs rename to Items/Alchemist/Flasks/BigVenomFlask.cs index 5791c6db..bc0cb1c4 100644 --- a/Items/BigVenomFlask.cs +++ b/Items/Alchemist/Flasks/BigVenomFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class BigVenomFlask : AlchemistItem { diff --git a/Items/BigVenomFlask.png b/Items/Alchemist/Flasks/BigVenomFlask.png similarity index 100% rename from Items/BigVenomFlask.png rename to Items/Alchemist/Flasks/BigVenomFlask.png diff --git a/Items/BoomFlask.cs b/Items/Alchemist/Flasks/BoomFlask.cs similarity index 96% rename from Items/BoomFlask.cs rename to Items/Alchemist/Flasks/BoomFlask.cs index 6900ef1b..a78c2b1d 100644 --- a/Items/BoomFlask.cs +++ b/Items/Alchemist/Flasks/BoomFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class BoomFlask : AlchemistItem { diff --git a/Items/BoomFlask.png b/Items/Alchemist/Flasks/BoomFlask.png similarity index 100% rename from Items/BoomFlask.png rename to Items/Alchemist/Flasks/BoomFlask.png diff --git a/Items/BurningFlask.cs b/Items/Alchemist/Flasks/BurningFlask.cs similarity index 97% rename from Items/BurningFlask.cs rename to Items/Alchemist/Flasks/BurningFlask.cs index 547fb4aa..12a23a53 100644 --- a/Items/BurningFlask.cs +++ b/Items/Alchemist/Flasks/BurningFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class BurningFlask : AlchemistItem { diff --git a/Items/BurningFlask.png b/Items/Alchemist/Flasks/BurningFlask.png similarity index 100% rename from Items/BurningFlask.png rename to Items/Alchemist/Flasks/BurningFlask.png diff --git a/Items/ClusterFlask.cs b/Items/Alchemist/Flasks/ClusterFlask.cs similarity index 97% rename from Items/ClusterFlask.cs rename to Items/Alchemist/Flasks/ClusterFlask.cs index 5a16cc04..ecdb30ff 100644 --- a/Items/ClusterFlask.cs +++ b/Items/Alchemist/Flasks/ClusterFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class ClusterFlask : AlchemistItem { diff --git a/Items/ClusterFlask.png b/Items/Alchemist/Flasks/ClusterFlask.png similarity index 100% rename from Items/ClusterFlask.png rename to Items/Alchemist/Flasks/ClusterFlask.png diff --git a/Items/CrystalFlask.cs b/Items/Alchemist/Flasks/CrystalFlask.cs similarity index 97% rename from Items/CrystalFlask.cs rename to Items/Alchemist/Flasks/CrystalFlask.cs index dd72ffa3..87ada366 100644 --- a/Items/CrystalFlask.cs +++ b/Items/Alchemist/Flasks/CrystalFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class CrystalFlask : AlchemistItem { diff --git a/Items/CrystalFlask.png b/Items/Alchemist/Flasks/CrystalFlask.png similarity index 100% rename from Items/CrystalFlask.png rename to Items/Alchemist/Flasks/CrystalFlask.png diff --git a/Items/DukeFlask.cs b/Items/Alchemist/Flasks/DukeFlask.cs similarity index 96% rename from Items/DukeFlask.cs rename to Items/Alchemist/Flasks/DukeFlask.cs index 4fdc4b46..d2142a58 100644 --- a/Items/DukeFlask.cs +++ b/Items/Alchemist/Flasks/DukeFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class DukeFlask : AlchemistItem { diff --git a/Items/DukeFlask.png b/Items/Alchemist/Flasks/DukeFlask.png similarity index 100% rename from Items/DukeFlask.png rename to Items/Alchemist/Flasks/DukeFlask.png diff --git a/Items/ExtendedBoomFlask.cs b/Items/Alchemist/Flasks/ExtendedBoomFlask.cs similarity index 96% rename from Items/ExtendedBoomFlask.cs rename to Items/Alchemist/Flasks/ExtendedBoomFlask.cs index b68f41e0..55936d8a 100644 --- a/Items/ExtendedBoomFlask.cs +++ b/Items/Alchemist/Flasks/ExtendedBoomFlask.cs @@ -1,9 +1,8 @@ -using System.Linq; using Terraria; using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class ExtendedBoomFlask : AlchemistItem { diff --git a/Items/ExtendedBoomFlask.png b/Items/Alchemist/Flasks/ExtendedBoomFlask.png similarity index 100% rename from Items/ExtendedBoomFlask.png rename to Items/Alchemist/Flasks/ExtendedBoomFlask.png diff --git a/Items/ExtendedBurningFlask.cs b/Items/Alchemist/Flasks/ExtendedBurningFlask.cs similarity index 98% rename from Items/ExtendedBurningFlask.cs rename to Items/Alchemist/Flasks/ExtendedBurningFlask.cs index 5a67fce1..8bd7a8ea 100644 --- a/Items/ExtendedBurningFlask.cs +++ b/Items/Alchemist/Flasks/ExtendedBurningFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class ExtendedBurningFlask : AlchemistItem { diff --git a/Items/ExtendedBurningFlask.png b/Items/Alchemist/Flasks/ExtendedBurningFlask.png similarity index 100% rename from Items/ExtendedBurningFlask.png rename to Items/Alchemist/Flasks/ExtendedBurningFlask.png diff --git a/Items/ExtendedFreezeFlask.cs b/Items/Alchemist/Flasks/ExtendedFreezeFlask.cs similarity index 98% rename from Items/ExtendedFreezeFlask.cs rename to Items/Alchemist/Flasks/ExtendedFreezeFlask.cs index cb768341..2bdbf658 100644 --- a/Items/ExtendedFreezeFlask.cs +++ b/Items/Alchemist/Flasks/ExtendedFreezeFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class ExtendedFreezeFlask : AlchemistItem { diff --git a/Items/ExtendedFreezeFlask.png b/Items/Alchemist/Flasks/ExtendedFreezeFlask.png similarity index 100% rename from Items/ExtendedFreezeFlask.png rename to Items/Alchemist/Flasks/ExtendedFreezeFlask.png diff --git a/Items/FlaskCore.cs b/Items/Alchemist/Flasks/FlaskCore.cs similarity index 93% rename from Items/FlaskCore.cs rename to Items/Alchemist/Flasks/FlaskCore.cs index 8a9c2c2e..8a1f551e 100644 --- a/Items/FlaskCore.cs +++ b/Items/Alchemist/Flasks/FlaskCore.cs @@ -1,8 +1,7 @@ -using System.Linq; using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class FlaskCore : ModItem { diff --git a/Items/FlaskCore.png b/Items/Alchemist/Flasks/FlaskCore.png similarity index 100% rename from Items/FlaskCore.png rename to Items/Alchemist/Flasks/FlaskCore.png diff --git a/Items/FreezeFlask.cs b/Items/Alchemist/Flasks/FreezeFlask.cs similarity index 97% rename from Items/FreezeFlask.cs rename to Items/Alchemist/Flasks/FreezeFlask.cs index 6341b335..41394482 100644 --- a/Items/FreezeFlask.cs +++ b/Items/Alchemist/Flasks/FreezeFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class FreezeFlask : AlchemistItem { diff --git a/Items/FreezeFlask.png b/Items/Alchemist/Flasks/FreezeFlask.png similarity index 100% rename from Items/FreezeFlask.png rename to Items/Alchemist/Flasks/FreezeFlask.png diff --git a/Items/GoldFlask.cs b/Items/Alchemist/Flasks/GoldFlask.cs similarity index 97% rename from Items/GoldFlask.cs rename to Items/Alchemist/Flasks/GoldFlask.cs index 3a82b03a..20fb34d9 100644 --- a/Items/GoldFlask.cs +++ b/Items/Alchemist/Flasks/GoldFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class GoldFlask : AlchemistItem { diff --git a/Items/GoldFlask.png b/Items/Alchemist/Flasks/GoldFlask.png similarity index 100% rename from Items/GoldFlask.png rename to Items/Alchemist/Flasks/GoldFlask.png diff --git a/Items/HealthSupportFlask.cs b/Items/Alchemist/Flasks/HealthSupportFlask.cs similarity index 97% rename from Items/HealthSupportFlask.cs rename to Items/Alchemist/Flasks/HealthSupportFlask.cs index 46d0c302..f3e997f7 100644 --- a/Items/HealthSupportFlask.cs +++ b/Items/Alchemist/Flasks/HealthSupportFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class HealthSupportFlask : ModItem { diff --git a/Items/HealthSupportFlask.png b/Items/Alchemist/Flasks/HealthSupportFlask.png similarity index 100% rename from Items/HealthSupportFlask.png rename to Items/Alchemist/Flasks/HealthSupportFlask.png diff --git a/Items/LesserManaFlask.cs b/Items/Alchemist/Flasks/LesserManaFlask.cs similarity index 97% rename from Items/LesserManaFlask.cs rename to Items/Alchemist/Flasks/LesserManaFlask.cs index 81958348..98fe84d0 100644 --- a/Items/LesserManaFlask.cs +++ b/Items/Alchemist/Flasks/LesserManaFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class LesserManaFlask : AlchemistItem { diff --git a/Items/LesserManaFlask.png b/Items/Alchemist/Flasks/LesserManaFlask.png similarity index 100% rename from Items/LesserManaFlask.png rename to Items/Alchemist/Flasks/LesserManaFlask.png diff --git a/Items/LesserPoisonFlask.cs b/Items/Alchemist/Flasks/LesserPoisonFlask.cs similarity index 97% rename from Items/LesserPoisonFlask.cs rename to Items/Alchemist/Flasks/LesserPoisonFlask.cs index 77791e75..b52963d9 100644 --- a/Items/LesserPoisonFlask.cs +++ b/Items/Alchemist/Flasks/LesserPoisonFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class LesserPoisonFlask : AlchemistItem { diff --git a/Items/LesserPoisonFlask.png b/Items/Alchemist/Flasks/LesserPoisonFlask.png similarity index 100% rename from Items/LesserPoisonFlask.png rename to Items/Alchemist/Flasks/LesserPoisonFlask.png diff --git a/Items/LesserVenomFlask.cs b/Items/Alchemist/Flasks/LesserVenomFlask.cs similarity index 97% rename from Items/LesserVenomFlask.cs rename to Items/Alchemist/Flasks/LesserVenomFlask.cs index 1610b198..9f9ad465 100644 --- a/Items/LesserVenomFlask.cs +++ b/Items/Alchemist/Flasks/LesserVenomFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class LesserVenomFlask : AlchemistItem { diff --git a/Items/LesserVenomFlask.png b/Items/Alchemist/Flasks/LesserVenomFlask.png similarity index 100% rename from Items/LesserVenomFlask.png rename to Items/Alchemist/Flasks/LesserVenomFlask.png diff --git a/Items/ManaSupportFlask.cs b/Items/Alchemist/Flasks/ManaSupportFlask.cs similarity index 97% rename from Items/ManaSupportFlask.cs rename to Items/Alchemist/Flasks/ManaSupportFlask.cs index 5e6af04b..40ebcff1 100644 --- a/Items/ManaSupportFlask.cs +++ b/Items/Alchemist/Flasks/ManaSupportFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class ManaSupportFlask : ModItem { diff --git a/Items/ManaSupportFlask.png b/Items/Alchemist/Flasks/ManaSupportFlask.png similarity index 100% rename from Items/ManaSupportFlask.png rename to Items/Alchemist/Flasks/ManaSupportFlask.png diff --git a/Items/MoonDustFlask.cs b/Items/Alchemist/Flasks/MoonDustFlask.cs similarity index 97% rename from Items/MoonDustFlask.cs rename to Items/Alchemist/Flasks/MoonDustFlask.cs index ac1ab1db..e6c0e8fb 100644 --- a/Items/MoonDustFlask.cs +++ b/Items/Alchemist/Flasks/MoonDustFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class MoonDustFlask : AlchemistItem { diff --git a/Items/MoonDustFlask.png b/Items/Alchemist/Flasks/MoonDustFlask.png similarity index 100% rename from Items/MoonDustFlask.png rename to Items/Alchemist/Flasks/MoonDustFlask.png diff --git a/Items/PhantomFlask.cs b/Items/Alchemist/Flasks/PhantomFlask.cs similarity index 97% rename from Items/PhantomFlask.cs rename to Items/Alchemist/Flasks/PhantomFlask.cs index a58c5286..a4b382d6 100644 --- a/Items/PhantomFlask.cs +++ b/Items/Alchemist/Flasks/PhantomFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class PhantomFlask : AlchemistItem { diff --git a/Items/PhantomFlask.png b/Items/Alchemist/Flasks/PhantomFlask.png similarity index 100% rename from Items/PhantomFlask.png rename to Items/Alchemist/Flasks/PhantomFlask.png diff --git a/Items/PlagueFlask.cs b/Items/Alchemist/Flasks/PlagueFlask.cs similarity index 97% rename from Items/PlagueFlask.cs rename to Items/Alchemist/Flasks/PlagueFlask.cs index 5f8de2e3..7b25d4b4 100644 --- a/Items/PlagueFlask.cs +++ b/Items/Alchemist/Flasks/PlagueFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class PlagueFlask : AlchemistItem { diff --git a/Items/PlagueFlask.png b/Items/Alchemist/Flasks/PlagueFlask.png similarity index 100% rename from Items/PlagueFlask.png rename to Items/Alchemist/Flasks/PlagueFlask.png diff --git a/Items/SparkingFlask.cs b/Items/Alchemist/Flasks/SparkingFlask.cs similarity index 97% rename from Items/SparkingFlask.cs rename to Items/Alchemist/Flasks/SparkingFlask.cs index b9e475dd..c6b33aab 100644 --- a/Items/SparkingFlask.cs +++ b/Items/Alchemist/Flasks/SparkingFlask.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ID; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class SparkingFlask : AlchemistItem { diff --git a/Items/SparkingFlask.png b/Items/Alchemist/Flasks/SparkingFlask.png similarity index 100% rename from Items/SparkingFlask.png rename to Items/Alchemist/Flasks/SparkingFlask.png diff --git a/Items/SuperHealingFlask.cs b/Items/Alchemist/Flasks/SuperHealingFlask.cs similarity index 98% rename from Items/SuperHealingFlask.cs rename to Items/Alchemist/Flasks/SuperHealingFlask.cs index 22fe6870..ce59bdb5 100644 --- a/Items/SuperHealingFlask.cs +++ b/Items/Alchemist/Flasks/SuperHealingFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class SuperHealingFlask : AlchemistItem { diff --git a/Items/SuperHealingFlask.png b/Items/Alchemist/Flasks/SuperHealingFlask.png similarity index 100% rename from Items/SuperHealingFlask.png rename to Items/Alchemist/Flasks/SuperHealingFlask.png diff --git a/Items/SuperManaFlask.cs b/Items/Alchemist/Flasks/SuperManaFlask.cs similarity index 98% rename from Items/SuperManaFlask.cs rename to Items/Alchemist/Flasks/SuperManaFlask.cs index b5fa2086..6e54b036 100644 --- a/Items/SuperManaFlask.cs +++ b/Items/Alchemist/Flasks/SuperManaFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class SuperManaFlask : AlchemistItem { diff --git a/Items/SuperManaFlask.png b/Items/Alchemist/Flasks/SuperManaFlask.png similarity index 100% rename from Items/SuperManaFlask.png rename to Items/Alchemist/Flasks/SuperManaFlask.png diff --git a/Items/ToxicFlask.cs b/Items/Alchemist/Flasks/ToxicFlask.cs similarity index 97% rename from Items/ToxicFlask.cs rename to Items/Alchemist/Flasks/ToxicFlask.cs index 36b7e968..da1f2f0c 100644 --- a/Items/ToxicFlask.cs +++ b/Items/Alchemist/Flasks/ToxicFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { public class ToxicFlask : AlchemistItem { diff --git a/Items/ToxicFlask.png b/Items/Alchemist/Flasks/ToxicFlask.png similarity index 100% rename from Items/ToxicFlask.png rename to Items/Alchemist/Flasks/ToxicFlask.png diff --git a/Items/WallOfShadowsFlask.cs b/Items/Alchemist/Flasks/WallOfShadowsFlask.cs similarity index 96% rename from Items/WallOfShadowsFlask.cs rename to Items/Alchemist/Flasks/WallOfShadowsFlask.cs index f2b27632..7e2f074e 100644 --- a/Items/WallOfShadowsFlask.cs +++ b/Items/Alchemist/Flasks/WallOfShadowsFlask.cs @@ -1,8 +1,7 @@ using Microsoft.Xna.Framework; using Terraria; -using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Alchemist.Flasks { // todo: redo public class WallOfShadowsFlask : AlchemistItem @@ -23,7 +22,7 @@ public override void SetDefaults() item.width = 26; item.height = 30; item.crit = 4; - item.value = Item.sellPrice(gold:5); + item.value = Item.sellPrice(gold: 5); item.rare = 9; item.expert = true; item.accessory = true; diff --git a/Items/WallOfShadowsFlask.png b/Items/Alchemist/Flasks/WallOfShadowsFlask.png similarity index 100% rename from Items/WallOfShadowsFlask.png rename to Items/Alchemist/Flasks/WallOfShadowsFlask.png diff --git a/Items/Alchemist/Flasks/desktop.ini b/Items/Alchemist/Flasks/desktop.ini new file mode 100644 index 00000000..46ee0c4f --- /dev/null +++ b/Items/Alchemist/Flasks/desktop.ini @@ -0,0 +1,57 @@ +[LocalizedFileNames] +ExtendedFreezeFlask.cs=@ExtendedFreezeFlask.cs,0 +ExtendedBurningFlask.cs=@ExtendedBurningFlask.cs,0 +DukeFlask.cs=@DukeFlask.cs,0 +BurningFlask.cs=@BurningFlask.cs,0 +BigVenomFlask.cs=@BigVenomFlask.cs,0 +BigPoisonFlask.cs=@BigPoisonFlask.cs,0 +BigManaFlask.cs=@BigManaFlask.cs,0 +ToxicFlask.cs=@ToxicFlask.cs,0 +SparkingFlask.cs=@SparkingFlask.cs,0 +PlagueFlask.cs=@PlagueFlask.cs,0 +MoonDustFlask.cs=@MoonDustFlask.cs,0 +FlaskCore.cs=@FlaskCore.cs,0 +ExtendedBoomFlask.cs=@ExtendedBoomFlask.cs,0 +CrystalFlask.cs=@CrystalFlask.cs,0 +ClusterFlask.cs=@ClusterFlask.cs,0 +BoomFlask.cs=@BoomFlask.cs,0 +BasicFlask.cs=@BasicFlask.cs,0 +WallOfShadowsFlask.cs=@WallOfShadowsFlask.cs,0 +SuperManaFlask.cs=@SuperManaFlask.cs,0 +SuperHealingFlask.cs=@SuperHealingFlask.cs,0 +PhantomFlask.cs=@PhantomFlask.cs,0 +ManaSupportFlask.cs=@ManaSupportFlask.cs,0 +LesserVenomFlask.cs=@LesserVenomFlask.cs,0 +LesserPoisonFlask.cs=@LesserPoisonFlask.cs,0 +LesserManaFlask.cs=@LesserManaFlask.cs,0 +HealthSupportFlask.cs=@HealthSupportFlask.cs,0 +GoldFlask.cs=@GoldFlask.cs,0 +FreezeFlask.cs=@FreezeFlask.cs,0 +ToxicFlask.png=@ToxicFlask.png,0 +DukeFlask.png=@DukeFlask.png,0 +FlaskCore.png=@FlaskCore.png,0 +WallOfShadowsFlask.png=@WallOfShadowsFlask.png,0 +SparkingFlask.png=@SparkingFlask.png,0 +PlagueFlask.png=@PlagueFlask.png,0 +PhantomFlask.png=@PhantomFlask.png,0 +SuperManaFlask.png=@SuperManaFlask.png,0 +SuperHealingFlask.png=@SuperHealingFlask.png,0 +CrystalFlask.png=@CrystalFlask.png,0 +ClusterFlask.png=@ClusterFlask.png,0 +MoonDustFlask.png=@MoonDustFlask.png,0 +ExtendedBoomFlask.png=@ExtendedBoomFlask.png,0 +ExtendedBurningFlask.png=@ExtendedBurningFlask.png,0 +ExtendedFreezeFlask.png=@ExtendedFreezeFlask.png,0 +BoomFlask.png=@BoomFlask.png,0 +GoldFlask.png=@GoldFlask.png,0 +FreezeFlask.png=@FreezeFlask.png,0 +BasicFlask.png=@BasicFlask.png,0 +BigManaFlask.png=@BigManaFlask.png,0 +LesserManaFlask.png=@LesserManaFlask.png,0 +BurningFlask.png=@BurningFlask.png,0 +ManaSupportFlask.png=@ManaSupportFlask.png,0 +HealthSupportFlask.png=@HealthSupportFlask.png,0 +BigVenomFlask.png=@BigVenomFlask.png,0 +LesserVenomFlask.png=@LesserVenomFlask.png,0 +BigPoisonFlask.png=@BigPoisonFlask.png,0 +LesserPoisonFlask.png=@LesserPoisonFlask.png,0 diff --git a/Items/Alchemist/desktop.ini b/Items/Alchemist/desktop.ini new file mode 100644 index 00000000..3865dc0c --- /dev/null +++ b/Items/Alchemist/desktop.ini @@ -0,0 +1,12 @@ +[LocalizedFileNames] +AlchemistGlove.png=@AlchemistGlove.png,0 +AlchemistEmblem.png=@AlchemistEmblem.png,0 +AlchemistSoul.png=@AlchemistSoul.png,0 +AlchemistFocus.png=@AlchemistFocus.png,0 +AlchemistSpark.png=@AlchemistSpark.png,0 +AlchemasterMask.png=@AlchemasterMask.png,0 +AlchemasterMask_Head.png=@AlchemasterMask_Head.png,0 +AlchemasterTreasureBag.png=@AlchemasterTreasureBag.png,0 +Alchemator.png=@Alchemator.png,0 +AlchemasterTrophy.png=@AlchemasterTrophy.png,0 +AlchemyStation.png=@AlchemyStation.png,0 diff --git a/Items/ChainCoif.cs b/Items/ChainCoif.cs index 7aeba5f1..9951b6e6 100644 --- a/Items/ChainCoif.cs +++ b/Items/ChainCoif.cs @@ -1,6 +1,7 @@ using Terraria; using Terraria.ID; using Terraria.ModLoader; +using Tremor.Items.Invar; namespace Tremor.Items { diff --git a/Items/ChainGreaves.cs b/Items/ChainGreaves.cs index 594809c4..bb8b9ebe 100644 --- a/Items/ChainGreaves.cs +++ b/Items/ChainGreaves.cs @@ -1,6 +1,7 @@ using Terraria; using Terraria.ID; using Terraria.ModLoader; +using Tremor.Items.Invar; namespace Tremor.Items { diff --git a/Items/Chainmail.cs b/Items/Chainmail.cs index 5da0fd7b..bf94fe26 100644 --- a/Items/Chainmail.cs +++ b/Items/Chainmail.cs @@ -1,6 +1,7 @@ using Terraria; using Terraria.ID; using Terraria.ModLoader; +using Tremor.Items.Invar; namespace Tremor.Items { diff --git a/Items/BrokenInvarShield.cs b/Items/Invar/BrokenInvarShield.cs similarity index 96% rename from Items/BrokenInvarShield.cs rename to Items/Invar/BrokenInvarShield.cs index 901b7fc3..8098baed 100644 --- a/Items/BrokenInvarShield.cs +++ b/Items/Invar/BrokenInvarShield.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class BrokenInvarShield : ModItem { diff --git a/Items/BrokenInvarShield.png b/Items/Invar/BrokenInvarShield.png similarity index 100% rename from Items/BrokenInvarShield.png rename to Items/Invar/BrokenInvarShield.png diff --git a/Items/BrokenInvarSword.cs b/Items/Invar/BrokenInvarSword.cs similarity index 98% rename from Items/BrokenInvarSword.cs rename to Items/Invar/BrokenInvarSword.cs index 6175b75b..c053c6a0 100644 --- a/Items/BrokenInvarSword.cs +++ b/Items/Invar/BrokenInvarSword.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { // for legacy loading public class MeltedInvarSword : ModItem diff --git a/Items/BrokenInvarSword.png b/Items/Invar/BrokenInvarSword.png similarity index 100% rename from Items/BrokenInvarSword.png rename to Items/Invar/BrokenInvarSword.png diff --git a/Items/InvarAxe.cs b/Items/Invar/InvarAxe.cs similarity index 96% rename from Items/InvarAxe.cs rename to Items/Invar/InvarAxe.cs index a61cd1aa..330c23d0 100644 --- a/Items/InvarAxe.cs +++ b/Items/Invar/InvarAxe.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class InvarAxe : ModItem { diff --git a/Items/InvarAxe.png b/Items/Invar/InvarAxe.png similarity index 100% rename from Items/InvarAxe.png rename to Items/Invar/InvarAxe.png diff --git a/Items/InvarBar.cs b/Items/Invar/InvarBar.cs similarity index 94% rename from Items/InvarBar.cs rename to Items/Invar/InvarBar.cs index 7306c4c8..83144658 100644 --- a/Items/InvarBar.cs +++ b/Items/Invar/InvarBar.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class InvarBar : ModItem { diff --git a/Items/InvarBar.png b/Items/Invar/InvarBar.png similarity index 100% rename from Items/InvarBar.png rename to Items/Invar/InvarBar.png diff --git a/Items/InvarBow.cs b/Items/Invar/InvarBow.cs similarity index 96% rename from Items/InvarBow.cs rename to Items/Invar/InvarBow.cs index 28a052b6..a14870a9 100644 --- a/Items/InvarBow.cs +++ b/Items/Invar/InvarBow.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class InvarBow : ModItem { diff --git a/Items/InvarBow.png b/Items/Invar/InvarBow.png similarity index 100% rename from Items/InvarBow.png rename to Items/Invar/InvarBow.png diff --git a/Items/InvarBreastplate.cs b/Items/Invar/InvarBreastplate.cs similarity index 95% rename from Items/InvarBreastplate.cs rename to Items/Invar/InvarBreastplate.cs index 52734612..91eb155f 100644 --- a/Items/InvarBreastplate.cs +++ b/Items/Invar/InvarBreastplate.cs @@ -1,9 +1,8 @@ -using System.ComponentModel.Design.Serialization; using Terraria; using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public abstract class _InvarBreastPlate : TremorAbstractItem { diff --git a/Items/InvarBreastplate.png b/Items/Invar/InvarBreastplate.png similarity index 100% rename from Items/InvarBreastplate.png rename to Items/Invar/InvarBreastplate.png diff --git a/Items/InvarBreastplate_Arms.png b/Items/Invar/InvarBreastplate_Arms.png similarity index 100% rename from Items/InvarBreastplate_Arms.png rename to Items/Invar/InvarBreastplate_Arms.png diff --git a/Items/InvarBreastplate_Body.png b/Items/Invar/InvarBreastplate_Body.png similarity index 100% rename from Items/InvarBreastplate_Body.png rename to Items/Invar/InvarBreastplate_Body.png diff --git a/Items/InvarBreastplate_FemaleBody.png b/Items/Invar/InvarBreastplate_FemaleBody.png similarity index 100% rename from Items/InvarBreastplate_FemaleBody.png rename to Items/Invar/InvarBreastplate_FemaleBody.png diff --git a/Items/InvarBroadsword.cs b/Items/Invar/InvarBroadsword.cs similarity index 96% rename from Items/InvarBroadsword.cs rename to Items/Invar/InvarBroadsword.cs index 7fda1fdc..d58d2ab8 100644 --- a/Items/InvarBroadsword.cs +++ b/Items/Invar/InvarBroadsword.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class InvarBroadsword : ModItem { diff --git a/Items/InvarBroadsword.png b/Items/Invar/InvarBroadsword.png similarity index 100% rename from Items/InvarBroadsword.png rename to Items/Invar/InvarBroadsword.png diff --git a/Items/InvarGreaves.cs b/Items/Invar/InvarGreaves.cs similarity index 98% rename from Items/InvarGreaves.cs rename to Items/Invar/InvarGreaves.cs index 128b6628..4a6cb81c 100644 --- a/Items/InvarGreaves.cs +++ b/Items/Invar/InvarGreaves.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public abstract class _InvarGreaves : TremorAbstractItem { diff --git a/Items/InvarGreaves.png b/Items/Invar/InvarGreaves.png similarity index 100% rename from Items/InvarGreaves.png rename to Items/Invar/InvarGreaves.png diff --git a/Items/InvarGreaves_Legs.png b/Items/Invar/InvarGreaves_Legs.png similarity index 100% rename from Items/InvarGreaves_Legs.png rename to Items/Invar/InvarGreaves_Legs.png diff --git a/Items/InvarHammer.cs b/Items/Invar/InvarHammer.cs similarity index 96% rename from Items/InvarHammer.cs rename to Items/Invar/InvarHammer.cs index 7c121fee..697041dc 100644 --- a/Items/InvarHammer.cs +++ b/Items/Invar/InvarHammer.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class InvarHammer : ModItem { diff --git a/Items/InvarHammer.png b/Items/Invar/InvarHammer.png similarity index 100% rename from Items/InvarHammer.png rename to Items/Invar/InvarHammer.png diff --git a/Items/InvarHat.cs b/Items/Invar/InvarHat.cs similarity index 98% rename from Items/InvarHat.cs rename to Items/Invar/InvarHat.cs index 927f4b1f..e1ecaaea 100644 --- a/Items/InvarHat.cs +++ b/Items/Invar/InvarHat.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public abstract class _InvarHat : TremorAbstractItem { diff --git a/Items/InvarHat.png b/Items/Invar/InvarHat.png similarity index 100% rename from Items/InvarHat.png rename to Items/Invar/InvarHat.png diff --git a/Items/InvarHat_Head.png b/Items/Invar/InvarHat_Head.png similarity index 100% rename from Items/InvarHat_Head.png rename to Items/Invar/InvarHat_Head.png diff --git a/Items/InvarHeadgear.cs b/Items/Invar/InvarHeadgear.cs similarity index 98% rename from Items/InvarHeadgear.cs rename to Items/Invar/InvarHeadgear.cs index e5661252..0dce90ae 100644 --- a/Items/InvarHeadgear.cs +++ b/Items/Invar/InvarHeadgear.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public abstract class _InvarHeadgear : TremorAbstractItem { diff --git a/Items/InvarHeadgear.png b/Items/Invar/InvarHeadgear.png similarity index 100% rename from Items/InvarHeadgear.png rename to Items/Invar/InvarHeadgear.png diff --git a/Items/InvarHeadgear_Head.png b/Items/Invar/InvarHeadgear_Head.png similarity index 100% rename from Items/InvarHeadgear_Head.png rename to Items/Invar/InvarHeadgear_Head.png diff --git a/Items/InvarHelmet.cs b/Items/Invar/InvarHelmet.cs similarity index 98% rename from Items/InvarHelmet.cs rename to Items/Invar/InvarHelmet.cs index fe6e0318..1706916b 100644 --- a/Items/InvarHelmet.cs +++ b/Items/Invar/InvarHelmet.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public abstract class _InvarHelmet : TremorAbstractItem { diff --git a/Items/InvarHelmet.png b/Items/Invar/InvarHelmet.png similarity index 100% rename from Items/InvarHelmet.png rename to Items/Invar/InvarHelmet.png diff --git a/Items/InvarHelmet_Head.png b/Items/Invar/InvarHelmet_Head.png similarity index 100% rename from Items/InvarHelmet_Head.png rename to Items/Invar/InvarHelmet_Head.png diff --git a/Items/InvarPickaxe.cs b/Items/Invar/InvarPickaxe.cs similarity index 96% rename from Items/InvarPickaxe.cs rename to Items/Invar/InvarPickaxe.cs index 4945c2e2..08c45071 100644 --- a/Items/InvarPickaxe.cs +++ b/Items/Invar/InvarPickaxe.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class InvarPickaxe : ModItem { diff --git a/Items/InvarPickaxe.png b/Items/Invar/InvarPickaxe.png similarity index 100% rename from Items/InvarPickaxe.png rename to Items/Invar/InvarPickaxe.png diff --git a/Items/OldInvarPlate.cs b/Items/Invar/OldInvarPlate.cs similarity index 95% rename from Items/OldInvarPlate.cs rename to Items/Invar/OldInvarPlate.cs index e3543dee..707cb3f7 100644 --- a/Items/OldInvarPlate.cs +++ b/Items/Invar/OldInvarPlate.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.Invar { public class OldInvarPlate : ModItem { diff --git a/Items/OldInvarPlate.png b/Items/Invar/OldInvarPlate.png similarity index 100% rename from Items/OldInvarPlate.png rename to Items/Invar/OldInvarPlate.png diff --git a/Items/Invar/desktop.ini b/Items/Invar/desktop.ini new file mode 100644 index 00000000..35d0e2a2 --- /dev/null +++ b/Items/Invar/desktop.ini @@ -0,0 +1,22 @@ +[LocalizedFileNames] +InvarHeadgear_Head.png=@InvarHeadgear_Head.png,0 +InvarHeadgear.png=@InvarHeadgear.png,0 +InvarHat_Head.png=@InvarHat_Head.png,0 +InvarHat.png=@InvarHat.png,0 +InvarHammer.png=@InvarHammer.png,0 +InvarGreaves_Legs.png=@InvarGreaves_Legs.png,0 +InvarGreaves.png=@InvarGreaves.png,0 +InvarBreastplate_FemaleBody.png=@InvarBreastplate_FemaleBody.png,0 +InvarBroadsword.png=@InvarBroadsword.png,0 +InvarBreastplate.png=@InvarBreastplate.png,0 +InvarBreastplate_Arms.png=@InvarBreastplate_Arms.png,0 +InvarBreastplate_Body.png=@InvarBreastplate_Body.png,0 +InvarBar.png=@InvarBar.png,0 +InvarBow.png=@InvarBow.png,0 +InvarAxe.png=@InvarAxe.png,0 +InvarPickaxe.png=@InvarPickaxe.png,0 +InvarHelmet.png=@InvarHelmet.png,0 +InvarHelmet_Head.png=@InvarHelmet_Head.png,0 +BrokenInvarShield.png=@BrokenInvarShield.png,0 +BrokenInvarSword.png=@BrokenInvarSword.png,0 +OldInvarPlate.png=@OldInvarPlate.png,0 diff --git a/Items/ChippyRedSteelSword.cs b/Items/RedSteel/ChippyRedSteelSword.cs similarity index 91% rename from Items/ChippyRedSteelSword.cs rename to Items/RedSteel/ChippyRedSteelSword.cs index cf1d67fc..faeb8e70 100644 --- a/Items/ChippyRedSteelSword.cs +++ b/Items/RedSteel/ChippyRedSteelSword.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { public class ChippyRedSteelSword : ModItem { diff --git a/Items/ChippyRedSteelSword.png b/Items/RedSteel/ChippyRedSteelSword.png similarity index 100% rename from Items/ChippyRedSteelSword.png rename to Items/RedSteel/ChippyRedSteelSword.png diff --git a/Items/FaultyRedSteelShield.cs b/Items/RedSteel/FaultyRedSteelShield.cs similarity index 91% rename from Items/FaultyRedSteelShield.cs rename to Items/RedSteel/FaultyRedSteelShield.cs index 6a308e79..70be36bf 100644 --- a/Items/FaultyRedSteelShield.cs +++ b/Items/RedSteel/FaultyRedSteelShield.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { public class FaultyRedSteelShield : ModItem { diff --git a/Items/FaultyRedSteelShield.png b/Items/RedSteel/FaultyRedSteelShield.png similarity index 100% rename from Items/FaultyRedSteelShield.png rename to Items/RedSteel/FaultyRedSteelShield.png diff --git a/Items/RedSteelArmorPiece.cs b/Items/RedSteel/RedSteelArmorPiece.cs similarity index 91% rename from Items/RedSteelArmorPiece.cs rename to Items/RedSteel/RedSteelArmorPiece.cs index fc32b42e..9324b459 100644 --- a/Items/RedSteelArmorPiece.cs +++ b/Items/RedSteel/RedSteelArmorPiece.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { public class RedSteelArmorPiece : ModItem { diff --git a/Items/RedSteelArmorPiece.png b/Items/RedSteel/RedSteelArmorPiece.png similarity index 100% rename from Items/RedSteelArmorPiece.png rename to Items/RedSteel/RedSteelArmorPiece.png diff --git a/Items/RedSteelBar.cs b/Items/RedSteel/RedSteelBar.cs similarity index 97% rename from Items/RedSteelBar.cs rename to Items/RedSteel/RedSteelBar.cs index c05e9904..286d3273 100644 --- a/Items/RedSteelBar.cs +++ b/Items/RedSteel/RedSteelBar.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { public class RedSteelBar : ModItem { diff --git a/Items/RedSteelBar.png b/Items/RedSteel/RedSteelBar.png similarity index 100% rename from Items/RedSteelBar.png rename to Items/RedSteel/RedSteelBar.png diff --git a/Items/RedSteelBroadsword.cs b/Items/RedSteel/RedSteelBroadsword.cs similarity index 97% rename from Items/RedSteelBroadsword.cs rename to Items/RedSteel/RedSteelBroadsword.cs index f37f3054..014b2e2a 100644 --- a/Items/RedSteelBroadsword.cs +++ b/Items/RedSteel/RedSteelBroadsword.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { public class RedSteelBroadsword : ModItem { diff --git a/Items/RedSteelBroadsword.png b/Items/RedSteel/RedSteelBroadsword.png similarity index 100% rename from Items/RedSteelBroadsword.png rename to Items/RedSteel/RedSteelBroadsword.png diff --git a/Items/RedSteelChestplate.cs b/Items/RedSteel/RedSteelChestplate.cs similarity index 96% rename from Items/RedSteelChestplate.cs rename to Items/RedSteel/RedSteelChestplate.cs index 5d2cce98..43e215a0 100644 --- a/Items/RedSteelChestplate.cs +++ b/Items/RedSteel/RedSteelChestplate.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { [AutoloadEquip(EquipType.Body)] public class RedSteelChestplate : ModItem diff --git a/Items/RedSteelChestplate.png b/Items/RedSteel/RedSteelChestplate.png similarity index 100% rename from Items/RedSteelChestplate.png rename to Items/RedSteel/RedSteelChestplate.png diff --git a/Items/RedSteelChestplate_Arms.png b/Items/RedSteel/RedSteelChestplate_Arms.png similarity index 100% rename from Items/RedSteelChestplate_Arms.png rename to Items/RedSteel/RedSteelChestplate_Arms.png diff --git a/Items/RedSteelChestplate_Body.png b/Items/RedSteel/RedSteelChestplate_Body.png similarity index 100% rename from Items/RedSteelChestplate_Body.png rename to Items/RedSteel/RedSteelChestplate_Body.png diff --git a/Items/RedSteelChestplate_FemaleBody.png b/Items/RedSteel/RedSteelChestplate_FemaleBody.png similarity index 100% rename from Items/RedSteelChestplate_FemaleBody.png rename to Items/RedSteel/RedSteelChestplate_FemaleBody.png diff --git a/Items/RedSteelGreaves.cs b/Items/RedSteel/RedSteelGreaves.cs similarity index 96% rename from Items/RedSteelGreaves.cs rename to Items/RedSteel/RedSteelGreaves.cs index e462c8e9..064a4b77 100644 --- a/Items/RedSteelGreaves.cs +++ b/Items/RedSteel/RedSteelGreaves.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { [AutoloadEquip(EquipType.Legs)] public class RedSteelGreaves : ModItem diff --git a/Items/RedSteelGreaves.png b/Items/RedSteel/RedSteelGreaves.png similarity index 100% rename from Items/RedSteelGreaves.png rename to Items/RedSteel/RedSteelGreaves.png diff --git a/Items/RedSteelGreaves_Legs.png b/Items/RedSteel/RedSteelGreaves_Legs.png similarity index 100% rename from Items/RedSteelGreaves_Legs.png rename to Items/RedSteel/RedSteelGreaves_Legs.png diff --git a/Items/RedSteelGuardian.cs b/Items/RedSteel/RedSteelGuardian.cs similarity index 98% rename from Items/RedSteelGuardian.cs rename to Items/RedSteel/RedSteelGuardian.cs index 09ec8abc..c7d63a87 100644 --- a/Items/RedSteelGuardian.cs +++ b/Items/RedSteel/RedSteelGuardian.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { [AutoloadEquip(EquipType.Shield)] public class RedSteelGuardian : ModItem diff --git a/Items/RedSteelGuardian.png b/Items/RedSteel/RedSteelGuardian.png similarity index 100% rename from Items/RedSteelGuardian.png rename to Items/RedSteel/RedSteelGuardian.png diff --git a/Items/RedSteelGuardian_Shield.png b/Items/RedSteel/RedSteelGuardian_Shield.png similarity index 100% rename from Items/RedSteelGuardian_Shield.png rename to Items/RedSteel/RedSteelGuardian_Shield.png diff --git a/Items/RedSteelHeadgear.cs b/Items/RedSteel/RedSteelHeadgear.cs similarity index 97% rename from Items/RedSteelHeadgear.cs rename to Items/RedSteel/RedSteelHeadgear.cs index 2a4b3902..3615ddd2 100644 --- a/Items/RedSteelHeadgear.cs +++ b/Items/RedSteel/RedSteelHeadgear.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.Items.RedSteel { [AutoloadEquip(EquipType.Head)] public class RedSteelHeadgear : ModItem diff --git a/Items/RedSteelHeadgear.png b/Items/RedSteel/RedSteelHeadgear.png similarity index 100% rename from Items/RedSteelHeadgear.png rename to Items/RedSteel/RedSteelHeadgear.png diff --git a/Items/RedSteelHeadgear_Head.png b/Items/RedSteel/RedSteelHeadgear_Head.png similarity index 100% rename from Items/RedSteelHeadgear_Head.png rename to Items/RedSteel/RedSteelHeadgear_Head.png diff --git a/Items/RedSteel/desktop.ini b/Items/RedSteel/desktop.ini new file mode 100644 index 00000000..e0caf63a --- /dev/null +++ b/Items/RedSteel/desktop.ini @@ -0,0 +1,16 @@ +[LocalizedFileNames] +RedSteelHeadgear_Head.png=@RedSteelHeadgear_Head.png,0 +RedSteelGuardian_Shield.png=@RedSteelGuardian_Shield.png,0 +RedSteelHeadgear.png=@RedSteelHeadgear.png,0 +RedSteelGreaves_Legs.png=@RedSteelGreaves_Legs.png,0 +RedSteelGuardian.png=@RedSteelGuardian.png,0 +RedSteelChestplate_FemaleBody.png=@RedSteelChestplate_FemaleBody.png,0 +RedSteelGreaves.png=@RedSteelGreaves.png,0 +RedSteelChestplate.png=@RedSteelChestplate.png,0 +RedSteelChestplate_Arms.png=@RedSteelChestplate_Arms.png,0 +RedSteelChestplate_Body.png=@RedSteelChestplate_Body.png,0 +RedSteelBroadsword.png=@RedSteelBroadsword.png,0 +RedSteelArmorPiece.png=@RedSteelArmorPiece.png,0 +RedSteelBar.png=@RedSteelBar.png,0 +FaultyRedSteelShield.png=@FaultyRedSteelShield.png,0 +ChippyRedSteelSword.png=@ChippyRedSteelSword.png,0 diff --git a/NPCs/Bosses/Motherboard/Motherboard.cs b/NPCs/Bosses/Motherboard/Motherboard.cs index e932d587..558e2d5f 100644 --- a/NPCs/Bosses/Motherboard/Motherboard.cs +++ b/NPCs/Bosses/Motherboard/Motherboard.cs @@ -7,6 +7,7 @@ using Terraria.ID; using Terraria.ModLoader; using Tremor.Items; +using Tremor.Items.Alchemist.Flasks; using Tremor.NPCs.Bosses.Motherboard.Items; namespace Tremor.NPCs.Bosses.Motherboard diff --git a/NPCs/TownNPCs/Alchemist.cs b/NPCs/TownNPCs/Alchemist.cs index 13cafddd..3090984c 100644 --- a/NPCs/TownNPCs/Alchemist.cs +++ b/NPCs/TownNPCs/Alchemist.cs @@ -6,6 +6,8 @@ using Microsoft.Xna.Framework; using Terraria.Utilities; using Tremor.Items; +using Tremor.Items.Alchemist; +using Tremor.Items.Alchemist.Flasks; using Tremor.Projectiles.Alchemic; namespace Tremor.NPCs.TownNPCs diff --git a/NPCs/UndeadWarrior1.cs b/NPCs/UndeadWarrior1.cs index b43b653e..435f176b 100644 --- a/NPCs/UndeadWarrior1.cs +++ b/NPCs/UndeadWarrior1.cs @@ -5,6 +5,7 @@ using Microsoft.Xna.Framework; using Tremor.Items; +using Tremor.Items.Invar; using Tremor.ZombieEvent.Items; namespace Tremor.NPCs diff --git a/NPCs/UndeadWarrior2.cs b/NPCs/UndeadWarrior2.cs index 3e1d3bc5..b91ee2af 100644 --- a/NPCs/UndeadWarrior2.cs +++ b/NPCs/UndeadWarrior2.cs @@ -5,6 +5,7 @@ using Microsoft.Xna.Framework; using Tremor.Items; +using Tremor.Items.Invar; using Tremor.ZombieEvent.Items; namespace Tremor.NPCs diff --git a/NPCs/UndeadWarrior3.cs b/NPCs/UndeadWarrior3.cs index 2e110c28..f0faf4aa 100644 --- a/NPCs/UndeadWarrior3.cs +++ b/NPCs/UndeadWarrior3.cs @@ -5,6 +5,7 @@ using Microsoft.Xna.Framework; using Tremor.Items; +using Tremor.Items.Invar; using Tremor.ZombieEvent.Items; namespace Tremor.NPCs diff --git a/NPCs/UndeadWarrior4.cs b/NPCs/UndeadWarrior4.cs index 92ecb1bf..45bd5b1c 100644 --- a/NPCs/UndeadWarrior4.cs +++ b/NPCs/UndeadWarrior4.cs @@ -5,6 +5,7 @@ using Microsoft.Xna.Framework; using Tremor.Items; +using Tremor.Items.Invar; using Tremor.ZombieEvent.Items; namespace Tremor.NPCs diff --git a/Tremor.csproj b/Tremor.csproj index bcae2b7b..a8a157a2 100644 --- a/Tremor.csproj +++ b/Tremor.csproj @@ -190,6 +190,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -412,16 +440,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -430,16 +458,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -512,7 +540,6 @@ - @@ -528,9 +555,6 @@ - - - @@ -567,7 +591,6 @@ - @@ -604,7 +627,7 @@ - + @@ -623,7 +646,6 @@ - @@ -665,7 +687,7 @@ - + @@ -673,7 +695,6 @@ - @@ -756,7 +777,6 @@ - @@ -861,7 +881,6 @@ - @@ -918,9 +937,6 @@ - - - @@ -931,7 +947,7 @@ - + @@ -941,7 +957,6 @@ - @@ -952,7 +967,6 @@ - @@ -1039,7 +1053,6 @@ - @@ -1096,7 +1109,6 @@ - @@ -1154,17 +1166,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -1203,9 +1215,6 @@ - - - @@ -1249,7 +1258,6 @@ - @@ -1266,7 +1274,7 @@ - + @@ -1284,7 +1292,6 @@ - @@ -1359,7 +1366,7 @@ - + @@ -1429,7 +1436,6 @@ - @@ -1452,7 +1458,6 @@ - @@ -1516,13 +1521,13 @@ - - - - - - - + + + + + + + @@ -1668,7 +1673,6 @@ - @@ -1752,8 +1756,6 @@ - - @@ -1813,7 +1815,6 @@ - @@ -1887,7 +1888,6 @@ - diff --git a/TremorMod_Boss_Item_List.txt b/TremorMod_Boss_Item_List.txt new file mode 100644 index 00000000..4a4e79a8 --- /dev/null +++ b/TremorMod_Boss_Item_List.txt @@ -0,0 +1,39 @@ +Missing weapons from TremorMod bosses: + +PreHardmode: + +-The Rukh | 3/6 Weapons Dropped | Missing Summoning, Alchemy and Throwing +-Tiki Totem | 1/6 Weapons Dropped | Missing Summoning, Alchemy, Ranged, Throwing and Magic +-Evil Corn | 3/6 Weapons Dropped | Missing Summoning, Alchemy and Magic +-Storm Jellyfish | 4/6 Weapons Dropped | Missing Alchemy and Throwing +-Ancient Dragon | 2/6 Weapons Dropped | Missing Summoning, Alchemy, Ranged and Throwing +-Heater of Worlds | 3/6 Weapons Dropped | Missing Summoning, Alchemy and Throwing +-Fungus Bettle | 1/6 Weapons Dropped | Missing Summoning, Alchemy, Ranged, Throwing and Magic + +Hardmode: + +-Alchemaster | 2/6 Weapons Dropped | Missing Summonning, Ranged, Throwing and Magic +-Pixie Queen | 2/6 Weapons Dropped | Missing Summoning, Alchemy, Ranged and Throwing +-Frost King | 2/6 Weapons Dropped | Missing Summoning, Alchemy, Ranged and Throwing +-Wall of Shadows | 5/6 Weapons Dropped | Missing Throwing +-Cog Lord | 3/6 Weapons Dropped | Missing Summoning, Alchemist and Throwing +-Cyber King | 4/6 Weapons Dropped | Missing Alchemist and Throwing + +Tremode: + +-Dark Emperor | 3/6 Weapons Dropped | Missing Summoning, Alchemist and Magic +-Brutallisk | 5/6 Weapons Dropped | Missing Alchemist +-Space Whale | 4/6 Weapons Dropped | Missing Summoning and Alchemist +-The Trinity | 4/6 Weapons Dropped | Missing Summoning and Alchemist +-Andas | 3/6 Weapons Dropped | Missing Summoning, Alchemist and Throwing + +-Paradox Titan | 3/6 Weapons Dropped | Missing Summoning, Alchemist and Throwing + + + + + + + + +