Update to v0.0.9

rzc0d3r · Sep 24, 2024 · a6112d0 · a6112d0
1 parent 76b3739
commit a6112d0
Show file tree

Hide file tree

Showing 29 changed files with 211 additions and 177 deletions.
diff --git a/Common/GlobalsNPCs/DamageOverTimeGlobalNPC.cs b/Common/GlobalsNPCs/DamageOverTimeGlobalNPC.cs
@@ -1,5 +1,6 @@
 using Terraria;
 using Terraria.ModLoader;
+
 using EldenRingItems.Content.Buffs.StatDebuff;
 
 namespace ExampleMod.Common.GlobalNPCs

diff --git a/Common/NPCLootDrop/NPCLootDrop.cs b/Common/NPCLootDrop/NPCLootDrop.cs
@@ -1,10 +1,10 @@
-using Terraria.GameContent.ItemDropRules;
-using Terraria.ModLoader;
-using Terraria;
+using Terraria;
 using Terraria.ID;
+using Terraria.ModLoader;
+using Terraria.GameContent.ItemDropRules;
 
-using EldenRingItems.Content.Items.Weapons.Melee;
 using EldenRingItems.Content.Items.Consumables;
+using EldenRingItems.Content.Items.Weapons.Melee;
 
 namespace EldenRingItems.Common.NPCLootDrop
 {
@@ -25,7 +25,7 @@ public override void ModifyNPCLoot(NPC npc, NPCLoot npcLoot)
                 npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<GiantCrusher>(), 1));
             // Dark Moon Greatsword
             if (npc.type == NPCID.CultistBoss)
-                npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<DarkMoonGreatsword>(), 1));
+                npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<DarkMoonGreatsword0>(), 1));
             // Rivers Of Blood
             if (npc.type == NPCID.BloodEelHead)
                npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<RiversOfBlood>(), 12));

diff --git a/Common/Players/ERIPlayer.cs b/Common/Players/ERIPlayer.cs
@@ -1,7 +1,9 @@
-using Microsoft.Xna.Framework;
-using Terraria;
-using Terraria.ModLoader;
+using Terraria;
 using Terraria.ID;
+using Terraria.ModLoader;
+
+using Microsoft.Xna.Framework;
+
 using EldenRingItems.Content.Buffs.StatDebuff;
 
 namespace EldenRingItems.Common.Players
@@ -30,11 +32,12 @@ public override void MeleeEffects(Item item, Rectangle hitbox)
         {
             if (WeaponImbueBlackFlame)
             {
-                if (item.DamageType.CountsAsClass<MeleeDamageClass>() && !item.noMelee && !item.noUseGraphic)
+                if (item.DamageType.CountsAsClass<MeleeDamageClass>() && !item.noMelee && !item.noUseGraphic) {
                     if (Main.rand.NextBool(2))
                     {
                         Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, DustID.Wraith, Scale: Main.rand.NextFloat(0.5f, 0.8f));
                     }
+                }
             }
         }
 

diff --git a/Content/Buffs/StatBuff/BlessingBuff.cs b/Content/Buffs/StatBuff/BlessingBuff.cs
@@ -1,7 +1,8 @@
 using Terraria;
+using Terraria.ID;
 using Terraria.ModLoader;
+
 using EldenRingItems.Common.Players;
