stuff

UriBuilder · Dec 29, 2022 · 7cbdfbb · 7cbdfbb
1 parent 5d978a8
commit 7cbdfbb
Show file tree

Hide file tree

Showing 57 changed files with 34 additions and 36 deletions.
diff --git a/Aequus.csproj b/Aequus.csproj
@@ -22,4 +22,7 @@
       <HintPath>..\..\ModReader\ShopQuotesMod\ShopQuotesMod.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Items\Weapons\Summon\Sentry\" />
+  </ItemGroup>
 </Project>
diff --git a/Aequus.xml b/Aequus.xml
diff --git a/Assets/Wind.png b/Assets/Wind.png
diff --git a/Assets/Wind2.png b/Assets/Wind2.png
diff --git a/ClientConfig.cs b/ClientConfig.cs
@@ -2,7 +2,7 @@
 using Aequus.Items.Consumables.BuffPotions;
 using Aequus.Items.Consumables.Foods;
 using Aequus.Items.Misc;
-using Aequus.Items.Weapons.Summon.Necro.Scepters;
+using Aequus.Items.Weapons.Summon.Scepters;
 using System;
 using System.ComponentModel;
 using Terraria.ID;

diff --git a/Common/JourneyModeItemFilters.cs b/Common/JourneyModeItemFilters.cs
@@ -1,7 +1,7 @@
 using Aequus.Items.Accessories.Utility;
 using Aequus.Items.Tools;
 using Aequus.Items.Tools.Misc;
-using Aequus.Items.Weapons.Summon.Necro;
+using Aequus.Items.Weapons.Summon;
 using Terraria;
 using Terraria.GameContent.Creative;
 using Terraria.ModLoader;

diff --git a/Content/CrossMod/CerebralModSupport.cs b/Content/CrossMod/CerebralModSupport.cs
@@ -4,8 +4,8 @@
 using Aequus.Items.Tools;
 using Aequus.Items.Weapons.Melee;
 using Aequus.Items.Weapons.Ranged;
-using Aequus.Items.Weapons.Summon.Necro.Candles;
-using Aequus.Items.Weapons.Summon.Necro.Scepters;
+using Aequus.Items.Weapons.Summon.Candles;
+using Aequus.Items.Weapons.Summon.Scepters;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;

diff --git a/Content/Necromancy/NecromancyDatabase.cs b/Content/Necromancy/NecromancyDatabase.cs
@@ -2,7 +2,7 @@
 using Aequus.Content.CrossMod;
 using Aequus.Content.CrossMod.ModCalls;
 using Aequus.Content.Necromancy.Aggression;
-using Aequus.Items.Weapons.Summon.Necro.Scepters;
+using Aequus.Items.Weapons.Summon.Scepters;
 using System;
 using System.Collections.Generic;
 using Terraria;

diff --git a/Content/WorldGeneration/AequusWorldGenerator.cs b/Content/WorldGeneration/AequusWorldGenerator.cs
@@ -5,8 +5,8 @@
 using Aequus.Items.Tools;
 using Aequus.Items.Weapons.Melee;
 using Aequus.Items.Weapons.Ranged;
-using Aequus.Items.Weapons.Summon.Necro.Candles;
-using Aequus.Items.Weapons.Summon.Necro.Scepters;
+using Aequus.Items.Weapons.Summon.Candles;
+using Aequus.Items.Weapons.Summon.Scepters;
 using Aequus.Tiles;
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;

diff --git a/Items/AequusItem.cs b/Items/AequusItem.cs
@@ -13,7 +13,7 @@
 using Aequus.Items.Tools;
 using Aequus.Items.Weapons.Melee;
 using Aequus.Items.Weapons.Ranged;
-using Aequus.Items.Weapons.Summon.Necro.Scepters;
+using Aequus.Items.Weapons.Summon.Scepters;
 using Aequus.NPCs.Monsters.Sky.GaleStreams;
 using Aequus.Projectiles.Misc.Friendly;
 using Aequus.Tiles;

