Update to v0.0.7

1. Added 3 new weapons: Great Katana, Sword of Night and Flame, Moonveil 2. Added a new consumable item: Black Flame Spell 2.1 Added a new buff: Weapon Inbue: Black Flame 2.2 Added a new debuff: Black Flame 3. Update for Rune Arc: * Now requires 60 mana to use 4. Update for Blasphemous blade * Accelerated sword charging by 2.08 times 5. Update for Dark Moon Greatsword. * Added "Ice Burn" debuff when hitting a target. * Reduced base damage from 100 to 85 * Increased attack time from 20 to 27 * Reduced the increase in base damage when forging darkness stones from 10 to 8 per level. 6. Update for Rivers of Blood * Resprite charged attack! * Removed the "Venom" debuff on the target on impact * Increased the amount of mana required to charge a katana from 50 to 60 * Reduced the number of invulnerability frames after a charged strike from 12 to 10 (DPS boost) * Reduced the volume of the charge sound by 25% * Reduced the sound volume of charged attacks by 15% * Reduced base damage from 65 to 60 * Reduced the base damage increase for Somber Smithing Stones [1-5] from 8 to 3 per level. * Reduced the base damage increase for the Somber Smithing Stones [6-10] from 8 to 7 for each level. * Increased the size of the charged attack by 15% * Added Hemmorhage: On normal hits, with a 16.6% chance, this mode can be activated, Under this mode, the katana deals twice as much damage. 7. Update for Blasphemous Blade * Reduced the increase in base damage when forging darkness stones [1-5] from 10 to 3 for each level 8. Updates for Giant Crusher * Reduced the attack time from 30 to 25 9. Fixed a bug in the crafting of Somber Smithing Stones [7] New Craft: 12 Titanium Bar / 12 Adamantite Bar Workstation: Mythril Anvil / Orichalcum Anvil 10. Fixed bug with sticking action on the right mouse button in all weapons!!! Bug description: you could use the right mouse button action only after discharging the weapon and ONE ADDITIONAL hit. Now you can immediately use the right mouse button action after discharging the weapon. 11. Clarified some descriptions of things in all localizations
rzc0d3r · Sep 18, 2024 · 0b8d8ea · 0b8d8ea
1 parent 6fe0db3
commit 0b8d8ea
Show file tree

Hide file tree

Showing 34 changed files with 1,177 additions and 61 deletions.
diff --git a/Common/GlobalsNPCs/DamageOverTimeGlobalNPC.cs b/Common/GlobalsNPCs/DamageOverTimeGlobalNPC.cs
@@ -0,0 +1,20 @@
+using Terraria;
+using Terraria.ModLoader;
+using EldenRingItems.Content.Buffs.StatDebuff;
+
+namespace ExampleMod.Common.GlobalNPCs
+{
+    internal class DamageOverTimeGlobalNPC : GlobalNPC
+    {
+        public override bool InstancePerEntity => true;
+
+        public override void UpdateLifeRegen(NPC npc, ref int damage)
+        {
+            if (npc.HasBuff<BlackFlameDebuff>())
+            {
+                damage = 5;
+                npc.lifeRegen -= damage*5*2; // damage * 4 per second
+            }
+        }
+    }
+}
diff --git a/Common/NPCLootDrop/NPCLootDrop.cs b/Common/NPCLootDrop/NPCLootDrop.cs
@@ -31,6 +31,11 @@ public override void ModifyNPCLoot(NPC npc, NPCLoot npcLoot)
                npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<RiversOfBlood>(), 12));
             if (npc.type == NPCID.BloodNautilus)
                 npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<RiversOfBlood>(), 4));
+            // Moonveil
+            if (npc.type == NPCID.BlueArmoredBonesSword)
+                npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<Moonveil>(), 12));
+            if (npc.type == NPCID.WyvernHead)
+                npcLoot.Add(ItemDropRule.Common(ModContent.ItemType<Moonveil>(), 25));
         }
     }
 }
diff --git a/Common/Players/ERIPlayer.cs b/Common/Players/ERIPlayer.cs
@@ -1,18 +1,45 @@
-using Terraria.ModLoader;
+using Microsoft.Xna.Framework;
+using Terraria;
+using Terraria.UI;
+using Terraria.ModLoader;
+using Terraria.ID;
+using EldenRingItems.Content.Buffs.StatDebuff;
 
 namespace EldenRingItems.Common.Players
 {
     public class ERIPlayer : ModPlayer
     {
-        public bool Blessed;
+        public bool Blessed = false;
+        public bool WeaponImbueBlackFlame = false;
 
         public override void ResetEffects()
         {
+             WeaponImbueBlackFlame = false;
         }
 
         public override void OnRespawn()
         {
             Blessed = false;
         }
+
+        public override void MeleeEffects(Item item, Rectangle hitbox)
+        {
+            if (WeaponImbueBlackFlame)
+            {
+                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));
+                    }
+            }
+        }
+
+        public override void OnHitNPCWithItem(Item item, NPC target, NPC.HitInfo hit, int damageDone)
+        { 
+            if (WeaponImbueBlackFlame && item.DamageType.CountsAsClass<MeleeDamageClass>())
+            {
+                target.AddBuff(ModContent.BuffType<BlackFlameDebuff>(), 60*3);
+            }
+        }
     }
 }
