From c381bfd5eb06b96878f8da9a0544bcc971803b4f Mon Sep 17 00:00:00 2001 From: Jofairden Date: Mon, 9 Oct 2017 16:00:50 +0200 Subject: [PATCH] Dedicated bosses folder --- Changelogs/v1.3.2.5.txt | 4 + NPCs/{ => Bosses}/AndasBoss/Andas.cs | 4 +- NPCs/{ => Bosses}/AndasBoss/Andas.png | Bin .../AndasBoss/Andas_Head_Boss.png | Bin NPCs/{ => Bosses}/AndasBoss/InfernoSkull.cs | 2 +- NPCs/{ => Bosses}/AndasBoss/InfernoSkull.png | Bin NPCs/{ => Bosses}/AndasBoss/MoltenSpirit.cs | 2 +- NPCs/{ => Bosses}/AndasBoss/MoltenSpirit.png | Bin NPCs/{ => Bosses}/AndasBoss/SpiritFire.cs | 2 +- NPCs/{ => Bosses}/AndasBoss/SpiritFire.png | Bin NPCs/{ => Bosses}/AndasBoss/TrueAndas.cs | 5 +- NPCs/{ => Bosses}/AndasBoss/TrueAndas.png | Bin .../AndasBoss/TrueAndas_Head_Boss.png | Bin NPCs/{ => Bosses}/AndasBoss/UndeadWyrmBody.cs | 8 +- .../{ => Bosses}/AndasBoss/UndeadWyrmBody.png | Bin NPCs/{ => Bosses}/AndasBoss/UndeadWyrmHead.cs | 3 +- .../{ => Bosses}/AndasBoss/UndeadWyrmHead.png | Bin NPCs/{ => Bosses}/AndasBoss/UndeadWyrmTail.cs | 6 +- .../{ => Bosses}/AndasBoss/UndeadWyrmTail.png | Bin .../NPCs => NPCs/Bosses/CogLord}/CogLord.cs | 4 +- .../NPCs => NPCs/Bosses/CogLord}/CogLord.png | Bin .../Bosses/CogLord}/CogLordArm.cs | 2 +- .../Bosses/CogLord}/CogLordArm.png | Bin .../Bosses/CogLord}/CogLordArmSecond.cs | 2 +- .../Bosses/CogLord}/CogLordArmSecond.png | Bin .../Bosses/CogLord}/CogLordBody.png | Bin .../Bosses/CogLord}/CogLordCog.cs | 7 +- .../Bosses/CogLord}/CogLordCog.png | Bin .../Bosses/CogLord}/CogLordGun.cs | 5 +- .../Bosses/CogLord}/CogLordGun.png | Bin .../Bosses/CogLord}/CogLordHand.cs | 8 +- .../Bosses/CogLord}/CogLordHand.png | Bin .../Bosses/CogLord}/CogLordProbe.cs | 8 +- .../Bosses/CogLord}/CogLordProbe.png | Bin .../Bosses/CogLord}/CogLord_Head_Boss.png | Bin .../Bosses/CogLord}/GogLordGog.cs | 2 +- .../Bosses/CogLord}/GogLordGog.png | Bin .../Bosses/CogLord/Items}/CogLordBag.cs | 3 +- .../Bosses/CogLord/Items}/CogLordBag.png | Bin .../Bosses/CogLord/Items}/CogLordMask.cs | 2 +- .../Bosses/CogLord/Items}/CogLordMask.png | Bin .../CogLord/Items}/CogLordMask_Head.png | Bin .../Bosses/CogLord/Items}/CogLordMusicBox.cs | 2 +- .../Bosses/CogLord/Items}/CogLordMusicBox.png | Bin .../Bosses/CogLord/Items}/CogLordTrophy.cs | 2 +- .../Bosses/CogLord/Items}/CogLordTrophy.png | Bin NPCs/{ => Bosses/Motherboard}/Clamper.cs | 5 +- NPCs/{ => Bosses/Motherboard}/Clamper.png | Bin NPCs/{ => Bosses/Motherboard}/Clamper2.cs | 7 +- NPCs/{ => Bosses/Motherboard}/Clamper2.png | Bin .../Motherboard/Items}/MechanicalBrain.cs | 19 +- .../Motherboard/Items}/MechanicalBrain.png | Bin .../Bosses/Motherboard/Items}/Motherboard.cs | 5 +- .../Bosses/Motherboard/Items}/Motherboard.png | Bin .../Motherboard/Items}/MotherboardBag.cs | 5 +- .../Motherboard/Items}/MotherboardBag.png | Bin .../Motherboard/Items}/MotherboardMask.cs | 5 +- .../Motherboard/Items}/MotherboardMask.png | Bin .../Items}/MotherboardMask_Head.png | Bin .../Motherboard/Items}/MotherboardTrophy.cs | 4 +- .../Motherboard/Items}/MotherboardTrophy.png | Bin NPCs/{ => Bosses/Motherboard}/Motherboard.cs | 20 +- NPCs/{ => Bosses/Motherboard}/Motherboard.png | Bin .../Motherboard}/Motherboard_Head_Boss.png | Bin .../Motherboard}/Motherboard_Head_Boss2.png | Bin NPCs/{ => Bosses/Motherboard}/SignalDrone.cs | 2 +- NPCs/{ => Bosses/Motherboard}/SignalDrone.png | Bin .../Items/Accessories/NovaWings.cs | 2 +- .../Items/Accessories/NovaWings.png | Bin .../Items/Accessories/NovaWings_Wings.png | Bin .../Items/Armor/NovaBreastplate.cs | 2 +- .../Items/Armor/NovaBreastplate.png | Bin .../Items/Armor/NovaBreastplate_Arms.png | Bin .../Items/Armor/NovaBreastplate_Body.png | Bin .../Armor/NovaBreastplate_FemaleBody.png | Bin .../NovaPillar}/Items/Armor/NovaHelmet.cs | 2 +- .../NovaPillar}/Items/Armor/NovaHelmet.png | Bin .../Items/Armor/NovaHelmet_Head.png | Bin .../NovaPillar}/Items/Armor/NovaLeggings.cs | 2 +- .../NovaPillar}/Items/Armor/NovaLeggings.png | Bin .../Items/Armor/NovaLeggings_Legs.png | Bin .../Bosses/NovaPillar}/Items/NovaDye.cs | 2 +- .../Bosses/NovaPillar}/Items/NovaDye.png | Bin .../Bosses/NovaPillar}/Items/NovaFragment.cs | 2 +- .../Bosses/NovaPillar}/Items/NovaFragment.png | Bin .../NovaPillar}/Items/NovaFragment_Glow.png | Bin .../Items/Placeable/NovaFragmentBlock.cs | 4 +- .../Items/Placeable/NovaFragmentBlock.png | Bin .../Items/Placeable/NovaMonolith.cs | 4 +- .../Items/Placeable/NovaMonolith.png | Bin .../NovaPillar}/Items/Weapons/NovaFlask.cs | 2 +- .../NovaPillar}/Items/Weapons/NovaFlask.png | Bin .../NovaPillar}/Items/Weapons/NovaHamaxe.cs | 4 +- .../NovaPillar}/Items/Weapons/NovaHamaxe.png | Bin .../Items/Weapons/NovaHamaxe_Glow.png | Bin .../NovaPillar}/Items/Weapons/NovaPickaxe.cs | 4 +- .../NovaPillar}/Items/Weapons/NovaPickaxe.png | Bin .../Items/Weapons/NovaPickaxe_Glow.png | Bin .../NovaPillar}/Items/Weapons/NovaSprayer.cs | 2 +- .../NovaPillar}/Items/Weapons/NovaSprayer.png | Bin .../Bosses/NovaPillar}/NPCs/Deadling.cs | 4 +- .../Bosses/NovaPillar}/NPCs/Deadling.png | Bin .../NovaPillar}/NPCs/Deadling_GlowMask.png | Bin .../Bosses/NovaPillar}/NPCs/NovaAlchemist.cs | 4 +- .../Bosses/NovaPillar}/NPCs/NovaAlchemist.png | Bin .../Bosses/NovaPillar}/NPCs/NovaAlchemistC.cs | 2 +- .../NovaPillar}/NPCs/NovaAlchemistC.png | Bin .../NPCs/NovaAlchemist_GlowMask.png | Bin .../Bosses/NovaPillar}/NPCs/NovaBat.cs | 4 +- .../Bosses/NovaPillar}/NPCs/NovaBat.png | Bin .../NovaPillar}/NPCs/NovaBat_GlowMask.png | Bin .../Bosses/NovaPillar}/NPCs/NovaFlier.cs | 4 +- .../Bosses/NovaPillar}/NPCs/NovaFlier.png | Bin .../NovaPillar}/NPCs/NovaFlier_GlowMask.png | Bin .../Bosses/NovaPillar}/NPCs/Varki.cs | 4 +- .../Bosses/NovaPillar}/NPCs/Varki.png | Bin .../NovaPillar}/NPCs/Varki_GlowMask.png | Bin .../Bosses/NovaPillar}/NPCs/Youwarkee.cs | 4 +- .../Bosses/NovaPillar}/NPCs/Youwarkee.png | Bin .../Bosses/NovaPillar}/NPCs/Youwarkee2.cs | 4 +- .../Bosses/NovaPillar}/NPCs/Youwarkee2.png | Bin .../NovaPillar}/NPCs/Youwarkee2_GlowMask.png | Bin .../NovaPillar}/NPCs/Youwarkee_GlowMask.png | Bin .../Bosses/NovaPillar}/NovaData.cs | 3 +- .../Bosses/NovaPillar}/NovaHandler.cs | 2 +- .../Bosses/NovaPillar}/NovaPillar.cs | 4 +- .../Bosses/NovaPillar}/NovaPillar.png | Bin .../NovaPillar}/NovaPillar_GlowMask.png | Bin .../NovaPillar}/NovaPillar_Head_Boss.png | Bin .../Bosses/NovaPillar}/NovaPlanet.png | Bin .../Bosses/NovaPillar}/NovaSky.cs | 5 +- .../Bosses/NovaPillar}/NovaSoul 0.png | Bin .../Bosses/NovaPillar}/NovaSoul 1.png | Bin .../Bosses/NovaPillar}/NovaSoul 2.png | Bin .../Projectiles/NovaAlchemistCloud.cs | 2 +- .../Projectiles/NovaAlchemistCloud.png | Bin .../Projectiles/NovaAlchemistProjectile.cs | 2 +- .../Projectiles/NovaAlchemistProjectile.png | Bin .../NovaPillar}/Projectiles/NovaBlast.cs | 2 +- .../NovaPillar}/Projectiles/NovaBlast.png | Bin .../NovaPillar}/Projectiles/NovaBottle.cs | 2 +- .../NovaPillar}/Projectiles/NovaBottle.png | Bin .../NovaPillar}/Projectiles/NovaBurst.cs | 2 +- .../NovaPillar}/Projectiles/NovaBurst.png | Bin .../NovaPillar}/Projectiles/NovaCauldron.cs | 2 +- .../NovaPillar}/Projectiles/NovaCauldron.png | Bin .../Projectiles/NovaCauldron_Fire.cs | 2 +- .../Projectiles/NovaCauldron_Fire.png | Bin .../NovaPillar}/Projectiles/NovaFlask_Proj.cs | 2 +- .../Projectiles/NovaFlask_Proj.png | Bin .../Projectiles/NovaFlask_ProjBall.cs | 2 +- .../Projectiles/NovaFlask_ProjBall.png | Bin .../Projectiles/NovaFlask_ProjFire.cs | 2 +- .../Projectiles/NovaFlask_ProjFire.png | Bin .../NovaPillar}/Projectiles/NovaFlierProj.cs | 2 +- .../NovaPillar}/Projectiles/NovaFlierProj.png | Bin .../NovaPillar}/Projectiles/NovaSkull.cs | 2 +- .../NovaPillar}/Projectiles/NovaSkull.png | Bin .../NovaPillar}/Projectiles/NovaSkullburst.cs | 2 +- .../Projectiles/NovaSkullburst.png | Bin .../Bosses/NovaPillar}/Tiles/NovaBlock.cs | 2 +- .../Bosses/NovaPillar}/Tiles/NovaBlock.png | Bin .../NovaPillar}/Tiles/NovaMonolithTile.cs | 4 +- .../NovaPillar}/Tiles/NovaMonolithTile.png | Bin .../Tiles/NovaMonolithTile_Glowmask.png | Bin Projectiles/CogLordLaser.cs | 2 +- RecipeUtils.cs | 2 +- Tremor.cs | 4 +- Tremor.csproj | 332 +++++++++--------- 169 files changed, 294 insertions(+), 309 deletions(-) rename NPCs/{ => Bosses}/AndasBoss/Andas.cs (99%) rename NPCs/{ => Bosses}/AndasBoss/Andas.png (100%) rename NPCs/{ => Bosses}/AndasBoss/Andas_Head_Boss.png (100%) rename NPCs/{ => Bosses}/AndasBoss/InfernoSkull.cs (98%) rename NPCs/{ => Bosses}/AndasBoss/InfernoSkull.png (100%) rename NPCs/{ => Bosses}/AndasBoss/MoltenSpirit.cs (99%) rename NPCs/{ => Bosses}/AndasBoss/MoltenSpirit.png (100%) rename NPCs/{ => Bosses}/AndasBoss/SpiritFire.cs (98%) rename NPCs/{ => Bosses}/AndasBoss/SpiritFire.png (100%) rename NPCs/{ => Bosses}/AndasBoss/TrueAndas.cs (99%) rename NPCs/{ => Bosses}/AndasBoss/TrueAndas.png (100%) rename NPCs/{ => Bosses}/AndasBoss/TrueAndas_Head_Boss.png (100%) rename NPCs/{ => Bosses}/AndasBoss/UndeadWyrmBody.cs (97%) rename NPCs/{ => Bosses}/AndasBoss/UndeadWyrmBody.png (100%) rename NPCs/{ => Bosses}/AndasBoss/UndeadWyrmHead.cs (98%) rename NPCs/{ => Bosses}/AndasBoss/UndeadWyrmHead.png (100%) rename NPCs/{ => Bosses}/AndasBoss/UndeadWyrmTail.cs (97%) rename NPCs/{ => Bosses}/AndasBoss/UndeadWyrmTail.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLord.cs (98%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLord.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordArm.cs (98%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordArm.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordArmSecond.cs (98%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordArmSecond.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordBody.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordCog.cs (94%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordCog.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordGun.cs (98%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordGun.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordHand.cs (97%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordHand.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordProbe.cs (94%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLordProbe.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/CogLord_Head_Boss.png (100%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/GogLordGog.cs (97%) rename {CogLord/NPCs => NPCs/Bosses/CogLord}/GogLordGog.png (100%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordBag.cs (96%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordBag.png (100%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordMask.cs (89%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordMask.png (100%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordMask_Head.png (100%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordMusicBox.cs (92%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordMusicBox.png (100%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordTrophy.cs (92%) rename {Items => NPCs/Bosses/CogLord/Items}/CogLordTrophy.png (100%) rename NPCs/{ => Bosses/Motherboard}/Clamper.cs (98%) rename NPCs/{ => Bosses/Motherboard}/Clamper.png (100%) rename NPCs/{ => Bosses/Motherboard}/Clamper2.cs (88%) rename NPCs/{ => Bosses/Motherboard}/Clamper2.png (100%) rename {Items => NPCs/Bosses/Motherboard/Items}/MechanicalBrain.cs (74%) rename {Items => NPCs/Bosses/Motherboard/Items}/MechanicalBrain.png (100%) rename {Items => NPCs/Bosses/Motherboard/Items}/Motherboard.cs (92%) rename {Items => NPCs/Bosses/Motherboard/Items}/Motherboard.png (100%) rename {Items => NPCs/Bosses/Motherboard/Items}/MotherboardBag.cs (86%) rename {Items => NPCs/Bosses/Motherboard/Items}/MotherboardBag.png (100%) rename {Items => NPCs/Bosses/Motherboard/Items}/MotherboardMask.cs (88%) rename {Items => NPCs/Bosses/Motherboard/Items}/MotherboardMask.png (100%) rename {Items => NPCs/Bosses/Motherboard/Items}/MotherboardMask_Head.png (100%) rename {Items => NPCs/Bosses/Motherboard/Items}/MotherboardTrophy.cs (92%) rename {Items => NPCs/Bosses/Motherboard/Items}/MotherboardTrophy.png (100%) rename NPCs/{ => Bosses/Motherboard}/Motherboard.cs (97%) rename NPCs/{ => Bosses/Motherboard}/Motherboard.png (100%) rename NPCs/{ => Bosses/Motherboard}/Motherboard_Head_Boss.png (100%) rename NPCs/{ => Bosses/Motherboard}/Motherboard_Head_Boss2.png (100%) rename NPCs/{ => Bosses/Motherboard}/SignalDrone.cs (99%) rename NPCs/{ => Bosses/Motherboard}/SignalDrone.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Accessories/NovaWings.cs (96%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Accessories/NovaWings.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Accessories/NovaWings_Wings.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaBreastplate.cs (95%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaBreastplate.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaBreastplate_Arms.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaBreastplate_Body.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaBreastplate_FemaleBody.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaHelmet.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaHelmet.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaHelmet_Head.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaLeggings.cs (95%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaLeggings.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Armor/NovaLeggings_Legs.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/NovaDye.cs (93%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/NovaDye.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/NovaFragment.cs (95%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/NovaFragment.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/NovaFragment_Glow.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Placeable/NovaFragmentBlock.cs (89%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Placeable/NovaFragmentBlock.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Placeable/NovaMonolith.cs (88%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Placeable/NovaMonolith.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaFlask.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaFlask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaHamaxe.cs (84%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaHamaxe.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaHamaxe_Glow.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaPickaxe.cs (84%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaPickaxe.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaPickaxe_Glow.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaSprayer.cs (98%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Items/Weapons/NovaSprayer.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Deadling.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Deadling.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Deadling_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaAlchemist.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaAlchemist.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaAlchemistC.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaAlchemistC.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaAlchemist_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaBat.cs (96%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaBat.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaBat_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaFlier.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaFlier.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/NovaFlier_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Varki.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Varki.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Varki_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Youwarkee.cs (98%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Youwarkee.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Youwarkee2.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Youwarkee2.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Youwarkee2_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NPCs/Youwarkee_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaData.cs (93%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaHandler.cs (99%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaPillar.cs (99%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaPillar.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaPillar_GlowMask.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaPillar_Head_Boss.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaPlanet.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaSky.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaSoul 0.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaSoul 1.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/NovaSoul 2.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaAlchemistCloud.cs (94%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaAlchemistCloud.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaAlchemistProjectile.cs (99%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaAlchemistProjectile.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaBlast.cs (93%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaBlast.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaBottle.cs (97%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaBottle.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaBurst.cs (93%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaBurst.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaCauldron.cs (99%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaCauldron.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaCauldron_Fire.cs (98%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaCauldron_Fire.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlask_Proj.cs (99%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlask_Proj.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlask_ProjBall.cs (99%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlask_ProjBall.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlask_ProjFire.cs (98%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlask_ProjFire.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlierProj.cs (96%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaFlierProj.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaSkull.cs (96%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaSkull.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaSkullburst.cs (93%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Projectiles/NovaSkullburst.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Tiles/NovaBlock.cs (95%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Tiles/NovaBlock.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Tiles/NovaMonolithTile.cs (90%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Tiles/NovaMonolithTile.png (100%) rename {NovaPillar => NPCs/Bosses/NovaPillar}/Tiles/NovaMonolithTile_Glowmask.png (100%) diff --git a/Changelogs/v1.3.2.5.txt b/Changelogs/v1.3.2.5.txt index e98cebd1..9d16f123 100644 --- a/Changelogs/v1.3.2.5.txt +++ b/Changelogs/v1.3.2.5.txt @@ -5,6 +5,7 @@ Note: Bosses: - Fixed Paradox Titan (Titan Soul) and Wall of Shadows not registering as kill +- Fixed bosses being seen as defeated for new worlds Worldgen: - Removed many (read: at least a dozen) redundant loops iterating world chests (should speed up WorldGen) @@ -18,5 +19,8 @@ WorldGen Chests: - Fixed Ruin Chest generation and having content replaced - Fixed Ice Chest generation and having content replaced +Other: +- Fixed silently Caught Exception: Index was outside the bounds of the array. at Tremor.NPCs.Bosses.CogLord.CogLordProbe.AI() + Code: - Flags hideCode, hideResources and includeSource are no longer blocking unpacking. Unpack now to get the Tremor.dll \ No newline at end of file diff --git a/NPCs/AndasBoss/Andas.cs b/NPCs/Bosses/AndasBoss/Andas.cs similarity index 99% rename from NPCs/AndasBoss/Andas.cs rename to NPCs/Bosses/AndasBoss/Andas.cs index c7c14a59..b743316b 100644 --- a/NPCs/AndasBoss/Andas.cs +++ b/NPCs/Bosses/AndasBoss/Andas.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { [AutoloadBossHead] public class Andas : ModNPC @@ -48,6 +48,8 @@ public override void SetDefaults() const float Acceleration = 0.1f; int Timer; #endregion + + //@todo public override void AI() { npc.TargetClosest(true); diff --git a/NPCs/AndasBoss/Andas.png b/NPCs/Bosses/AndasBoss/Andas.png similarity index 100% rename from NPCs/AndasBoss/Andas.png rename to NPCs/Bosses/AndasBoss/Andas.png diff --git a/NPCs/AndasBoss/Andas_Head_Boss.png b/NPCs/Bosses/AndasBoss/Andas_Head_Boss.png similarity index 100% rename from NPCs/AndasBoss/Andas_Head_Boss.png rename to NPCs/Bosses/AndasBoss/Andas_Head_Boss.png diff --git a/NPCs/AndasBoss/InfernoSkull.cs b/NPCs/Bosses/AndasBoss/InfernoSkull.cs similarity index 98% rename from NPCs/AndasBoss/InfernoSkull.cs rename to NPCs/Bosses/AndasBoss/InfernoSkull.cs index c8d83091..b5294988 100644 --- a/NPCs/AndasBoss/InfernoSkull.cs +++ b/NPCs/Bosses/AndasBoss/InfernoSkull.cs @@ -4,7 +4,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { public class InfernoSkull : ModProjectile { diff --git a/NPCs/AndasBoss/InfernoSkull.png b/NPCs/Bosses/AndasBoss/InfernoSkull.png similarity index 100% rename from NPCs/AndasBoss/InfernoSkull.png rename to NPCs/Bosses/AndasBoss/InfernoSkull.png diff --git a/NPCs/AndasBoss/MoltenSpirit.cs b/NPCs/Bosses/AndasBoss/MoltenSpirit.cs similarity index 99% rename from NPCs/AndasBoss/MoltenSpirit.cs rename to NPCs/Bosses/AndasBoss/MoltenSpirit.cs index d80a01ef..51b8725c 100644 --- a/NPCs/AndasBoss/MoltenSpirit.cs +++ b/NPCs/Bosses/AndasBoss/MoltenSpirit.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { public class MoltenSpirit : ModNPC { diff --git a/NPCs/AndasBoss/MoltenSpirit.png b/NPCs/Bosses/AndasBoss/MoltenSpirit.png similarity index 100% rename from NPCs/AndasBoss/MoltenSpirit.png rename to NPCs/Bosses/AndasBoss/MoltenSpirit.png diff --git a/NPCs/AndasBoss/SpiritFire.cs b/NPCs/Bosses/AndasBoss/SpiritFire.cs similarity index 98% rename from NPCs/AndasBoss/SpiritFire.cs rename to NPCs/Bosses/AndasBoss/SpiritFire.cs index 76a979e2..1d7acfeb 100644 --- a/NPCs/AndasBoss/SpiritFire.cs +++ b/NPCs/Bosses/AndasBoss/SpiritFire.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { public class SpiritFire : ModProjectile { diff --git a/NPCs/AndasBoss/SpiritFire.png b/NPCs/Bosses/AndasBoss/SpiritFire.png similarity index 100% rename from NPCs/AndasBoss/SpiritFire.png rename to NPCs/Bosses/AndasBoss/SpiritFire.png diff --git a/NPCs/AndasBoss/TrueAndas.cs b/NPCs/Bosses/AndasBoss/TrueAndas.cs similarity index 99% rename from NPCs/AndasBoss/TrueAndas.cs rename to NPCs/Bosses/AndasBoss/TrueAndas.cs index 832cdd10..9ea77e4d 100644 --- a/NPCs/AndasBoss/TrueAndas.cs +++ b/NPCs/Bosses/AndasBoss/TrueAndas.cs @@ -5,12 +5,11 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { [AutoloadBossHead] public class TrueAndas : ModNPC { - public override void SetStaticDefaults() { DisplayName.SetDefault("True Andas"); @@ -48,6 +47,8 @@ public override void SetDefaults() const float Acceleration = 0.15f; int Timer; #endregion + + //@todo public override void AI() { npc.TargetClosest(true); diff --git a/NPCs/AndasBoss/TrueAndas.png b/NPCs/Bosses/AndasBoss/TrueAndas.png similarity index 100% rename from NPCs/AndasBoss/TrueAndas.png rename to NPCs/Bosses/AndasBoss/TrueAndas.png diff --git a/NPCs/AndasBoss/TrueAndas_Head_Boss.png b/NPCs/Bosses/AndasBoss/TrueAndas_Head_Boss.png similarity index 100% rename from NPCs/AndasBoss/TrueAndas_Head_Boss.png rename to NPCs/Bosses/AndasBoss/TrueAndas_Head_Boss.png diff --git a/NPCs/AndasBoss/UndeadWyrmBody.cs b/NPCs/Bosses/AndasBoss/UndeadWyrmBody.cs similarity index 97% rename from NPCs/AndasBoss/UndeadWyrmBody.cs rename to NPCs/Bosses/AndasBoss/UndeadWyrmBody.cs index 17e63014..79211fe1 100644 --- a/NPCs/AndasBoss/UndeadWyrmBody.cs +++ b/NPCs/Bosses/AndasBoss/UndeadWyrmBody.cs @@ -4,15 +4,15 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { public class UndeadWyrmBody : ModNPC { - public override void SetStaticDefaults() { DisplayName.SetDefault("Undead Wyrm"); } + public override void SetDefaults() { npc.lifeMax = 1; @@ -31,6 +31,7 @@ public override void SetDefaults() npc.buffImmune[67] = true; npc.lavaImmune = true; } + public override void AI() { if (!Main.npc[(int)npc.ai[1]].active) @@ -41,14 +42,17 @@ public override void AI() npc.active = false; } } + public override bool CheckActive() { return false; } + public override bool? DrawHealthBar(byte hbPosition, ref float scale, ref Vector2 position) { return false; } + public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D drawTexture = Main.npcTexture[npc.type]; diff --git a/NPCs/AndasBoss/UndeadWyrmBody.png b/NPCs/Bosses/AndasBoss/UndeadWyrmBody.png similarity index 100% rename from NPCs/AndasBoss/UndeadWyrmBody.png rename to NPCs/Bosses/AndasBoss/UndeadWyrmBody.png diff --git a/NPCs/AndasBoss/UndeadWyrmHead.cs b/NPCs/Bosses/AndasBoss/UndeadWyrmHead.cs similarity index 98% rename from NPCs/AndasBoss/UndeadWyrmHead.cs rename to NPCs/Bosses/AndasBoss/UndeadWyrmHead.cs index 87d9b96d..b7ee51bc 100644 --- a/NPCs/AndasBoss/UndeadWyrmHead.cs +++ b/NPCs/Bosses/AndasBoss/UndeadWyrmHead.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { public class UndeadWyrmHead : ModNPC { @@ -89,6 +89,7 @@ public override void AI() npc.netUpdate = true; } } + public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D drawTexture = Main.npcTexture[npc.type]; diff --git a/NPCs/AndasBoss/UndeadWyrmHead.png b/NPCs/Bosses/AndasBoss/UndeadWyrmHead.png similarity index 100% rename from NPCs/AndasBoss/UndeadWyrmHead.png rename to NPCs/Bosses/AndasBoss/UndeadWyrmHead.png diff --git a/NPCs/AndasBoss/UndeadWyrmTail.cs b/NPCs/Bosses/AndasBoss/UndeadWyrmTail.cs similarity index 97% rename from NPCs/AndasBoss/UndeadWyrmTail.cs rename to NPCs/Bosses/AndasBoss/UndeadWyrmTail.cs index 48ffec98..553a9024 100644 --- a/NPCs/AndasBoss/UndeadWyrmTail.cs +++ b/NPCs/Bosses/AndasBoss/UndeadWyrmTail.cs @@ -4,11 +4,10 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NPCs.AndasBoss +namespace Tremor.NPCs.Bosses.AndasBoss { public class UndeadWyrmTail : ModNPC { - public override void SetStaticDefaults() { DisplayName.SetDefault("Undead Wyrm"); @@ -32,10 +31,12 @@ public override void SetDefaults() npc.buffImmune[67] = true; npc.lavaImmune = true; } + public override bool? DrawHealthBar(byte hbPosition, ref float scale, ref Vector2 position) { return false; } + public override void AI() { if (!Main.npc[(int)npc.ai[1]].active) @@ -45,6 +46,7 @@ public override void AI() npc.active = false; } } + public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D drawTexture = Main.npcTexture[npc.type]; diff --git a/NPCs/AndasBoss/UndeadWyrmTail.png b/NPCs/Bosses/AndasBoss/UndeadWyrmTail.png similarity index 100% rename from NPCs/AndasBoss/UndeadWyrmTail.png rename to NPCs/Bosses/AndasBoss/UndeadWyrmTail.png diff --git a/CogLord/NPCs/CogLord.cs b/NPCs/Bosses/CogLord/CogLord.cs similarity index 98% rename from CogLord/NPCs/CogLord.cs rename to NPCs/Bosses/CogLord/CogLord.cs index 67646f93..c49b5e96 100644 --- a/CogLord/NPCs/CogLord.cs +++ b/NPCs/Bosses/CogLord/CogLord.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { // todo: redo [AutoloadBossHead] @@ -83,7 +83,7 @@ public override void ScaleExpertStats(int numPlayers, float bossLifeScale) public override bool PreDraw(SpriteBatch spriteBatch, Color drawColor) { - spriteBatch.Draw(mod.GetTexture("CogLord/NPCs/CogLordBody"), npc.Center - Main.screenPosition, null, Color.White, 0f, new Vector2(44, -18), 1f, SpriteEffects.None, 0f); + spriteBatch.Draw(mod.GetTexture("NPCs/Bosses/CogLord/CogLordBody"), npc.Center - Main.screenPosition, null, Color.White, 0f, new Vector2(44, -18), 1f, SpriteEffects.None, 0f); Texture2D drawTexture = Main.npcTexture[npc.type]; Vector2 origin = new Vector2((drawTexture.Width / 2) * 0.5F, (drawTexture.Height / Main.npcFrameCount[npc.type]) * 0.5F); Vector2 drawPos = new Vector2( diff --git a/CogLord/NPCs/CogLord.png b/NPCs/Bosses/CogLord/CogLord.png similarity index 100% rename from CogLord/NPCs/CogLord.png rename to NPCs/Bosses/CogLord/CogLord.png diff --git a/CogLord/NPCs/CogLordArm.cs b/NPCs/Bosses/CogLord/CogLordArm.cs similarity index 98% rename from CogLord/NPCs/CogLordArm.cs rename to NPCs/Bosses/CogLord/CogLordArm.cs index db3915d1..0bfe9507 100644 --- a/CogLord/NPCs/CogLordArm.cs +++ b/NPCs/Bosses/CogLord/CogLordArm.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { public class CogLordArm : ModNPC { diff --git a/CogLord/NPCs/CogLordArm.png b/NPCs/Bosses/CogLord/CogLordArm.png similarity index 100% rename from CogLord/NPCs/CogLordArm.png rename to NPCs/Bosses/CogLord/CogLordArm.png diff --git a/CogLord/NPCs/CogLordArmSecond.cs b/NPCs/Bosses/CogLord/CogLordArmSecond.cs similarity index 98% rename from CogLord/NPCs/CogLordArmSecond.cs rename to NPCs/Bosses/CogLord/CogLordArmSecond.cs index 7a739adf..8cfe7721 100644 --- a/CogLord/NPCs/CogLordArmSecond.cs +++ b/NPCs/Bosses/CogLord/CogLordArmSecond.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { public class CogLordArmSecond : ModNPC { diff --git a/CogLord/NPCs/CogLordArmSecond.png b/NPCs/Bosses/CogLord/CogLordArmSecond.png similarity index 100% rename from CogLord/NPCs/CogLordArmSecond.png rename to NPCs/Bosses/CogLord/CogLordArmSecond.png diff --git a/CogLord/NPCs/CogLordBody.png b/NPCs/Bosses/CogLord/CogLordBody.png similarity index 100% rename from CogLord/NPCs/CogLordBody.png rename to NPCs/Bosses/CogLord/CogLordBody.png diff --git a/CogLord/NPCs/CogLordCog.cs b/NPCs/Bosses/CogLord/CogLordCog.cs similarity index 94% rename from CogLord/NPCs/CogLordCog.cs rename to NPCs/Bosses/CogLord/CogLordCog.cs index 1176075b..1ef88fe7 100644 --- a/CogLord/NPCs/CogLordCog.cs +++ b/NPCs/Bosses/CogLord/CogLordCog.cs @@ -1,10 +1,9 @@ -using Terraria; +using Microsoft.Xna.Framework; +using Terraria; using Terraria.ID; using Terraria.ModLoader; -using Microsoft.Xna.Framework; - -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { public class CogLordCog : ModNPC { diff --git a/CogLord/NPCs/CogLordCog.png b/NPCs/Bosses/CogLord/CogLordCog.png similarity index 100% rename from CogLord/NPCs/CogLordCog.png rename to NPCs/Bosses/CogLord/CogLordCog.png diff --git a/CogLord/NPCs/CogLordGun.cs b/NPCs/Bosses/CogLord/CogLordGun.cs similarity index 98% rename from CogLord/NPCs/CogLordGun.cs rename to NPCs/Bosses/CogLord/CogLordGun.cs index 2440bde9..2e8f56ac 100644 --- a/CogLord/NPCs/CogLordGun.cs +++ b/NPCs/Bosses/CogLord/CogLordGun.cs @@ -1,11 +1,10 @@ - -using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Terraria; using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { /* * npc.ai[0] = Index of the Cog Lord boss in the Main.npc array. diff --git a/CogLord/NPCs/CogLordGun.png b/NPCs/Bosses/CogLord/CogLordGun.png similarity index 100% rename from CogLord/NPCs/CogLordGun.png rename to NPCs/Bosses/CogLord/CogLordGun.png diff --git a/CogLord/NPCs/CogLordHand.cs b/NPCs/Bosses/CogLord/CogLordHand.cs similarity index 97% rename from CogLord/NPCs/CogLordHand.cs rename to NPCs/Bosses/CogLord/CogLordHand.cs index b9bc56bc..37121de9 100644 --- a/CogLord/NPCs/CogLordHand.cs +++ b/NPCs/Bosses/CogLord/CogLordHand.cs @@ -1,10 +1,10 @@ -using Terraria; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using Terraria; using Terraria.ID; using Terraria.ModLoader; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { /* * npc.ai[0] = Index of the Cog Lord boss in the Main.npc array. diff --git a/CogLord/NPCs/CogLordHand.png b/NPCs/Bosses/CogLord/CogLordHand.png similarity index 100% rename from CogLord/NPCs/CogLordHand.png rename to NPCs/Bosses/CogLord/CogLordHand.png diff --git a/CogLord/NPCs/CogLordProbe.cs b/NPCs/Bosses/CogLord/CogLordProbe.cs similarity index 94% rename from CogLord/NPCs/CogLordProbe.cs rename to NPCs/Bosses/CogLord/CogLordProbe.cs index aeb5384c..84e49ed8 100644 --- a/CogLord/NPCs/CogLordProbe.cs +++ b/NPCs/Bosses/CogLord/CogLordProbe.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { public class CogLordProbe : ModNPC { @@ -34,6 +34,12 @@ public override void SetDefaults() public override void AI() { + if (!NPC.AnyNPCs(mod.NPCType("CogLord"))) + { + npc.active = false; + return; + } + npc.position += npc.velocity * 1.7f; npc.rotation = Helper.rotateBetween2Points(npc.Center, Main.npc[(int)npc.ai[0]].Center); while (npc.Distance(Main.npc[(int)npc.ai[0]].position) > 1000) diff --git a/CogLord/NPCs/CogLordProbe.png b/NPCs/Bosses/CogLord/CogLordProbe.png similarity index 100% rename from CogLord/NPCs/CogLordProbe.png rename to NPCs/Bosses/CogLord/CogLordProbe.png diff --git a/CogLord/NPCs/CogLord_Head_Boss.png b/NPCs/Bosses/CogLord/CogLord_Head_Boss.png similarity index 100% rename from CogLord/NPCs/CogLord_Head_Boss.png rename to NPCs/Bosses/CogLord/CogLord_Head_Boss.png diff --git a/CogLord/NPCs/GogLordGog.cs b/NPCs/Bosses/CogLord/GogLordGog.cs similarity index 97% rename from CogLord/NPCs/GogLordGog.cs rename to NPCs/Bosses/CogLord/GogLordGog.cs index d6b59b12..c75213f2 100644 --- a/CogLord/NPCs/GogLordGog.cs +++ b/NPCs/Bosses/CogLord/GogLordGog.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.CogLord.NPCs +namespace Tremor.NPCs.Bosses.CogLord { public class GogLordGog : ModNPC { diff --git a/CogLord/NPCs/GogLordGog.png b/NPCs/Bosses/CogLord/GogLordGog.png similarity index 100% rename from CogLord/NPCs/GogLordGog.png rename to NPCs/Bosses/CogLord/GogLordGog.png diff --git a/Items/CogLordBag.cs b/NPCs/Bosses/CogLord/Items/CogLordBag.cs similarity index 96% rename from Items/CogLordBag.cs rename to NPCs/Bosses/CogLord/Items/CogLordBag.cs index 1a8277b0..8924517f 100644 --- a/Items/CogLordBag.cs +++ b/NPCs/Bosses/CogLord/Items/CogLordBag.cs @@ -1,13 +1,12 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.CogLord.Items { public class CogLordBag : ModItem { public override void SetDefaults() { - item.maxStack = 999; item.consumable = true; item.width = 24; diff --git a/Items/CogLordBag.png b/NPCs/Bosses/CogLord/Items/CogLordBag.png similarity index 100% rename from Items/CogLordBag.png rename to NPCs/Bosses/CogLord/Items/CogLordBag.png diff --git a/Items/CogLordMask.cs b/NPCs/Bosses/CogLord/Items/CogLordMask.cs similarity index 89% rename from Items/CogLordMask.cs rename to NPCs/Bosses/CogLord/Items/CogLordMask.cs index dc1122c6..84b36719 100644 --- a/Items/CogLordMask.cs +++ b/NPCs/Bosses/CogLord/Items/CogLordMask.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.CogLord.Items { [AutoloadEquip(EquipType.Head)] public class CogLordMask : ModItem diff --git a/Items/CogLordMask.png b/NPCs/Bosses/CogLord/Items/CogLordMask.png similarity index 100% rename from Items/CogLordMask.png rename to NPCs/Bosses/CogLord/Items/CogLordMask.png diff --git a/Items/CogLordMask_Head.png b/NPCs/Bosses/CogLord/Items/CogLordMask_Head.png similarity index 100% rename from Items/CogLordMask_Head.png rename to NPCs/Bosses/CogLord/Items/CogLordMask_Head.png diff --git a/Items/CogLordMusicBox.cs b/NPCs/Bosses/CogLord/Items/CogLordMusicBox.cs similarity index 92% rename from Items/CogLordMusicBox.cs rename to NPCs/Bosses/CogLord/Items/CogLordMusicBox.cs index 6828f694..a2172bcc 100644 --- a/Items/CogLordMusicBox.cs +++ b/NPCs/Bosses/CogLord/Items/CogLordMusicBox.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.CogLord.Items { public class CogLordMusicBox : ModItem { diff --git a/Items/CogLordMusicBox.png b/NPCs/Bosses/CogLord/Items/CogLordMusicBox.png similarity index 100% rename from Items/CogLordMusicBox.png rename to NPCs/Bosses/CogLord/Items/CogLordMusicBox.png diff --git a/Items/CogLordTrophy.cs b/NPCs/Bosses/CogLord/Items/CogLordTrophy.cs similarity index 92% rename from Items/CogLordTrophy.cs rename to NPCs/Bosses/CogLord/Items/CogLordTrophy.cs index 4dd998d7..fb740573 100644 --- a/Items/CogLordTrophy.cs +++ b/NPCs/Bosses/CogLord/Items/CogLordTrophy.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.CogLord.Items { public class CogLordTrophy : ModItem { diff --git a/Items/CogLordTrophy.png b/NPCs/Bosses/CogLord/Items/CogLordTrophy.png similarity index 100% rename from Items/CogLordTrophy.png rename to NPCs/Bosses/CogLord/Items/CogLordTrophy.png diff --git a/NPCs/Clamper.cs b/NPCs/Bosses/Motherboard/Clamper.cs similarity index 98% rename from NPCs/Clamper.cs rename to NPCs/Bosses/Motherboard/Clamper.cs index 471f805a..20b23d81 100644 --- a/NPCs/Clamper.cs +++ b/NPCs/Bosses/Motherboard/Clamper.cs @@ -1,11 +1,10 @@ using System; +using Microsoft.Xna.Framework; using Terraria; using Terraria.ID; using Terraria.ModLoader; -using Microsoft.Xna.Framework; - -namespace Tremor.NPCs +namespace Tremor.NPCs.Bosses.Motherboard { public class Clamper : ModNPC { diff --git a/NPCs/Clamper.png b/NPCs/Bosses/Motherboard/Clamper.png similarity index 100% rename from NPCs/Clamper.png rename to NPCs/Bosses/Motherboard/Clamper.png diff --git a/NPCs/Clamper2.cs b/NPCs/Bosses/Motherboard/Clamper2.cs similarity index 88% rename from NPCs/Clamper2.cs rename to NPCs/Bosses/Motherboard/Clamper2.cs index 8f5e313d..d438f512 100644 --- a/NPCs/Clamper2.cs +++ b/NPCs/Bosses/Motherboard/Clamper2.cs @@ -1,10 +1,9 @@ -using Terraria; +using Microsoft.Xna.Framework; +using Terraria; using Terraria.ID; using Terraria.ModLoader; -using Microsoft.Xna.Framework; - -namespace Tremor.NPCs +namespace Tremor.NPCs.Bosses.Motherboard { public class Clamper2 : ModNPC { diff --git a/NPCs/Clamper2.png b/NPCs/Bosses/Motherboard/Clamper2.png similarity index 100% rename from NPCs/Clamper2.png rename to NPCs/Bosses/Motherboard/Clamper2.png diff --git a/Items/MechanicalBrain.cs b/NPCs/Bosses/Motherboard/Items/MechanicalBrain.cs similarity index 74% rename from Items/MechanicalBrain.cs rename to NPCs/Bosses/Motherboard/Items/MechanicalBrain.cs index 205a0adb..af6584e0 100644 --- a/Items/MechanicalBrain.cs +++ b/NPCs/Bosses/Motherboard/Items/MechanicalBrain.cs @@ -2,18 +2,12 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.Motherboard.Items { - public class MechanicalBrain : ModItem { - - const int XOffset = 0; - const int YOffset = -200; - public override void SetDefaults() { - item.width = 20; item.height = 18; item.maxStack = 20; @@ -28,7 +22,7 @@ public override void SetDefaults() public override void SetStaticDefaults() { DisplayName.SetDefault("Mechanical Brain"); - Tooltip.SetDefault("Summons the Motherboard"); + Tooltip.SetDefault("Summons the Motherboard\nRequires hardmode and night time"); } public override bool CanUseItem(Player player) @@ -49,14 +43,7 @@ public override void AddRecipes() recipe.AddIngredient(ItemID.Vertebrae, 6); recipe.AddIngredient(ItemID.IronBar, 6); recipe.AddIngredient(ItemID.SoulofNight, 6); - recipe.AddTile(134); - recipe.SetResult(this); - recipe.AddRecipe(); - - recipe = new ModRecipe(mod); - recipe.AddIngredient(ItemID.Vertebrae, 6); - recipe.AddIngredient(ItemID.LeadBar, 6); - recipe.AddIngredient(ItemID.SoulofNight, 6); + recipe.anyIronBar = true; recipe.AddTile(134); recipe.SetResult(this); recipe.AddRecipe(); diff --git a/Items/MechanicalBrain.png b/NPCs/Bosses/Motherboard/Items/MechanicalBrain.png similarity index 100% rename from Items/MechanicalBrain.png rename to NPCs/Bosses/Motherboard/Items/MechanicalBrain.png diff --git a/Items/Motherboard.cs b/NPCs/Bosses/Motherboard/Items/Motherboard.cs similarity index 92% rename from Items/Motherboard.cs rename to NPCs/Bosses/Motherboard/Items/Motherboard.cs index 8ea8b434..c5f27b4a 100644 --- a/Items/Motherboard.cs +++ b/NPCs/Bosses/Motherboard/Items/Motherboard.cs @@ -3,13 +3,12 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.Motherboard.Items { public class Motherboard : ModItem { public override void SetDefaults() { - item.width = 38; item.height = 38; item.maxStack = 20; @@ -24,7 +23,7 @@ public override void SetDefaults() public override void SetStaticDefaults() { DisplayName.SetDefault("Motherboard"); - Tooltip.SetDefault("Summon bosses"); + Tooltip.SetDefault("You shouldn't have this"); } public override bool UseItem(Player player) diff --git a/Items/Motherboard.png b/NPCs/Bosses/Motherboard/Items/Motherboard.png similarity index 100% rename from Items/Motherboard.png rename to NPCs/Bosses/Motherboard/Items/Motherboard.png diff --git a/Items/MotherboardBag.cs b/NPCs/Bosses/Motherboard/Items/MotherboardBag.cs similarity index 86% rename from Items/MotherboardBag.cs rename to NPCs/Bosses/Motherboard/Items/MotherboardBag.cs index 0c5feeab..2847c58d 100644 --- a/Items/MotherboardBag.cs +++ b/NPCs/Bosses/Motherboard/Items/MotherboardBag.cs @@ -1,8 +1,9 @@ using Terraria; using Terraria.ID; using Terraria.ModLoader; +using Tremor.Items; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.Motherboard.Items { public class MotherboardBag : ModItem { @@ -15,7 +16,7 @@ public override void SetDefaults() item.rare = 9; item.expert = true; - bossBagNPC = mod.NPCType(); + bossBagNPC = mod.NPCType(); } public override void SetStaticDefaults() diff --git a/Items/MotherboardBag.png b/NPCs/Bosses/Motherboard/Items/MotherboardBag.png similarity index 100% rename from Items/MotherboardBag.png rename to NPCs/Bosses/Motherboard/Items/MotherboardBag.png diff --git a/Items/MotherboardMask.cs b/NPCs/Bosses/Motherboard/Items/MotherboardMask.cs similarity index 88% rename from Items/MotherboardMask.cs rename to NPCs/Bosses/Motherboard/Items/MotherboardMask.cs index a57d8803..8cb64e89 100644 --- a/Items/MotherboardMask.cs +++ b/NPCs/Bosses/Motherboard/Items/MotherboardMask.cs @@ -1,14 +1,12 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.Motherboard.Items { [AutoloadEquip(EquipType.Head)] public class MotherboardMask : ModItem { - public override void SetDefaults() { - item.width = 32; item.height = 28; item.rare = 1; @@ -20,6 +18,5 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Motherboard Mask"); Tooltip.SetDefault(""); } - } } diff --git a/Items/MotherboardMask.png b/NPCs/Bosses/Motherboard/Items/MotherboardMask.png similarity index 100% rename from Items/MotherboardMask.png rename to NPCs/Bosses/Motherboard/Items/MotherboardMask.png diff --git a/Items/MotherboardMask_Head.png b/NPCs/Bosses/Motherboard/Items/MotherboardMask_Head.png similarity index 100% rename from Items/MotherboardMask_Head.png rename to NPCs/Bosses/Motherboard/Items/MotherboardMask_Head.png diff --git a/Items/MotherboardTrophy.cs b/NPCs/Bosses/Motherboard/Items/MotherboardTrophy.cs similarity index 92% rename from Items/MotherboardTrophy.cs rename to NPCs/Bosses/Motherboard/Items/MotherboardTrophy.cs index 648eca0a..353de92a 100644 --- a/Items/MotherboardTrophy.cs +++ b/NPCs/Bosses/Motherboard/Items/MotherboardTrophy.cs @@ -1,12 +1,11 @@ using Terraria.ModLoader; -namespace Tremor.Items +namespace Tremor.NPCs.Bosses.Motherboard.Items { public class MotherboardTrophy : ModItem { public override void SetDefaults() { - item.width = 32; item.height = 32; item.maxStack = 99; @@ -26,6 +25,5 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Motherboard Trophy"); Tooltip.SetDefault(""); } - } } diff --git a/Items/MotherboardTrophy.png b/NPCs/Bosses/Motherboard/Items/MotherboardTrophy.png similarity index 100% rename from Items/MotherboardTrophy.png rename to NPCs/Bosses/Motherboard/Items/MotherboardTrophy.png diff --git a/NPCs/Motherboard.cs b/NPCs/Bosses/Motherboard/Motherboard.cs similarity index 97% rename from NPCs/Motherboard.cs rename to NPCs/Bosses/Motherboard/Motherboard.cs index be9682b2..66998bf8 100644 --- a/NPCs/Motherboard.cs +++ b/NPCs/Bosses/Motherboard/Motherboard.cs @@ -1,23 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using System.IO; -using System.Reflection; using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Audio; -using Microsoft.Xna.Framework.Content; using Terraria; using Terraria.Audio; -using Terraria.GameContent; using Terraria.ID; using Terraria.ModLoader; using Tremor.Items; +using Tremor.NPCs.Bosses.Motherboard.Items; -// TODO: fix Motherboard despawn on first hit -// TODO: motherboard does not spawn in MP -// TODO: rewrite this thing, lol - -namespace Tremor.NPCs +namespace Tremor.NPCs.Bosses.Motherboard { // has two stages // some other bosses do @@ -174,8 +166,8 @@ private void ShootOneSecondShot(Motherboard boss) // Calculate velocity DIRECTION float targetAngle = boss.npc.AngleTo(target.Center); - Vector2 velocity = new Vector2((float) Math.Cos(targetAngle), (float) Math.Sin(targetAngle)) * SecondShootSpeed; - velocity += new Vector2(Main.rand.Next(-(int)SecondShootSpeed/2, (int)SecondShootSpeed/2 + 1) * SecondShootSpreadMult); + Vector2 velocity = new Vector2((float)Math.Cos(targetAngle), (float)Math.Sin(targetAngle)) * SecondShootSpeed; + velocity += new Vector2(Main.rand.Next(-(int)SecondShootSpeed / 2, (int)SecondShootSpeed / 2 + 1) * SecondShootSpreadMult); // Shoot proj Projectile.NewProjectile(boss.npc.Center.X, boss.npc.Center.Y, velocity.X, velocity.Y, ProjectileID.ShadowBeamHostile, SecondShootDamage, SecondShootKn); @@ -223,7 +215,7 @@ public override void Start(Motherboard boss) public override void AdjustHead(Motherboard boss) { - Main.npcHeadBossTexture[boss.headTexture] = boss.mod.GetTexture("NPCs/Motherboard_Head_Boss"); + Main.npcHeadBossTexture[boss.headTexture] = boss.mod.GetTexture("NPCs/Bosses/Motherboard/Motherboard_Head_Boss"); } public override void AI(Motherboard boss) @@ -270,7 +262,7 @@ public Stage2(int followPlayerTime, int disappearingTime, int appearingTime) : b public override void AdjustHead(Motherboard boss) { - Main.npcHeadBossTexture[boss.headTexture] = boss.mod.GetTexture("NPCs/Motherboard_Head_Boss"); + Main.npcHeadBossTexture[boss.headTexture] = boss.mod.GetTexture("NPCs/Bosses/Motherboard/Motherboard_Head_Boss"); } public override void Start(Motherboard boss) diff --git a/NPCs/Motherboard.png b/NPCs/Bosses/Motherboard/Motherboard.png similarity index 100% rename from NPCs/Motherboard.png rename to NPCs/Bosses/Motherboard/Motherboard.png diff --git a/NPCs/Motherboard_Head_Boss.png b/NPCs/Bosses/Motherboard/Motherboard_Head_Boss.png similarity index 100% rename from NPCs/Motherboard_Head_Boss.png rename to NPCs/Bosses/Motherboard/Motherboard_Head_Boss.png diff --git a/NPCs/Motherboard_Head_Boss2.png b/NPCs/Bosses/Motherboard/Motherboard_Head_Boss2.png similarity index 100% rename from NPCs/Motherboard_Head_Boss2.png rename to NPCs/Bosses/Motherboard/Motherboard_Head_Boss2.png diff --git a/NPCs/SignalDrone.cs b/NPCs/Bosses/Motherboard/SignalDrone.cs similarity index 99% rename from NPCs/SignalDrone.cs rename to NPCs/Bosses/Motherboard/SignalDrone.cs index b5dd1501..f82d2da8 100644 --- a/NPCs/SignalDrone.cs +++ b/NPCs/Bosses/Motherboard/SignalDrone.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NPCs +namespace Tremor.NPCs.Bosses.Motherboard { public class SignalDrone : ModNPC { diff --git a/NPCs/SignalDrone.png b/NPCs/Bosses/Motherboard/SignalDrone.png similarity index 100% rename from NPCs/SignalDrone.png rename to NPCs/Bosses/Motherboard/SignalDrone.png diff --git a/NovaPillar/Items/Accessories/NovaWings.cs b/NPCs/Bosses/NovaPillar/Items/Accessories/NovaWings.cs similarity index 96% rename from NovaPillar/Items/Accessories/NovaWings.cs rename to NPCs/Bosses/NovaPillar/Items/Accessories/NovaWings.cs index 7c5a2cec..c673b587 100644 --- a/NovaPillar/Items/Accessories/NovaWings.cs +++ b/NPCs/Bosses/NovaPillar/Items/Accessories/NovaWings.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Accessories +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Accessories { [AutoloadEquip(EquipType.Wings)] public class NovaWings : ModItem diff --git a/NovaPillar/Items/Accessories/NovaWings.png b/NPCs/Bosses/NovaPillar/Items/Accessories/NovaWings.png similarity index 100% rename from NovaPillar/Items/Accessories/NovaWings.png rename to NPCs/Bosses/NovaPillar/Items/Accessories/NovaWings.png diff --git a/NovaPillar/Items/Accessories/NovaWings_Wings.png b/NPCs/Bosses/NovaPillar/Items/Accessories/NovaWings_Wings.png similarity index 100% rename from NovaPillar/Items/Accessories/NovaWings_Wings.png rename to NPCs/Bosses/NovaPillar/Items/Accessories/NovaWings_Wings.png diff --git a/NovaPillar/Items/Armor/NovaBreastplate.cs b/NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate.cs similarity index 95% rename from NovaPillar/Items/Armor/NovaBreastplate.cs rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate.cs index 020c9c03..696d7dc2 100644 --- a/NovaPillar/Items/Armor/NovaBreastplate.cs +++ b/NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate.cs @@ -1,7 +1,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Armor +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Armor { [AutoloadEquip(EquipType.Body)] public class NovaBreastplate : ModItem diff --git a/NovaPillar/Items/Armor/NovaBreastplate.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate.png similarity index 100% rename from NovaPillar/Items/Armor/NovaBreastplate.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate.png diff --git a/NovaPillar/Items/Armor/NovaBreastplate_Arms.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate_Arms.png similarity index 100% rename from NovaPillar/Items/Armor/NovaBreastplate_Arms.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate_Arms.png diff --git a/NovaPillar/Items/Armor/NovaBreastplate_Body.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate_Body.png similarity index 100% rename from NovaPillar/Items/Armor/NovaBreastplate_Body.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate_Body.png diff --git a/NovaPillar/Items/Armor/NovaBreastplate_FemaleBody.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate_FemaleBody.png similarity index 100% rename from NovaPillar/Items/Armor/NovaBreastplate_FemaleBody.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaBreastplate_FemaleBody.png diff --git a/NovaPillar/Items/Armor/NovaHelmet.cs b/NPCs/Bosses/NovaPillar/Items/Armor/NovaHelmet.cs similarity index 97% rename from NovaPillar/Items/Armor/NovaHelmet.cs rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaHelmet.cs index 3c6a8bdd..fbbf688a 100644 --- a/NovaPillar/Items/Armor/NovaHelmet.cs +++ b/NPCs/Bosses/NovaPillar/Items/Armor/NovaHelmet.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Armor +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Armor { [AutoloadEquip(EquipType.Head)] public class NovaHelmet : ModItem diff --git a/NovaPillar/Items/Armor/NovaHelmet.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaHelmet.png similarity index 100% rename from NovaPillar/Items/Armor/NovaHelmet.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaHelmet.png diff --git a/NovaPillar/Items/Armor/NovaHelmet_Head.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaHelmet_Head.png similarity index 100% rename from NovaPillar/Items/Armor/NovaHelmet_Head.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaHelmet_Head.png diff --git a/NovaPillar/Items/Armor/NovaLeggings.cs b/NPCs/Bosses/NovaPillar/Items/Armor/NovaLeggings.cs similarity index 95% rename from NovaPillar/Items/Armor/NovaLeggings.cs rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaLeggings.cs index 734f37f8..80d47cdd 100644 --- a/NovaPillar/Items/Armor/NovaLeggings.cs +++ b/NPCs/Bosses/NovaPillar/Items/Armor/NovaLeggings.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Armor +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Armor { [AutoloadEquip(EquipType.Legs)] public class NovaLeggings : ModItem diff --git a/NovaPillar/Items/Armor/NovaLeggings.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaLeggings.png similarity index 100% rename from NovaPillar/Items/Armor/NovaLeggings.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaLeggings.png diff --git a/NovaPillar/Items/Armor/NovaLeggings_Legs.png b/NPCs/Bosses/NovaPillar/Items/Armor/NovaLeggings_Legs.png similarity index 100% rename from NovaPillar/Items/Armor/NovaLeggings_Legs.png rename to NPCs/Bosses/NovaPillar/Items/Armor/NovaLeggings_Legs.png diff --git a/NovaPillar/Items/NovaDye.cs b/NPCs/Bosses/NovaPillar/Items/NovaDye.cs similarity index 93% rename from NovaPillar/Items/NovaDye.cs rename to NPCs/Bosses/NovaPillar/Items/NovaDye.cs index 8c42d4ed..9fa40d32 100644 --- a/NovaPillar/Items/NovaDye.cs +++ b/NPCs/Bosses/NovaPillar/Items/NovaDye.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items +namespace Tremor.NPCs.Bosses.NovaPillar.Items { public class NovaDye : ModItem { diff --git a/NovaPillar/Items/NovaDye.png b/NPCs/Bosses/NovaPillar/Items/NovaDye.png similarity index 100% rename from NovaPillar/Items/NovaDye.png rename to NPCs/Bosses/NovaPillar/Items/NovaDye.png diff --git a/NovaPillar/Items/NovaFragment.cs b/NPCs/Bosses/NovaPillar/Items/NovaFragment.cs similarity index 95% rename from NovaPillar/Items/NovaFragment.cs rename to NPCs/Bosses/NovaPillar/Items/NovaFragment.cs index 228a8dda..b6ed333b 100644 --- a/NovaPillar/Items/NovaFragment.cs +++ b/NPCs/Bosses/NovaPillar/Items/NovaFragment.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items +namespace Tremor.NPCs.Bosses.NovaPillar.Items { public class NovaFragment : ModItem { diff --git a/NovaPillar/Items/NovaFragment.png b/NPCs/Bosses/NovaPillar/Items/NovaFragment.png similarity index 100% rename from NovaPillar/Items/NovaFragment.png rename to NPCs/Bosses/NovaPillar/Items/NovaFragment.png diff --git a/NovaPillar/Items/NovaFragment_Glow.png b/NPCs/Bosses/NovaPillar/Items/NovaFragment_Glow.png similarity index 100% rename from NovaPillar/Items/NovaFragment_Glow.png rename to NPCs/Bosses/NovaPillar/Items/NovaFragment_Glow.png diff --git a/NovaPillar/Items/Placeable/NovaFragmentBlock.cs b/NPCs/Bosses/NovaPillar/Items/Placeable/NovaFragmentBlock.cs similarity index 89% rename from NovaPillar/Items/Placeable/NovaFragmentBlock.cs rename to NPCs/Bosses/NovaPillar/Items/Placeable/NovaFragmentBlock.cs index 55a4ed82..96664fb1 100644 --- a/NovaPillar/Items/Placeable/NovaFragmentBlock.cs +++ b/NPCs/Bosses/NovaPillar/Items/Placeable/NovaFragmentBlock.cs @@ -1,8 +1,8 @@ using Terraria.ID; using Terraria.ModLoader; -using Tremor.NovaPillar.Tiles; +using Tremor.NPCs.Bosses.NovaPillar.Tiles; -namespace Tremor.NovaPillar.Items.Placeable +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Placeable { public class NovaFragmentBlock : ModItem { diff --git a/NovaPillar/Items/Placeable/NovaFragmentBlock.png b/NPCs/Bosses/NovaPillar/Items/Placeable/NovaFragmentBlock.png similarity index 100% rename from NovaPillar/Items/Placeable/NovaFragmentBlock.png rename to NPCs/Bosses/NovaPillar/Items/Placeable/NovaFragmentBlock.png diff --git a/NovaPillar/Items/Placeable/NovaMonolith.cs b/NPCs/Bosses/NovaPillar/Items/Placeable/NovaMonolith.cs similarity index 88% rename from NovaPillar/Items/Placeable/NovaMonolith.cs rename to NPCs/Bosses/NovaPillar/Items/Placeable/NovaMonolith.cs index 67aabab5..8a72364f 100644 --- a/NovaPillar/Items/Placeable/NovaMonolith.cs +++ b/NPCs/Bosses/NovaPillar/Items/Placeable/NovaMonolith.cs @@ -1,8 +1,8 @@ using Terraria; using Terraria.ModLoader; -using Tremor.NovaPillar.Tiles; +using Tremor.NPCs.Bosses.NovaPillar.Tiles; -namespace Tremor.NovaPillar.Items.Placeable +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Placeable { public class NovaMonolith : ModItem { diff --git a/NovaPillar/Items/Placeable/NovaMonolith.png b/NPCs/Bosses/NovaPillar/Items/Placeable/NovaMonolith.png similarity index 100% rename from NovaPillar/Items/Placeable/NovaMonolith.png rename to NPCs/Bosses/NovaPillar/Items/Placeable/NovaMonolith.png diff --git a/NovaPillar/Items/Weapons/NovaFlask.cs b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs similarity index 97% rename from NovaPillar/Items/Weapons/NovaFlask.cs rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs index 66e5a2e5..5efc7bca 100644 --- a/NovaPillar/Items/Weapons/NovaFlask.cs +++ b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.cs @@ -2,7 +2,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Weapons +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Weapons { public class NovaFlask : AlchemistItem { diff --git a/NovaPillar/Items/Weapons/NovaFlask.png b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.png similarity index 100% rename from NovaPillar/Items/Weapons/NovaFlask.png rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaFlask.png diff --git a/NovaPillar/Items/Weapons/NovaHamaxe.cs b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe.cs similarity index 84% rename from NovaPillar/Items/Weapons/NovaHamaxe.cs rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe.cs index b636b96f..4ba81b0c 100644 --- a/NovaPillar/Items/Weapons/NovaHamaxe.cs +++ b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Weapons +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Weapons { public class NovaHamaxe : ModItem { @@ -30,7 +30,7 @@ public override void SetStaticDefaults() { DisplayName.SetDefault("Nova Hamaxe"); Tooltip.SetDefault(""); - TremorGlowMask.AddGlowMask(item.type, "Tremor/NovaPillar/Items/Weapons/NovaHamaxe_Glow"); + TremorGlowMask.AddGlowMask(item.type, "Tremor/NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe_Glow"); } public override void AddRecipes() diff --git a/NovaPillar/Items/Weapons/NovaHamaxe.png b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe.png similarity index 100% rename from NovaPillar/Items/Weapons/NovaHamaxe.png rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe.png diff --git a/NovaPillar/Items/Weapons/NovaHamaxe_Glow.png b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe_Glow.png similarity index 100% rename from NovaPillar/Items/Weapons/NovaHamaxe_Glow.png rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaHamaxe_Glow.png diff --git a/NovaPillar/Items/Weapons/NovaPickaxe.cs b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe.cs similarity index 84% rename from NovaPillar/Items/Weapons/NovaPickaxe.cs rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe.cs index fa15d4eb..29d292e9 100644 --- a/NovaPillar/Items/Weapons/NovaPickaxe.cs +++ b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe.cs @@ -1,7 +1,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Weapons +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Weapons { public class NovaPickaxe : ModItem { @@ -30,7 +30,7 @@ public override void SetStaticDefaults() { DisplayName.SetDefault("Nova Pickaxe"); Tooltip.SetDefault(""); - TremorGlowMask.AddGlowMask(item.type, "Tremor/NovaPillar/Items/Weapons/NovaPickaxe_Glow"); + TremorGlowMask.AddGlowMask(item.type, "Tremor/NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe_Glow"); } public override void AddRecipes() diff --git a/NovaPillar/Items/Weapons/NovaPickaxe.png b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe.png similarity index 100% rename from NovaPillar/Items/Weapons/NovaPickaxe.png rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe.png diff --git a/NovaPillar/Items/Weapons/NovaPickaxe_Glow.png b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe_Glow.png similarity index 100% rename from NovaPillar/Items/Weapons/NovaPickaxe_Glow.png rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaPickaxe_Glow.png diff --git a/NovaPillar/Items/Weapons/NovaSprayer.cs b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs similarity index 98% rename from NovaPillar/Items/Weapons/NovaSprayer.cs rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs index 2885ba71..f234d149 100644 --- a/NovaPillar/Items/Weapons/NovaSprayer.cs +++ b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Items.Weapons +namespace Tremor.NPCs.Bosses.NovaPillar.Items.Weapons { public class NovaSprayer : AlchemistItem { diff --git a/NovaPillar/Items/Weapons/NovaSprayer.png b/NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.png similarity index 100% rename from NovaPillar/Items/Weapons/NovaSprayer.png rename to NPCs/Bosses/NovaPillar/Items/Weapons/NovaSprayer.png diff --git a/NovaPillar/NPCs/Deadling.cs b/NPCs/Bosses/NovaPillar/NPCs/Deadling.cs similarity index 97% rename from NovaPillar/NPCs/Deadling.cs rename to NPCs/Bosses/NovaPillar/NPCs/Deadling.cs index 4e172cf9..ad3b5d07 100644 --- a/NovaPillar/NPCs/Deadling.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/Deadling.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class Deadling : ModNPC { @@ -57,7 +57,7 @@ public override bool PreAI() public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Deadling_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NPCs/Deadling_GlowMask")); } public override void OnHitPlayer(Player player, int damage, bool crit) diff --git a/NovaPillar/NPCs/Deadling.png b/NPCs/Bosses/NovaPillar/NPCs/Deadling.png similarity index 100% rename from NovaPillar/NPCs/Deadling.png rename to NPCs/Bosses/NovaPillar/NPCs/Deadling.png diff --git a/NovaPillar/NPCs/Deadling_GlowMask.png b/NPCs/Bosses/NovaPillar/NPCs/Deadling_GlowMask.png similarity index 100% rename from NovaPillar/NPCs/Deadling_GlowMask.png rename to NPCs/Bosses/NovaPillar/NPCs/Deadling_GlowMask.png diff --git a/NovaPillar/NPCs/NovaAlchemist.cs b/NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist.cs similarity index 97% rename from NovaPillar/NPCs/NovaAlchemist.cs rename to NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist.cs index c2763325..a875f605 100644 --- a/NovaPillar/NPCs/NovaAlchemist.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class NovaAlchemist : ModNPC { @@ -116,7 +116,7 @@ public override void AI() public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/NovaAlchemist_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist_GlowMask")); } public void NovaAnimation() diff --git a/NovaPillar/NPCs/NovaAlchemist.png b/NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist.png similarity index 100% rename from NovaPillar/NPCs/NovaAlchemist.png rename to NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist.png diff --git a/NovaPillar/NPCs/NovaAlchemistC.cs b/NPCs/Bosses/NovaPillar/NPCs/NovaAlchemistC.cs similarity index 97% rename from NovaPillar/NPCs/NovaAlchemistC.cs rename to NPCs/Bosses/NovaPillar/NPCs/NovaAlchemistC.cs index d57de0c8..106edee9 100644 --- a/NovaPillar/NPCs/NovaAlchemistC.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/NovaAlchemistC.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class NovaAlchemistC : ModNPC diff --git a/NovaPillar/NPCs/NovaAlchemistC.png b/NPCs/Bosses/NovaPillar/NPCs/NovaAlchemistC.png similarity index 100% rename from NovaPillar/NPCs/NovaAlchemistC.png rename to NPCs/Bosses/NovaPillar/NPCs/NovaAlchemistC.png diff --git a/NovaPillar/NPCs/NovaAlchemist_GlowMask.png b/NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist_GlowMask.png similarity index 100% rename from NovaPillar/NPCs/NovaAlchemist_GlowMask.png rename to NPCs/Bosses/NovaPillar/NPCs/NovaAlchemist_GlowMask.png diff --git a/NovaPillar/NPCs/NovaBat.cs b/NPCs/Bosses/NovaPillar/NPCs/NovaBat.cs similarity index 96% rename from NovaPillar/NPCs/NovaBat.cs rename to NPCs/Bosses/NovaPillar/NPCs/NovaBat.cs index 3c002a8e..1db90b72 100644 --- a/NovaPillar/NPCs/NovaBat.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/NovaBat.cs @@ -3,7 +3,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class NovaBat : ModNPC { @@ -36,7 +36,7 @@ public override float SpawnChance(NPCSpawnInfo spawnInfo) public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/NovaBat_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NPCs/NovaBat_GlowMask")); } public override void HitEffect(int hitDirection, double damage) diff --git a/NovaPillar/NPCs/NovaBat.png b/NPCs/Bosses/NovaPillar/NPCs/NovaBat.png similarity index 100% rename from NovaPillar/NPCs/NovaBat.png rename to NPCs/Bosses/NovaPillar/NPCs/NovaBat.png diff --git a/NovaPillar/NPCs/NovaBat_GlowMask.png b/NPCs/Bosses/NovaPillar/NPCs/NovaBat_GlowMask.png similarity index 100% rename from NovaPillar/NPCs/NovaBat_GlowMask.png rename to NPCs/Bosses/NovaPillar/NPCs/NovaBat_GlowMask.png diff --git a/NovaPillar/NPCs/NovaFlier.cs b/NPCs/Bosses/NovaPillar/NPCs/NovaFlier.cs similarity index 97% rename from NovaPillar/NPCs/NovaFlier.cs rename to NPCs/Bosses/NovaPillar/NPCs/NovaFlier.cs index 3aafdc9c..03a2d871 100644 --- a/NovaPillar/NPCs/NovaFlier.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/NovaFlier.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class NovaFlier : ModNPC { @@ -73,7 +73,7 @@ public override void AI() public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/NovaFlier_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NPCs/NovaFlier_GlowMask")); } public override void HitEffect(int hitDirection, double damage) diff --git a/NovaPillar/NPCs/NovaFlier.png b/NPCs/Bosses/NovaPillar/NPCs/NovaFlier.png similarity index 100% rename from NovaPillar/NPCs/NovaFlier.png rename to NPCs/Bosses/NovaPillar/NPCs/NovaFlier.png diff --git a/NovaPillar/NPCs/NovaFlier_GlowMask.png b/NPCs/Bosses/NovaPillar/NPCs/NovaFlier_GlowMask.png similarity index 100% rename from NovaPillar/NPCs/NovaFlier_GlowMask.png rename to NPCs/Bosses/NovaPillar/NPCs/NovaFlier_GlowMask.png diff --git a/NovaPillar/NPCs/Varki.cs b/NPCs/Bosses/NovaPillar/NPCs/Varki.cs similarity index 97% rename from NovaPillar/NPCs/Varki.cs rename to NPCs/Bosses/NovaPillar/NPCs/Varki.cs index 51b00fb6..a431d817 100644 --- a/NovaPillar/NPCs/Varki.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/Varki.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class Varki : ModNPC { @@ -60,7 +60,7 @@ public override void AI() public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Varki_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NPCs/Varki_GlowMask")); } public override void HitEffect(int hitDirection, double damage) diff --git a/NovaPillar/NPCs/Varki.png b/NPCs/Bosses/NovaPillar/NPCs/Varki.png similarity index 100% rename from NovaPillar/NPCs/Varki.png rename to NPCs/Bosses/NovaPillar/NPCs/Varki.png diff --git a/NovaPillar/NPCs/Varki_GlowMask.png b/NPCs/Bosses/NovaPillar/NPCs/Varki_GlowMask.png similarity index 100% rename from NovaPillar/NPCs/Varki_GlowMask.png rename to NPCs/Bosses/NovaPillar/NPCs/Varki_GlowMask.png diff --git a/NovaPillar/NPCs/Youwarkee.cs b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee.cs similarity index 98% rename from NovaPillar/NPCs/Youwarkee.cs rename to NPCs/Bosses/NovaPillar/NPCs/Youwarkee.cs index 4ffbed29..121f7be6 100644 --- a/NovaPillar/NPCs/Youwarkee.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class Youwarkee : ModNPC { @@ -110,7 +110,7 @@ public override void AI() public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Youwarkee_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NPCs/Youwarkee_GlowMask")); } public override void HitEffect(int hitDirection, double damage) diff --git a/NovaPillar/NPCs/Youwarkee.png b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee.png similarity index 100% rename from NovaPillar/NPCs/Youwarkee.png rename to NPCs/Bosses/NovaPillar/NPCs/Youwarkee.png diff --git a/NovaPillar/NPCs/Youwarkee2.cs b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee2.cs similarity index 97% rename from NovaPillar/NPCs/Youwarkee2.cs rename to NPCs/Bosses/NovaPillar/NPCs/Youwarkee2.cs index d8adc25b..6ea812fe 100644 --- a/NovaPillar/NPCs/Youwarkee2.cs +++ b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee2.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.NPCs +namespace Tremor.NPCs.Bosses.NovaPillar.NPCs { public class Youwarkee2 : ModNPC { @@ -98,7 +98,7 @@ public override void AI() public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NPCs/Youwarkee2_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NPCs/Youwarkee2_GlowMask")); } public override void HitEffect(int hitDirection, double damage) diff --git a/NovaPillar/NPCs/Youwarkee2.png b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee2.png similarity index 100% rename from NovaPillar/NPCs/Youwarkee2.png rename to NPCs/Bosses/NovaPillar/NPCs/Youwarkee2.png diff --git a/NovaPillar/NPCs/Youwarkee2_GlowMask.png b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee2_GlowMask.png similarity index 100% rename from NovaPillar/NPCs/Youwarkee2_GlowMask.png rename to NPCs/Bosses/NovaPillar/NPCs/Youwarkee2_GlowMask.png diff --git a/NovaPillar/NPCs/Youwarkee_GlowMask.png b/NPCs/Bosses/NovaPillar/NPCs/Youwarkee_GlowMask.png similarity index 100% rename from NovaPillar/NPCs/Youwarkee_GlowMask.png rename to NPCs/Bosses/NovaPillar/NPCs/Youwarkee_GlowMask.png diff --git a/NovaPillar/NovaData.cs b/NPCs/Bosses/NovaPillar/NovaData.cs similarity index 93% rename from NovaPillar/NovaData.cs rename to NPCs/Bosses/NovaPillar/NovaData.cs index 2b982524..1ccbb2a6 100644 --- a/NovaPillar/NovaData.cs +++ b/NPCs/Bosses/NovaPillar/NovaData.cs @@ -1,8 +1,7 @@ using Terraria; using Terraria.Graphics.Shaders; -using Terraria.ModLoader; -namespace Tremor.NovaPillar +namespace Tremor.NPCs.Bosses.NovaPillar { public class NovaData : ScreenShaderData { diff --git a/NovaPillar/NovaHandler.cs b/NPCs/Bosses/NovaPillar/NovaHandler.cs similarity index 99% rename from NovaPillar/NovaHandler.cs rename to NPCs/Bosses/NovaPillar/NovaHandler.cs index 5a9c63ae..1d43a8fd 100644 --- a/NovaPillar/NovaHandler.cs +++ b/NPCs/Bosses/NovaPillar/NovaHandler.cs @@ -6,7 +6,7 @@ using Terraria.ModLoader.IO; using Terraria.UI.Chat; -namespace Tremor.NovaPillar +namespace Tremor.NPCs.Bosses.NovaPillar { public class NovaHandler : ModWorld { diff --git a/NovaPillar/NovaPillar.cs b/NPCs/Bosses/NovaPillar/NovaPillar.cs similarity index 99% rename from NovaPillar/NovaPillar.cs rename to NPCs/Bosses/NovaPillar/NovaPillar.cs index 3e44c2b6..1540d436 100644 --- a/NovaPillar/NovaPillar.cs +++ b/NPCs/Bosses/NovaPillar/NovaPillar.cs @@ -9,7 +9,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar +namespace Tremor.NPCs.Bosses.NovaPillar { [AutoloadBossHead] public class NovaPillar : ModNPC @@ -228,7 +228,7 @@ public override bool PreDraw(SpriteBatch spriteBatch, Color drawColor) public override void PostDraw(SpriteBatch spriteBatch, Color drawColor) { - TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NovaPillar/NovaPillar_GlowMask")); + TremorUtils.DrawNPCGlowMask(spriteBatch, npc, mod.GetTexture("NPCs/Bosses/NovaPillar/NovaPillar_GlowMask")); float num88 = NovaHandler.ShieldStrength / (float)NPC.ShieldStrengthTowerMax; if (NovaHandler.ShieldStrength > 0) { diff --git a/NovaPillar/NovaPillar.png b/NPCs/Bosses/NovaPillar/NovaPillar.png similarity index 100% rename from NovaPillar/NovaPillar.png rename to NPCs/Bosses/NovaPillar/NovaPillar.png diff --git a/NovaPillar/NovaPillar_GlowMask.png b/NPCs/Bosses/NovaPillar/NovaPillar_GlowMask.png similarity index 100% rename from NovaPillar/NovaPillar_GlowMask.png rename to NPCs/Bosses/NovaPillar/NovaPillar_GlowMask.png diff --git a/NovaPillar/NovaPillar_Head_Boss.png b/NPCs/Bosses/NovaPillar/NovaPillar_Head_Boss.png similarity index 100% rename from NovaPillar/NovaPillar_Head_Boss.png rename to NPCs/Bosses/NovaPillar/NovaPillar_Head_Boss.png diff --git a/NovaPillar/NovaPlanet.png b/NPCs/Bosses/NovaPillar/NovaPlanet.png similarity index 100% rename from NovaPillar/NovaPlanet.png rename to NPCs/Bosses/NovaPillar/NovaPlanet.png diff --git a/NovaPillar/NovaSky.cs b/NPCs/Bosses/NovaPillar/NovaSky.cs similarity index 97% rename from NovaPillar/NovaSky.cs rename to NPCs/Bosses/NovaPillar/NovaSky.cs index d4c7ea50..dd301850 100644 --- a/NovaPillar/NovaSky.cs +++ b/NPCs/Bosses/NovaPillar/NovaSky.cs @@ -3,9 +3,8 @@ using Microsoft.Xna.Framework.Graphics; using Terraria; using Terraria.Graphics.Effects; -using Terraria.ModLoader; -namespace Tremor.NovaPillar +namespace Tremor.NPCs.Bosses.NovaPillar { public class NovaSky : CustomSky { @@ -40,7 +39,7 @@ public override void OnLoad() _starTextures = new Texture2D[3]; for (int i = 0; i < _starTextures.Length; i++) { - _starTextures[i] = Tremor.instance.GetTexture("NovaPillar/NovaSoul " + i); + _starTextures[i] = Tremor.instance.GetTexture("NPCs/Bosses/NovaPillar/NovaSoul " + i); } } diff --git a/NovaPillar/NovaSoul 0.png b/NPCs/Bosses/NovaPillar/NovaSoul 0.png similarity index 100% rename from NovaPillar/NovaSoul 0.png rename to NPCs/Bosses/NovaPillar/NovaSoul 0.png diff --git a/NovaPillar/NovaSoul 1.png b/NPCs/Bosses/NovaPillar/NovaSoul 1.png similarity index 100% rename from NovaPillar/NovaSoul 1.png rename to NPCs/Bosses/NovaPillar/NovaSoul 1.png diff --git a/NovaPillar/NovaSoul 2.png b/NPCs/Bosses/NovaPillar/NovaSoul 2.png similarity index 100% rename from NovaPillar/NovaSoul 2.png rename to NPCs/Bosses/NovaPillar/NovaSoul 2.png diff --git a/NovaPillar/Projectiles/NovaAlchemistCloud.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistCloud.cs similarity index 94% rename from NovaPillar/Projectiles/NovaAlchemistCloud.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistCloud.cs index 49191639..c811645d 100644 --- a/NovaPillar/Projectiles/NovaAlchemistCloud.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistCloud.cs @@ -1,6 +1,6 @@ using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaAlchemistCloud : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaAlchemistCloud.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistCloud.png similarity index 100% rename from NovaPillar/Projectiles/NovaAlchemistCloud.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistCloud.png diff --git a/NovaPillar/Projectiles/NovaAlchemistProjectile.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistProjectile.cs similarity index 99% rename from NovaPillar/Projectiles/NovaAlchemistProjectile.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistProjectile.cs index 96fe13eb..697ffe91 100644 --- a/NovaPillar/Projectiles/NovaAlchemistProjectile.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistProjectile.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaAlchemistProjectile : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaAlchemistProjectile.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistProjectile.png similarity index 100% rename from NovaPillar/Projectiles/NovaAlchemistProjectile.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaAlchemistProjectile.png diff --git a/NovaPillar/Projectiles/NovaBlast.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaBlast.cs similarity index 93% rename from NovaPillar/Projectiles/NovaBlast.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaBlast.cs index 9bc0cd56..5780a49e 100644 --- a/NovaPillar/Projectiles/NovaBlast.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaBlast.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaBlast : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaBlast.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaBlast.png similarity index 100% rename from NovaPillar/Projectiles/NovaBlast.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaBlast.png diff --git a/NovaPillar/Projectiles/NovaBottle.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaBottle.cs similarity index 97% rename from NovaPillar/Projectiles/NovaBottle.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaBottle.cs index 43c0df32..49e6c406 100644 --- a/NovaPillar/Projectiles/NovaBottle.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaBottle.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaBottle : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaBottle.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaBottle.png similarity index 100% rename from NovaPillar/Projectiles/NovaBottle.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaBottle.png diff --git a/NovaPillar/Projectiles/NovaBurst.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaBurst.cs similarity index 93% rename from NovaPillar/Projectiles/NovaBurst.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaBurst.cs index 6fd4a1d9..7a8c9f36 100644 --- a/NovaPillar/Projectiles/NovaBurst.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaBurst.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaBurst : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaBurst.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaBurst.png similarity index 100% rename from NovaPillar/Projectiles/NovaBurst.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaBurst.png diff --git a/NovaPillar/Projectiles/NovaCauldron.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs similarity index 99% rename from NovaPillar/Projectiles/NovaCauldron.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs index ae7a0639..ac052729 100644 --- a/NovaPillar/Projectiles/NovaCauldron.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.cs @@ -3,7 +3,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaCauldron : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaCauldron.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.png similarity index 100% rename from NovaPillar/Projectiles/NovaCauldron.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron.png diff --git a/NovaPillar/Projectiles/NovaCauldron_Fire.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron_Fire.cs similarity index 98% rename from NovaPillar/Projectiles/NovaCauldron_Fire.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron_Fire.cs index bcccc686..04f33f21 100644 --- a/NovaPillar/Projectiles/NovaCauldron_Fire.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron_Fire.cs @@ -4,7 +4,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaCauldron_Fire : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaCauldron_Fire.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron_Fire.png similarity index 100% rename from NovaPillar/Projectiles/NovaCauldron_Fire.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaCauldron_Fire.png diff --git a/NovaPillar/Projectiles/NovaFlask_Proj.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_Proj.cs similarity index 99% rename from NovaPillar/Projectiles/NovaFlask_Proj.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_Proj.cs index dd58e371..58e600e4 100644 --- a/NovaPillar/Projectiles/NovaFlask_Proj.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_Proj.cs @@ -6,7 +6,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaFlask_Proj : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaFlask_Proj.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_Proj.png similarity index 100% rename from NovaPillar/Projectiles/NovaFlask_Proj.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_Proj.png diff --git a/NovaPillar/Projectiles/NovaFlask_ProjBall.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjBall.cs similarity index 99% rename from NovaPillar/Projectiles/NovaFlask_ProjBall.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjBall.cs index fee86194..305b9f1b 100644 --- a/NovaPillar/Projectiles/NovaFlask_ProjBall.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjBall.cs @@ -4,7 +4,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaFlask_ProjBall : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaFlask_ProjBall.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjBall.png similarity index 100% rename from NovaPillar/Projectiles/NovaFlask_ProjBall.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjBall.png diff --git a/NovaPillar/Projectiles/NovaFlask_ProjFire.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjFire.cs similarity index 98% rename from NovaPillar/Projectiles/NovaFlask_ProjFire.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjFire.cs index 05bac2ca..93f436b6 100644 --- a/NovaPillar/Projectiles/NovaFlask_ProjFire.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjFire.cs @@ -3,7 +3,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaFlask_ProjFire : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaFlask_ProjFire.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjFire.png similarity index 100% rename from NovaPillar/Projectiles/NovaFlask_ProjFire.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlask_ProjFire.png diff --git a/NovaPillar/Projectiles/NovaFlierProj.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlierProj.cs similarity index 96% rename from NovaPillar/Projectiles/NovaFlierProj.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlierProj.cs index ce879b92..92469003 100644 --- a/NovaPillar/Projectiles/NovaFlierProj.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlierProj.cs @@ -3,7 +3,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaFlierProj : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaFlierProj.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaFlierProj.png similarity index 100% rename from NovaPillar/Projectiles/NovaFlierProj.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaFlierProj.png diff --git a/NovaPillar/Projectiles/NovaSkull.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaSkull.cs similarity index 96% rename from NovaPillar/Projectiles/NovaSkull.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaSkull.cs index 954fca5d..b6f62c1a 100644 --- a/NovaPillar/Projectiles/NovaSkull.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaSkull.cs @@ -3,7 +3,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaSkull : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaSkull.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaSkull.png similarity index 100% rename from NovaPillar/Projectiles/NovaSkull.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaSkull.png diff --git a/NovaPillar/Projectiles/NovaSkullburst.cs b/NPCs/Bosses/NovaPillar/Projectiles/NovaSkullburst.cs similarity index 93% rename from NovaPillar/Projectiles/NovaSkullburst.cs rename to NPCs/Bosses/NovaPillar/Projectiles/NovaSkullburst.cs index ac9f08b6..a8f416ff 100644 --- a/NovaPillar/Projectiles/NovaSkullburst.cs +++ b/NPCs/Bosses/NovaPillar/Projectiles/NovaSkullburst.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Projectiles +namespace Tremor.NPCs.Bosses.NovaPillar.Projectiles { public class NovaSkullburst : ModProjectile { diff --git a/NovaPillar/Projectiles/NovaSkullburst.png b/NPCs/Bosses/NovaPillar/Projectiles/NovaSkullburst.png similarity index 100% rename from NovaPillar/Projectiles/NovaSkullburst.png rename to NPCs/Bosses/NovaPillar/Projectiles/NovaSkullburst.png diff --git a/NovaPillar/Tiles/NovaBlock.cs b/NPCs/Bosses/NovaPillar/Tiles/NovaBlock.cs similarity index 95% rename from NovaPillar/Tiles/NovaBlock.cs rename to NPCs/Bosses/NovaPillar/Tiles/NovaBlock.cs index 425c8b14..82847cda 100644 --- a/NovaPillar/Tiles/NovaBlock.cs +++ b/NPCs/Bosses/NovaPillar/Tiles/NovaBlock.cs @@ -3,7 +3,7 @@ using Terraria.ID; using Terraria.ModLoader; -namespace Tremor.NovaPillar.Tiles +namespace Tremor.NPCs.Bosses.NovaPillar.Tiles { public class NovaBlock : ModTile { diff --git a/NovaPillar/Tiles/NovaBlock.png b/NPCs/Bosses/NovaPillar/Tiles/NovaBlock.png similarity index 100% rename from NovaPillar/Tiles/NovaBlock.png rename to NPCs/Bosses/NovaPillar/Tiles/NovaBlock.png diff --git a/NovaPillar/Tiles/NovaMonolithTile.cs b/NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile.cs similarity index 90% rename from NovaPillar/Tiles/NovaMonolithTile.cs rename to NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile.cs index e4982f34..1e811371 100644 --- a/NovaPillar/Tiles/NovaMonolithTile.cs +++ b/NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile.cs @@ -6,7 +6,7 @@ using Terraria.ModLoader; using Terraria.ObjectData; -namespace Tremor.NovaPillar.Tiles +namespace Tremor.NPCs.Bosses.NovaPillar.Tiles { public class NovaMonolithTile : ModTile { @@ -69,7 +69,7 @@ public override bool PreDraw(int i, int j, SpriteBatch spriteBatch) animate = Main.tileFrame[Type] * animationFrameHeight; } Main.spriteBatch.Draw(texture, new Vector2(i * 16 - (int)Main.screenPosition.X, j * 16 - (int)Main.screenPosition.Y) + zero, new Rectangle(tile.frameX, tile.frameY + animate, 16, height), Lighting.GetColor(i, j), 0f, default(Vector2), 1f, SpriteEffects.None, 0f); - Main.spriteBatch.Draw(mod.GetTexture("NovaPillar/Tiles/NovaMonolithTile_Glowmask"), new Vector2(i * 16 - (int)Main.screenPosition.X, j * 16 - (int)Main.screenPosition.Y) + zero, new Rectangle(tile.frameX, tile.frameY + animate, 16, height), Color.White, 0f, Vector2.Zero, 1f, SpriteEffects.None, 0f); + Main.spriteBatch.Draw(mod.GetTexture("NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile_Glowmask"), new Vector2(i * 16 - (int)Main.screenPosition.X, j * 16 - (int)Main.screenPosition.Y) + zero, new Rectangle(tile.frameX, tile.frameY + animate, 16, height), Color.White, 0f, Vector2.Zero, 1f, SpriteEffects.None, 0f); return false; } diff --git a/NovaPillar/Tiles/NovaMonolithTile.png b/NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile.png similarity index 100% rename from NovaPillar/Tiles/NovaMonolithTile.png rename to NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile.png diff --git a/NovaPillar/Tiles/NovaMonolithTile_Glowmask.png b/NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile_Glowmask.png similarity index 100% rename from NovaPillar/Tiles/NovaMonolithTile_Glowmask.png rename to NPCs/Bosses/NovaPillar/Tiles/NovaMonolithTile_Glowmask.png diff --git a/Projectiles/CogLordLaser.cs b/Projectiles/CogLordLaser.cs index 9efcbc71..9192e4f2 100644 --- a/Projectiles/CogLordLaser.cs +++ b/Projectiles/CogLordLaser.cs @@ -1,7 +1,7 @@ using Microsoft.Xna.Framework; using Terraria; using Terraria.ModLoader; -using Tremor.NovaPillar; +using Tremor.NPCs.Bosses.NovaPillar; namespace Tremor.Projectiles { diff --git a/RecipeUtils.cs b/RecipeUtils.cs index 2cc36f36..d7a345c2 100644 --- a/RecipeUtils.cs +++ b/RecipeUtils.cs @@ -5,7 +5,7 @@ using Terraria.ID; using Terraria.ModLoader; using Tremor.Items; -using Tremor.NovaPillar.Items; +using Tremor.NPCs.Bosses.NovaPillar.Items; using Tremor.Tiles; namespace Tremor diff --git a/Tremor.cs b/Tremor.cs index 4fc9140e..cdec9d8b 100644 --- a/Tremor.cs +++ b/Tremor.cs @@ -12,7 +12,7 @@ using Terraria.ModLoader; using Terraria.UI; using Tremor.Invasion; -using Tremor.NovaPillar; +using Tremor.NPCs.Bosses.NovaPillar; using Tremor.ZombieEvent; namespace Tremor @@ -235,7 +235,7 @@ public override void Load() } GameShaders.Armor.BindShader(ItemType("NovaDye"), new ArmorShaderData(Main.PixelShaderRef, "ArmorSolar")).UseColor(0.8f, 0.7f, 0.3f).UseSecondaryColor(0.8f, 0.7f, 0.3f); - NovaSky.PlanetTexture = GetTexture("NovaPillar/NovaPlanet"); + NovaSky.PlanetTexture = GetTexture("NPCs/Bosses/NovaPillar/NovaPlanet"); Filters.Scene["Tremor:Nova"] = new Filter(new NovaData("FilterMiniTower").UseColor(0.8f, 0.7f, 0.3f).UseOpacity(0.82f), EffectPriority.VeryHigh); SkyManager.Instance["Tremor:Nova"] = new NovaSky(); diff --git a/Tremor.csproj b/Tremor.csproj index 5b87d18c..f4cb6730 100644 --- a/Tremor.csproj +++ b/Tremor.csproj @@ -190,13 +190,13 @@ - - - - - - - + + + + + + + @@ -226,45 +226,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -683,10 +683,10 @@ - - - - + + + + @@ -1260,7 +1260,7 @@ - + @@ -1286,10 +1286,10 @@ - - - - + + + + @@ -1946,14 +1946,14 @@ - - - - - - - - + + + + + + + + @@ -1976,8 +1976,8 @@ - - + + @@ -2048,7 +2048,7 @@ - + @@ -2094,7 +2094,7 @@ - + @@ -2143,7 +2143,7 @@ - + @@ -3059,16 +3059,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -4155,11 +4155,11 @@ - - - - - + + + + + @@ -4937,7 +4937,7 @@ - + @@ -4964,11 +4964,11 @@ - - - - - + + + + + @@ -5838,81 +5838,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -5937,8 +5937,8 @@ - - + + @@ -6063,9 +6063,9 @@ - - - + + + @@ -6119,7 +6119,7 @@ - + @@ -7177,9 +7177,7 @@ - - - +