diff --git a/Items/Tools/PhysicsGun.cs b/Items/Tools/PhysicsGun.cs
@@ -49,11 +49,6 @@ public override void SetDefaults()
 
         public override void ModifyTooltips(List<TooltipLine> tooltips)
         {
-            int pickPower = 35;
-            var pick = Main.LocalPlayer.GetBestPickaxe();
-            if (pick != null)
-                pickPower = pick.pick;
-            tooltips.Insert(tooltips.GetIndex("PickPower"), new TooltipLine(Mod, "PickPower", pickPower + Lang.tip[26].Value));
         }
 
         public override bool PreDrawInInventory(SpriteBatch spriteBatch, Vector2 position, Rectangle frame, Color drawColor, Color itemColor, Vector2 origin, float scale)

diff --git a/Items/Weapons/Melee/PhaseDisc.cs b/Items/Weapons/Melee/PhaseDisc.cs
@@ -21,8 +21,8 @@ public override void SetDefaults()
             Item.width = 40;
             Item.height = 40;
             Item.SetWeaponValues(28, 3f, 0);
-            Item.useTime = 14;
-            Item.useAnimation = 14;
+            Item.useTime = 19;
+            Item.useAnimation = 19;
             Item.rare = ItemRarityID.LightPurple;
             Item.useStyle = ItemUseStyleID.Swing;
             Item.UseSound = SoundID.Item1;
@@ -31,7 +31,7 @@ public override void SetDefaults()
             Item.noMelee = true;
             Item.noUseGraphic = true;
             Item.shoot = ModContent.ProjectileType<PhaseDiscProj>();
-            Item.shootSpeed = 6.5f;
+            Item.shootSpeed = 6f;
             Item.autoReuse = true;
         }
 