diff --git a/Content/Buffs/StatBuff/BlessingBuff.cs b/Content/Buffs/StatBuff/BlessingBuff.cs
@@ -0,0 +1,23 @@
+using Terraria;
+using Terraria.ModLoader;
+using EldenRingItems.Common.Players;
+using Terraria.ID;
+
+namespace EldenRingItems.Content.Buffs.StatBuff
+{
+    public class BlessingBuff : ModBuff
+    {
+        public override void SetStaticDefaults()
+        {
+            Main.buffNoSave[Type] = true;
+            Main.buffNoTimeDisplay[Type] = true;
+            Main.debuff[Type] = true;
+            BuffID.Sets.NurseCannotRemoveDebuff[Type] = true;
+        }
+
+        public override void Update(Player player, ref int buffIndex)
+        {
+            player.GetModPlayer<ERIPlayer>().Blessed = true;
+        }
+    }
+}
diff --git a/Content/Buffs/StatBuff/BlessingBuff.png b/Content/Buffs/StatBuff/BlessingBuff.png
diff --git a/Content/Buffs/StatBuff/WeaponImbueBlackFlame.cs b/Content/Buffs/StatBuff/WeaponImbueBlackFlame.cs
@@ -0,0 +1,22 @@
+using Terraria;
+using Terraria.ModLoader;
+using EldenRingItems.Common.Players;
+using Terraria.ID;
+
+namespace EldenRingItems.Content.Buffs.StatBuff
+{
+    public class WeaponImbueBlackFlame : ModBuff
+    {
+        public override void SetStaticDefaults()
+        {
+            BuffID.Sets.IsAFlaskBuff[Type] = true;
+            Main.meleeBuff[Type] = true;
+        }
+
+        public override void Update(Player player, ref int buffIndex)
+        {
+            player.GetModPlayer<ERIPlayer>().WeaponImbueBlackFlame = true;
+            player.MeleeEnchantActive = true;
+        }
+    }
+}
diff --git a/Content/Buffs/StatBuff/WeaponImbueBlackFlame.png b/Content/Buffs/StatBuff/WeaponImbueBlackFlame.png
diff --git a/Content/Buffs/StatDebuff/BlackFlameDebuff.cs b/Content/Buffs/StatDebuff/BlackFlameDebuff.cs
@@ -0,0 +1,46 @@
+using Terraria;
+using Terraria.ModLoader;
+using Microsoft.Xna.Framework;
+using Terraria.ID;
+using Microsoft.Xna.Framework.Graphics;
+using Terraria.DataStructures;
+
+namespace EldenRingItems.Content.Buffs.StatDebuff
+{
+    public class BlackFlameDebuff : ModBuff
+    {
+        public override void SetStaticDefaults()
+        {
+            Main.buffNoSave[Type] = true;
+            Main.debuff[Type] = true;
+        }
+
+        public override void Update(NPC npc, ref int buffIndex)
+        {
+            DrawEffects(npc);
+            if (npc.buffTime[buffIndex] <= 0)
+            {
+                npc.DelBuff(buffIndex);
+                buffIndex--;
+            }
+        }
+
+        public static void DrawEffects(NPC npc)
+        {
+            if (Main.rand.NextBool(2))
+            {
+                Dust dust = Dust.NewDustDirect(npc.position, npc.width, npc.height, DustID.Wraith);
+                dust.noGravity = true;
+                dust.velocity = new Vector2(0, Main.rand.NextFloat(-3f, -5f)) + npc.velocity;
+                for (int i = 0; i < 3; i++)
+                {
+                    Dust dust2 = Dust.NewDustDirect(npc.position + new Vector2(Main.rand.NextFloat(-10f, 10f), npc.height / 2), npc.width, npc.height, DustID.Wraith, Alpha:75);
+                    dust2.noGravity = true;
+                    dust2.velocity = new Vector2(Main.rand.NextFloat(-4f, 4f), Main.rand.NextFloat(-1f, -3f)) + npc.velocity;
+                    dust2.scale = 1.2f;
+                }
+                Lighting.AddLight(npc.position, 0.05f, 0.01f, 0.01f);
+            }
+        }
+    }
+}
diff --git a/Content/Buffs/StatDebuff/BlackFlameDebuff.png b/Content/Buffs/StatDebuff/BlackFlameDebuff.png
diff --git a/Content/Items/Accessories/RadahnsGreatRune.cs b/Content/Items/Accessories/RadahnsGreatRune.cs
@@ -3,6 +3,7 @@
 using Terraria;
 using Terraria.Localization;
 using EldenRingItems.Common.Players;