-using Terraria.ID;
 
 namespace EldenRingItems.Content.Buffs.StatBuff
 {

diff --git a/Content/Buffs/StatBuff/WeaponImbueBlackFlame.cs b/Content/Buffs/StatBuff/WeaponImbueBlackFlame.cs
@@ -1,7 +1,8 @@
 using Terraria;
+using Terraria.ID;
 using Terraria.ModLoader;
+
 using EldenRingItems.Common.Players;
-using Terraria.ID;
 
 namespace EldenRingItems.Content.Buffs.StatBuff
 {

diff --git a/Content/Buffs/StatDebuff/BlackFlameDebuff.cs b/Content/Buffs/StatDebuff/BlackFlameDebuff.cs
@@ -1,9 +1,8 @@
 using Terraria;
+using Terraria.ID;
 using Terraria.ModLoader;
+
 using Microsoft.Xna.Framework;
-using Terraria.ID;
-using Microsoft.Xna.Framework.Graphics;
-using Terraria.DataStructures;
 
 namespace EldenRingItems.Content.Buffs.StatDebuff
 {

diff --git a/Content/Items/Accessories/RadahnsGreatRune.cs b/Content/Items/Accessories/RadahnsGreatRune.cs
@@ -1,8 +1,8 @@
-using Terraria.ID;
+using Terraria;
+using Terraria.ID;
 using Terraria.ModLoader;
-using Terraria;
 using Terraria.Localization;
-using EldenRingItems.Common.Players;
+
 using EldenRingItems.Content.Buffs.StatBuff;
 
 namespace EldenRingItems.Content.Items.Accessories

diff --git a/Content/Items/Consumables/BlackFlameSpell.cs b/Content/Items/Consumables/BlackFlameSpell.cs
@@ -1,7 +1,8 @@
-using Terraria.ID;
-using Terraria.ModLoader;
-using Terraria;
+using Terraria;
+using Terraria.ID;
 using Terraria.Audio;
+using Terraria.ModLoader;
+
 using EldenRingItems.Content.Buffs.StatBuff;
 
 namespace EldenRingItems.Content.Items.Consumables

diff --git a/Content/Items/Consumables/RuneArc.cs b/Content/Items/Consumables/RuneArc.cs
@@ -1,7 +1,7 @@
-using Terraria.ID;
-using Terraria.ModLoader;
-using Terraria;
+using Terraria;
+using Terraria.ID;
 using Terraria.Audio;
+using Terraria.ModLoader;
 
 using EldenRingItems.Common.Players;
 using EldenRingItems.Content.Buffs.StatBuff;

diff --git a/Content/Items/Materials/SomberSmithingStones/SomberSmithingStones.cs b/Content/Items/Materials/SomberSmithingStones/SomberSmithingStones.cs
@@ -1,6 +1,6 @@
-using Terraria.ID;
+using Terraria;
+using Terraria.ID;
 using Terraria.ModLoader;
-using Terraria;
 
 namespace EldenRingItems.Content.Items.Materials.SomberSmithingStones
 {
@@ -280,4 +280,4 @@ public static int GetTileByLevel(int level)
         }
     }
     #endregion
-}
+}
diff --git a/Content/Items/Weapons/Melee/BlasphemousBlade.cs b/Content/Items/Weapons/Melee/BlasphemousBlade.cs
@@ -1,12 +1,13 @@
 using Terraria;
 using Terraria.ID;
-using Terraria.ModLoader;
-using EldenRingItems.Projectiles.Melee;
 using Terraria.Audio;
+using Terraria.ModLoader;
+using Terraria.Localization;
 using Terraria.DataStructures;
+
 using Microsoft.Xna.Framework;
-using System;
-using Terraria.Localization;
+
+using EldenRingItems.Projectiles.Melee;
 using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 
 namespace EldenRingItems.Content.Items.Weapons.Melee

diff --git a/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs b/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs
@@ -1,24 +1,27 @@
 using Terraria;
-using Terraria.Audio;
 using Terraria.ID;
+using Terraria.Audio;
 using Terraria.ModLoader;
 using Terraria.Localization;
 using Terraria.DataStructures;
+
 using Microsoft.Xna.Framework;
-using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
+using Microsoft.Xna.Framework.Graphics;
+
 using EldenRingItems.Projectiles.Melee.DarkMoonGreatsword;