diff --git a/...s/Summon/Necro/Candles/BloodMoonCandle.cs → ...Weapons/Summon/Candles/BloodMoonCandle.cs b/...s/Summon/Necro/Candles/BloodMoonCandle.cs → ...Weapons/Summon/Candles/BloodMoonCandle.cs
@@ -4,7 +4,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Candles
+namespace Aequus.Items.Weapons.Summon.Candles
 {
     public class BloodMoonCandle : SoulCandleBase
     {

diff --git a/.../Summon/Necro/Candles/BloodMoonCandle.png → ...eapons/Summon/Candles/BloodMoonCandle.png b/.../Summon/Necro/Candles/BloodMoonCandle.png → ...eapons/Summon/Candles/BloodMoonCandle.png
diff --git a/...n/Necro/Candles/BloodMoonCandle_Flame.png → .../Summon/Candles/BloodMoonCandle_Flame.png b/...n/Necro/Candles/BloodMoonCandle_Flame.png → .../Summon/Candles/BloodMoonCandle_Flame.png
diff --git a/.../Summon/Necro/Candles/CorruptionCandle.cs → ...eapons/Summon/Candles/CorruptionCandle.cs b/.../Summon/Necro/Candles/CorruptionCandle.cs → ...eapons/Summon/Candles/CorruptionCandle.cs
@@ -3,7 +3,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Candles
+namespace Aequus.Items.Weapons.Summon.Candles
 {
     public class CorruptionCandle : SoulCandleBase
     {

diff --git a/...Summon/Necro/Candles/CorruptionCandle.png → ...apons/Summon/Candles/CorruptionCandle.png b/...Summon/Necro/Candles/CorruptionCandle.png → ...apons/Summon/Candles/CorruptionCandle.png
diff --git a/.../Necro/Candles/CorruptionCandle_Flame.png → ...Summon/Candles/CorruptionCandle_Flame.png b/.../Necro/Candles/CorruptionCandle_Flame.png → ...Summon/Candles/CorruptionCandle_Flame.png
diff --git a/...ons/Summon/Necro/Candles/CrimsonCandle.cs → ...s/Weapons/Summon/Candles/CrimsonCandle.cs b/...ons/Summon/Necro/Candles/CrimsonCandle.cs → ...s/Weapons/Summon/Candles/CrimsonCandle.cs
@@ -3,7 +3,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Candles
+namespace Aequus.Items.Weapons.Summon.Candles
 {
     public class CrimsonCandle : SoulCandleBase
     {

diff --git a/...ns/Summon/Necro/Candles/CrimsonCandle.png → .../Weapons/Summon/Candles/CrimsonCandle.png b/...ns/Summon/Necro/Candles/CrimsonCandle.png → .../Weapons/Summon/Candles/CrimsonCandle.png
diff --git a/...mon/Necro/Candles/CrimsonCandle_Flame.png → ...ns/Summon/Candles/CrimsonCandle_Flame.png b/...mon/Necro/Candles/CrimsonCandle_Flame.png → ...ns/Summon/Candles/CrimsonCandle_Flame.png
diff --git a/...ons/Summon/Necro/Candles/DragonsBreath.cs → ...s/Weapons/Summon/Candles/DragonsBreath.cs b/...ons/Summon/Necro/Candles/DragonsBreath.cs → ...s/Weapons/Summon/Candles/DragonsBreath.cs
@@ -6,7 +6,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Candles
+namespace Aequus.Items.Weapons.Summon.Candles
 {
     public class DragonsBreath : SoulCandleBase
     {

diff --git a/...ns/Summon/Necro/Candles/DragonsBreath.png → .../Weapons/Summon/Candles/DragonsBreath.png b/...ns/Summon/Necro/Candles/DragonsBreath.png → .../Weapons/Summon/Candles/DragonsBreath.png
diff --git a/...mon/Necro/Candles/DragonsBreath_Flame.png → ...ns/Summon/Candles/DragonsBreath_Flame.png b/...mon/Necro/Candles/DragonsBreath_Flame.png → ...ns/Summon/Candles/DragonsBreath_Flame.png
diff --git a/...ons/Summon/Necro/Candles/DungeonCandle.cs → ...s/Weapons/Summon/Candles/DungeonCandle.cs b/...ons/Summon/Necro/Candles/DungeonCandle.cs → ...s/Weapons/Summon/Candles/DungeonCandle.cs
@@ -3,7 +3,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Candles
+namespace Aequus.Items.Weapons.Summon.Candles
 {
     public class DungeonCandle : SoulCandleBase
     {

diff --git a/...ns/Summon/Necro/Candles/DungeonCandle.png → .../Weapons/Summon/Candles/DungeonCandle.png b/...ns/Summon/Necro/Candles/DungeonCandle.png → .../Weapons/Summon/Candles/DungeonCandle.png
diff --git a/...mon/Necro/Candles/DungeonCandle_Flame.png → ...ns/Summon/Candles/DungeonCandle_Flame.png b/...mon/Necro/Candles/DungeonCandle_Flame.png → ...ns/Summon/Candles/DungeonCandle_Flame.png
diff --git a/...s/Summon/Necro/Candles/OccultistCandle.cs → ...Weapons/Summon/Candles/OccultistCandle.cs b/...s/Summon/Necro/Candles/OccultistCandle.cs → ...Weapons/Summon/Candles/OccultistCandle.cs
@@ -3,7 +3,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Candles
+namespace Aequus.Items.Weapons.Summon.Candles
 {
     public class OccultistCandle : SoulCandleBase
     {

diff --git a/.../Summon/Necro/Candles/OccultistCandle.png → ...eapons/Summon/Candles/OccultistCandle.png b/.../Summon/Necro/Candles/OccultistCandle.png → ...eapons/Summon/Candles/OccultistCandle.png
diff --git a/...n/Necro/Candles/OccultistCandle_Flame.png → .../Summon/Candles/OccultistCandle_Flame.png b/...n/Necro/Candles/OccultistCandle_Flame.png → .../Summon/Candles/OccultistCandle_Flame.png
diff --git a/...apons/Summon/Necro/Candles/PixieCandle.cs → Items/Weapons/Summon/Candles/PixieCandle.cs b/...apons/Summon/Necro/Candles/PixieCandle.cs → Items/Weapons/Summon/Candles/PixieCandle.cs
@@ -4,7 +4,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Candles
+namespace Aequus.Items.Weapons.Summon.Candles
 {
     public class PixieCandle : SoulCandleBase
     {

diff --git a/...pons/Summon/Necro/Candles/PixieCandle.png → Items/Weapons/Summon/Candles/PixieCandle.png b/...pons/Summon/Necro/Candles/PixieCandle.png → Items/Weapons/Summon/Candles/PixieCandle.png
diff --git a/...ummon/Necro/Candles/PixieCandle_Flame.png → ...pons/Summon/Candles/PixieCandle_Flame.png b/...ummon/Necro/Candles/PixieCandle_Flame.png → ...pons/Summon/Candles/PixieCandle_Flame.png
diff --git a/Items/Weapons/Summon/Necro/ScepterBase.cs → Items/Weapons/Summon/ScepterBase.cs b/Items/Weapons/Summon/Necro/ScepterBase.cs → Items/Weapons/Summon/ScepterBase.cs
@@ -7,7 +7,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro
+namespace Aequus.Items.Weapons.Summon
 {
     public abstract class ScepterBase : ModItem
     {

diff --git a/...mmon/Necro/Scepters/EnthrallingScepter.cs → ...ons/Summon/Scepters/EnthrallingScepter.cs b/...mmon/Necro/Scepters/EnthrallingScepter.cs → ...ons/Summon/Scepters/EnthrallingScepter.cs
@@ -3,7 +3,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Scepters
+namespace Aequus.Items.Weapons.Summon.Scepters
 {
     public class EnthrallingScepter : ScepterBase
     {

diff --git a/...mon/Necro/Scepters/EnthrallingScepter.png → ...ns/Summon/Scepters/EnthrallingScepter.png b/...mon/Necro/Scepters/EnthrallingScepter.png → ...ns/Summon/Scepters/EnthrallingScepter.png
diff --git a/...Summon/Necro/Scepters/FriendshipMagick.cs → ...apons/Summon/Scepters/FriendshipMagick.cs b/...Summon/Necro/Scepters/FriendshipMagick.cs → ...apons/Summon/Scepters/FriendshipMagick.cs
@@ -4,7 +4,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Scepters
+namespace Aequus.Items.Weapons.Summon.Scepters
 {
     [GlowMask]
     public class FriendshipMagick : ScepterBase

diff --git a/...ummon/Necro/Scepters/FriendshipMagick.png → ...pons/Summon/Scepters/FriendshipMagick.png b/...ummon/Necro/Scepters/FriendshipMagick.png → ...pons/Summon/Scepters/FriendshipMagick.png
diff --git a/.../Necro/Scepters/FriendshipMagick_Glow.png → ...Summon/Scepters/FriendshipMagick_Glow.png b/.../Necro/Scepters/FriendshipMagick_Glow.png → ...Summon/Scepters/FriendshipMagick_Glow.png
diff --git a/...apons/Summon/Necro/Scepters/Insurgency.cs → Items/Weapons/Summon/Scepters/Insurgency.cs b/...apons/Summon/Necro/Scepters/Insurgency.cs → Items/Weapons/Summon/Scepters/Insurgency.cs
@@ -5,7 +5,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Scepters
+namespace Aequus.Items.Weapons.Summon.Scepters
 {
     [GlowMask]
     public class Insurgency : ScepterBase

diff --git a/...pons/Summon/Necro/Scepters/Insurgency.png → Items/Weapons/Summon/Scepters/Insurgency.png b/...pons/Summon/Necro/Scepters/Insurgency.png → Items/Weapons/Summon/Scepters/Insurgency.png
diff --git a/...Summon/Necro/Scepters/Insurgency_Glow.png → ...apons/Summon/Scepters/Insurgency_Glow.png b/...Summon/Necro/Scepters/Insurgency_Glow.png → ...apons/Summon/Scepters/Insurgency_Glow.png
diff --git a/...s/Weapons/Summon/Necro/Scepters/Osiris.cs → Items/Weapons/Summon/Scepters/Osiris.cs b/...s/Weapons/Summon/Necro/Scepters/Osiris.cs → Items/Weapons/Summon/Scepters/Osiris.cs
@@ -3,7 +3,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Scepters
+namespace Aequus.Items.Weapons.Summon.Scepters
 {
     [GlowMask]
     public class Osiris : ScepterBase

diff --git a/.../Weapons/Summon/Necro/Scepters/Osiris.png → Items/Weapons/Summon/Scepters/Osiris.png b/.../Weapons/Summon/Necro/Scepters/Osiris.png → Items/Weapons/Summon/Scepters/Osiris.png
diff --git a/...ons/Summon/Necro/Scepters/Osiris_Glow.png → ...s/Weapons/Summon/Scepters/Osiris_Glow.png b/...ons/Summon/Necro/Scepters/Osiris_Glow.png → ...s/Weapons/Summon/Scepters/Osiris_Glow.png
diff --git a/...Weapons/Summon/Necro/Scepters/Revenant.cs → Items/Weapons/Summon/Scepters/Revenant.cs b/...Weapons/Summon/Necro/Scepters/Revenant.cs → Items/Weapons/Summon/Scepters/Revenant.cs
@@ -3,7 +3,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Scepters
+namespace Aequus.Items.Weapons.Summon.Scepters
 {
     [GlowMask]
     public class Revenant : ScepterBase

diff --git a/...eapons/Summon/Necro/Scepters/Revenant.png → Items/Weapons/Summon/Scepters/Revenant.png b/...eapons/Summon/Necro/Scepters/Revenant.png → Items/Weapons/Summon/Scepters/Revenant.png
diff --git a/...s/Summon/Necro/Scepters/Revenant_Glow.png → ...Weapons/Summon/Scepters/Revenant_Glow.png b/...s/Summon/Necro/Scepters/Revenant_Glow.png → ...Weapons/Summon/Scepters/Revenant_Glow.png
diff --git a/...ns/Summon/Necro/Scepters/ZombieScepter.cs → .../Weapons/Summon/Scepters/ZombieScepter.cs b/...ns/Summon/Necro/Scepters/ZombieScepter.cs → .../Weapons/Summon/Scepters/ZombieScepter.cs
@@ -3,7 +3,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro.Scepters
+namespace Aequus.Items.Weapons.Summon.Scepters
 {
     [GlowMask]
     public class ZombieScepter : ScepterBase

diff --git a/...s/Summon/Necro/Scepters/ZombieScepter.png → ...Weapons/Summon/Scepters/ZombieScepter.png b/...s/Summon/Necro/Scepters/ZombieScepter.png → ...Weapons/Summon/Scepters/ZombieScepter.png
diff --git a/...mon/Necro/Scepters/ZombieScepter_Glow.png → ...ns/Summon/Scepters/ZombieScepter_Glow.png b/...mon/Necro/Scepters/ZombieScepter_Glow.png → ...ns/Summon/Scepters/ZombieScepter_Glow.png
diff --git a/Items/Weapons/Summon/Sentry/LivingWoodSentry.png b/Items/Weapons/Summon/Sentry/LivingWoodSentry.png
diff --git a/Items/Weapons/Summon/Necro/SoulCandleBase.cs → Items/Weapons/Summon/SoulCandleBase.cs b/Items/Weapons/Summon/Necro/SoulCandleBase.cs → Items/Weapons/Summon/SoulCandleBase.cs
@@ -6,7 +6,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Aequus.Items.Weapons.Summon.Necro
+namespace Aequus.Items.Weapons.Summon
 {
     public abstract class SoulCandleBase : ModItem
     {

diff --git a/Items/Weapons/Summon/Whip/TornadoWhip.png b/Items/Weapons/Summon/Whip/TornadoWhip.png
diff --git a/NPCs/Friendly/Town/Occultist.cs b/NPCs/Friendly/Town/Occultist.cs
@@ -12,9 +12,9 @@
 using Aequus.Items.Tools.GrapplingHooks;
 using Aequus.Items.Tools.Misc;
 using Aequus.Items.Weapons.Melee;
+using Aequus.Items.Weapons.Summon.Candles;
 using Aequus.Items.Weapons.Summon.Minion;
-using Aequus.Items.Weapons.Summon.Necro.Candles;
-using Aequus.Items.Weapons.Summon.Necro.Scepters;
+using Aequus.Items.Weapons.Summon.Scepters;
 using Aequus.Particles;
 using Aequus.Particles.Dusts;
 using Aequus.Projectiles.Misc;

diff --git a/Tiles/AequusTile.cs b/Tiles/AequusTile.cs
@@ -4,7 +4,7 @@
 using Aequus.Items.Accessories;
 using Aequus.Items.Accessories.Vanity.Cursors;
 using Aequus.Items.Tools;
-using Aequus.Items.Weapons.Summon.Necro.Candles;
+using Aequus.Items.Weapons.Summon.Candles;
 using Aequus.Tiles.Ambience;
 using Aequus.Tiles.CrabCrevice;
 using Aequus.Tiles.PhysicistBlocks;

diff --git a/UI/ChestLensInterface.cs b/UI/ChestLensInterface.cs
@@ -1,4 +1,4 @@
-using Aequus.Items.Weapons.Summon.Necro;
+using Aequus.Items.Weapons.Summon;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;