+using EldenRingItems.Content.Buffs.StatBuff;
 
 namespace EldenRingItems.Content.Items.Accessories
 {
@@ -24,8 +25,7 @@ public override void SetDefaults()
 
         public override void UpdateAccessory(Player player, bool hideVisual)
         {
-            ERIPlayer eri_player = player.GetModPlayer<ERIPlayer>();
-            if (eri_player.Blessed)
+            if (player.HasBuff<BlessingBuff>())
             {
                 player.statLifeMax2 += (player.statLifeMax / 100) * LifeBonus;
                 player.statManaMax2 += ManaBonus;

diff --git a/Content/Items/Consumables/BlackFlameSpell.cs b/Content/Items/Consumables/BlackFlameSpell.cs
@@ -0,0 +1,49 @@
+using Terraria.ID;
+using Terraria.ModLoader;
+using Terraria;
+using Terraria.Audio;
+using EldenRingItems.Content.Buffs.StatBuff;
+
+namespace EldenRingItems.Content.Items.Consumables
+{
+    internal class BlackFlameSpell : ModItem
+    {
+        public override void SetDefaults()
+        {
+            Item.width = 28;
+            Item.height = 30;
+            Item.value = Item.sellPrice(0, 8, 0, 0);
+            Item.rare = ItemRarityID.LightRed;
+            Item.consumable = true;
+            Item.UseSound = new SoundStyle("EldenRingItems/Sounds/UsingSpell");
+            Item.useTime = 130;
+            Item.useAnimation = 130;
+            Item.mana = 160;
+            Item.useStyle = ItemUseStyleID.HoldUp;
+            Item.maxStack = 1;
+            Item.buffType = ModContent.BuffType<WeaponImbueBlackFlame>();
+            Item.buffTime = 60 * 60 * 8; // 8m
+        }
+
+        public override bool CanUseItem(Player player)
+        { 
+            return !player.HasBuff(ModContent.BuffType<WeaponImbueBlackFlame>());
+        }
+
+        public override bool? UseItem(Player player)
+        {
+            if(player.HasBuff(ModContent.BuffType<WeaponImbueBlackFlame>()))
+                return false;
+            return true;
+        }
+
+        public override void AddRecipes()
+        {
+            Recipe r = CreateRecipe();
+            r.AddIngredient(ItemID.SpellTome);
+            r.AddIngredient(ItemID.SoulofNight, 25);
+            r.AddTile(TileID.Bookcases);
+            r.Register();
+        }
+    }
+}
diff --git a/Content/Items/Consumables/BlackFlameSpell.png b/Content/Items/Consumables/BlackFlameSpell.png
diff --git a/Content/Items/Consumables/RuneArc.cs b/Content/Items/Consumables/RuneArc.cs
@@ -4,7 +4,7 @@
 using Terraria.Audio;
 
 using EldenRingItems.Common.Players;
-using EldenRingItems.Content.Buffs;
+using EldenRingItems.Content.Buffs.StatBuff;
 
 namespace EldenRingItems.Content.Items.Consumables
 {
@@ -21,6 +21,7 @@ public override void SetDefaults()
             Item.useTime = 30;
             Item.useStyle = ItemUseStyleID.HoldUp;
             Item.maxStack = 9999;
+            Item.mana = 60;
         }
 
         public override bool CanUseItem(Player player)

diff --git a/Content/Items/Materials/SomberSmithingStones/SomberSmithingStones.cs b/Content/Items/Materials/SomberSmithingStones/SomberSmithingStones.cs
@@ -161,12 +161,12 @@ public override void SetDefaults()
         public override void AddRecipes()
         {
             Recipe r = CreateRecipe();
-            r.AddIngredient(ItemID.MythrilBar, 12);
+            r.AddIngredient(ItemID.TitaniumBar, 12);
             r.AddTile(TileID.MythrilAnvil);
             r.Register();
 
             Recipe r2 = CreateRecipe();
-            r2.AddIngredient(ItemID.OrichalcumBar, 12);
+            r2.AddIngredient(ItemID.AdamantiteBar, 12);
             r2.AddTile(TileID.MythrilAnvil);
             r2.Register();
         }

diff --git a/Content/Items/Weapons/Melee/BlasphemousBlade.cs b/Content/Items/Weapons/Melee/BlasphemousBlade.cs
@@ -99,7 +99,7 @@ public override void HoldStyle(Player player, Rectangle heldItemFrame)
                 if (HurtCount < 7)
                 {
                     HoldingCount++;
-                    if (HoldingCount == 25) // every 25 mouseRight-holding events processed
+                    if (HoldingCount == 12) // every 12 mouseRight-holding events processed
                     {
                         HoldingCount = 0;
                         HurtCount++;
@@ -136,7 +136,10 @@ protected UpgradedBlasphemousBlade(int upgradeLevel)
 
         public override void SetDefaults()
         {
-            BaseDamage += UpgradeLevel * 10;
+            if (UpgradeLevel <= 5)
+                BaseDamage += UpgradeLevel * 3;
+            else
+                BaseDamage += UpgradeLevel * 10;
             base.SetDefaults();
         }
 

diff --git a/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs b/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs
@@ -14,7 +14,7 @@ namespace EldenRingItems.Content.Items.Weapons.Melee
     public class DarkMoonGreatsword : ModItem
     {
         public override string Texture => "EldenRingItems/Content/Items/Weapons/Melee/DarkMoonGreatsword";
-        public int BaseDamage { get; set; } = 100;
+        public int BaseDamage { get; set; } = 85;
 
         SoundStyle IsChargedSound = new SoundStyle("EldenRingItems/Sounds/cs_c2010.649");
         SoundStyle ChargedUseSound = new SoundStyle("EldenRingItems/Sounds/cs_c2010.2318");
@@ -34,8 +34,8 @@ public override void SetDefaults()
             Item.DamageType = DamageClass.Melee;
             Item.damage = BaseDamage;
             Item.knockBack = 5f;
-            Item.useTime = 20;
-            Item.useAnimation = 20;
+            Item.useTime = 27;
+            Item.useAnimation = 27;
             Item.autoReuse = true;
             Item.useTurn = true;
             Item.useStyle = ItemUseStyleID.Swing;
@@ -50,15 +50,14 @@ public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source,
         {
             if (IsCharged)
             {
-                if (MadeChargedAttacks == MAX_CHARGED_ATTACKS)
+                if (MadeChargedAttacks == MAX_CHARGED_ATTACKS - 1)
                 {
+                    Item.UseSound = SoundID.Item1;
                     MadeChargedAttacks = 0;
                     IsCharged = false;
-                    return false;
                 }
-                if (MadeChargedAttacks == MAX_CHARGED_ATTACKS-1)
-                    Item.UseSound = SoundID.Item1;
-                MadeChargedAttacks++;
+                else
+                    MadeChargedAttacks++;
                 return true;
             }
             return false;
@@ -73,6 +72,7 @@ public override void HoldStyle(Player player, Rectangle heldItemFrame)
                     IsChargedSound.Volume = 0.6f;
                     SoundEngine.PlaySound(IsChargedSound);
                     Item.UseSound = ChargedUseSound;
+                    MadeChargedAttacks = 0;
                     IsCharged = true;
                 }
             }
@@ -95,6 +95,12 @@ public override bool PreDrawInInventory(SpriteBatch spriteBatch, Vector2 positio
             return false;
         }
 
+        public override void OnHitNPC(Player player, NPC target, NPC.HitInfo hit, int damageDone)
+        {
+            if (!target.HasBuff(BuffID.Frostburn))
+                target.AddBuff(BuffID.Frostburn, 60 * 15); // 15 seconds
+        }
+
         //public override bool PreDrawInWorld(SpriteBatch spriteBatch, Color lightColor, Color alphaColor, ref float rotation, ref float scale, int whoAmI)
         //{
         //    Texture2D texture;
@@ -136,7 +142,7 @@ protected UpgradedDarkMoonGreatsword(int upgradeLevel)
 
         public override void SetDefaults()
         {
-            BaseDamage += UpgradeLevel * 10;
+            BaseDamage += UpgradeLevel * 8;
             base.SetDefaults();
         }
 

diff --git a/Content/Items/Weapons/Melee/GiantCrusher.cs b/Content/Items/Weapons/Melee/GiantCrusher.cs
@@ -21,8 +21,8 @@ public override void SetDefaults()
             Item.DamageType = DamageClass.MeleeNoSpeed;
             Item.damage = BaseDamage;
             Item.knockBack = 9f;
-            Item.useTime = 30;
-            Item.useAnimation = 30;
+            Item.useTime = 25;
+            Item.useAnimation = 25;
             Item.autoReuse = true;
             Item.noMelee = true;
             Item.useTurn = true;