-using EldenRingItems.Common.Players;
-using EldenRingItems.Projectiles.Melee;
+using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 
 namespace EldenRingItems.Content.Items.Weapons.Melee
 {
-    public class DarkMoonGreatsword : ModItem
+    public class DarkMoonGreatsword0 : ModItem
     {
         public override string Texture => "EldenRingItems/Content/Items/Weapons/Melee/DarkMoonGreatsword";
         public int BaseDamage { get; set; } = 85;
 
         SoundStyle ChargedUseSound = new SoundStyle("EldenRingItems/Sounds/cs_c2010.2318");
-
+
+        public bool Charging { get; set; } = false;
+        public bool IsCharged { get; set; } = false;
         const int MAX_CHARGED_ATTACKS = 10;
         int MadeChargedAttacks = 0;
         const int MANA_FOR_CHARGE = 100;
@@ -47,13 +50,12 @@ public override void SetDefaults()
 
         public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
         {
-            if (player.GetModPlayer<ERIPlayer>().DarkMoonGreatswordIsCharged && player.altFunctionUse != 2)
+            if (IsCharged && player.altFunctionUse != 2)
             {
                 if (MadeChargedAttacks == MAX_CHARGED_ATTACKS - 1)
                 {
-                    Item.UseSound = SoundID.Item1;
-                    MadeChargedAttacks = 0;
-                    player.GetModPlayer<ERIPlayer>().DarkMoonGreatswordIsCharged = false;
+                    Reset();
+                    IsCharged = false;
                 }
                 else
                     MadeChargedAttacks++;
@@ -64,26 +66,52 @@ public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source,
 
         public override bool AltFunctionUse(Player player) => true;
 
+        void Reset(string addtext="")
+        {
+            //Main.NewText(addtext+ "Resetting an interrupted charge DarkMoonGreatsword");
+            Charging = false;
+            Item.UseSound = SoundID.Item1;
+            MadeChargedAttacks = 0;
+        }
+
+        public override void UpdateInventory(Player player)
+        {
+            if (player.HeldItem.type != Type && !IsCharged && Charging)
+                Reset();
+        }
+
+        public override void PostDrawInWorld(SpriteBatch spriteBatch, Color lightColor, Color alphaColor, float rotation, float scale, int whoAmI)
+        {
+            base.PostDrawInWorld(spriteBatch, lightColor, alphaColor, rotation, scale, whoAmI);
+            if (!IsCharged && Charging && Main.LocalPlayer.HeldItem.type != Type)
+                Reset();
+        }
+
+        public override void PostDrawInInventory(SpriteBatch spriteBatch, Vector2 position, Rectangle frame, Color drawColor, Color itemColor, Vector2 origin, float scale)
+        {
+            base.PostDrawInInventory(spriteBatch, position, frame, drawColor, itemColor, origin, scale);
+            if (!IsCharged && Charging && Main.LocalPlayer.HeldItem.type != Type)
+                Reset();
+        }
+
         public override bool CanUseItem(Player player)
         {
-            if (player.altFunctionUse == 2)
+            if (player.altFunctionUse == 2 && !IsCharged)
             {
-                if (!player.GetModPlayer<ERIPlayer>().DarkMoonGreatswordIsCharged && !player.GetModPlayer<ERIPlayer>().DarkMoonGreatswordCharging)
+                if (!Charging)
                 {
                     if (player.CheckMana(MANA_FOR_CHARGE, true))
                     {
-                        player.GetModPlayer<ERIPlayer>().DarkMoonGreatswordCharging = true;
-                        Projectile.NewProjectile(player.GetSource_ItemUse(player.HeldItem), player.MountedCenter.X, player.MountedCenter.Y, 0, -30, ModContent.ProjectileType<DarkMoonGreatswordCharging>(), 0, 0, player.whoAmI, 0f);
+                        Charging = true;
+                        if (Main.myPlayer == player.whoAmI)
+                            Projectile.NewProjectile(player.GetSource_ItemUse(player.HeldItem), player.MountedCenter.X, player.MountedCenter.Y, 0, -30, ModContent.ProjectileType<DarkMoonGreatswordCharging>(), 0, 0, player.whoAmI, 0f);
                         Item.UseSound = ChargedUseSound;
                         MadeChargedAttacks = 0;
                     }
                 }
             }
-            else
-            {
-                if (!player.GetModPlayer<ERIPlayer>().DarkMoonGreatswordCharging && player.altFunctionUse != 2)
-                    return true;
-            }
+            else if (!Charging && player.altFunctionUse != 2)
+                return true;
             return false;
         }
 
@@ -95,12 +123,12 @@ public override void OnHitNPC(Player player, NPC target, NPC.HitInfo hit, int da
     }
 
     #region Upgrade
-    public abstract class UpgradedDarkMoonGreatsword : DarkMoonGreatsword
+    public abstract class UpgradedDarkMoonGreatsword : DarkMoonGreatsword0
     {
         public int UpgradeLevel { get; set; }
         public Recipe recipe { get; set; }
-        public override LocalizedText Tooltip => ModContent.GetModItem(ModContent.ItemType<DarkMoonGreatsword>()).Tooltip;
-        public override LocalizedText DisplayName => ModContent.GetModItem(ModContent.ItemType<DarkMoonGreatsword>()).DisplayName.WithFormatArgs($" +{UpgradeLevel}");
+        public override LocalizedText Tooltip => ModContent.GetModItem(ModContent.ItemType<DarkMoonGreatsword0>()).Tooltip;
+        public override LocalizedText DisplayName => ModContent.GetModItem(ModContent.ItemType<DarkMoonGreatsword0>()).DisplayName.WithFormatArgs($" +{UpgradeLevel}");
 
         protected UpgradedDarkMoonGreatsword(int upgradeLevel)
         {
@@ -127,7 +155,7 @@ public DarkMoonGreatsword1() : base(1) { }
         public override void AddRecipes()
         {
             base.AddRecipes();
-            recipe.AddIngredient(ModContent.ItemType<DarkMoonGreatsword>());
+            recipe.AddIngredient(ModContent.ItemType<DarkMoonGreatsword0>());
             recipe.Register();
         }
     }

diff --git a/Content/Items/Weapons/Melee/GiantCrusher.cs b/Content/Items/Weapons/Melee/GiantCrusher.cs
@@ -1,8 +1,9 @@
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
-using EldenRingItems.Projectiles.Melee;
 using Terraria.Localization;
+
+using EldenRingItems.Projectiles.Melee;
 using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 
 namespace EldenRingItems.Content.Items.Weapons.Melee

diff --git a/Content/Items/Weapons/Melee/GreatKatana.cs b/Content/Items/Weapons/Melee/GreatKatana.cs
@@ -1,11 +1,14 @@
-using Terraria;
-using Terraria.Audio;
+using System;
+
+using Terraria;
 using Terraria.ID;
+using Terraria.Audio;
 using Terraria.ModLoader;
 using Terraria.Localization;
-using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
+
 using Microsoft.Xna.Framework;
-using System;
+
+using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 
 namespace EldenRingItems.Content.Items.Weapons.Melee
 {

diff --git a/Content/Items/Weapons/Melee/Moonveil.cs b/Content/Items/Weapons/Melee/Moonveil.cs
@@ -1,12 +1,14 @@
 using Terraria;
-using Terraria.Audio;
 using Terraria.ID;
+using Terraria.Audio;
 using Terraria.ModLoader;
 using Terraria.Localization;
-using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 using Terraria.DataStructures;
+
 using Microsoft.Xna.Framework;
+
 using EldenRingItems.Projectiles.Melee;
+using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 
 namespace EldenRingItems.Content.Items.Weapons.Melee
 {

diff --git a/Content/Items/Weapons/Melee/RiversOfBlood.cs b/Content/Items/Weapons/Melee/RiversOfBlood.cs
@@ -1,12 +1,14 @@
 using Terraria;
-using Terraria.Audio;
 using Terraria.ID;
+using Terraria.Audio;
 using Terraria.ModLoader;
 using Terraria.Localization;
-using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 using Terraria.DataStructures;
+
 using Microsoft.Xna.Framework;
+
 using EldenRingItems.Projectiles.Melee;
+using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
 
 namespace EldenRingItems.Content.Items.Weapons.Melee
 {

diff --git a/Content/Items/Weapons/Melee/SwordOfNightAndFlame.cs b/Content/Items/Weapons/Melee/SwordOfNightAndFlame.cs
@@ -2,9 +2,11 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 using Terraria.Localization;
-using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
+
 using Microsoft.Xna.Framework;
 
+using EldenRingItems.Content.Items.Materials.SomberSmithingStones;
+
 namespace EldenRingItems.Content.Items.Weapons.Melee
 {
     public class SwordOfNightAndFlame : ModItem

diff --git a/EldenRingItems.cs b/EldenRingItems.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Terraria.ModLoader;
 
 namespace EldenRingItems
 {
-	// Please read https://github.com/tModLoader/tModLoader/wiki/Basic-tModLoader-Modding-Guide#mod-skeleton-contents for more information about the various files in a mod.
 	public class EldenRingItems : Mod
 	{
 
 	}
-}
+}