diff --git a/Common/Players/ERIPlayer.cs b/Common/Players/ERIPlayer.cs index 64fab3a..08c5a9f 100644 --- a/Common/Players/ERIPlayer.cs +++ b/Common/Players/ERIPlayer.cs @@ -12,7 +12,7 @@ public class ERIPlayer : ModPlayer { public bool Blessed = false; public bool WeaponImbueBlackFlame = false; - + public override void ResetEffects() { WeaponImbueBlackFlame = false; diff --git a/Content/Items/Weapons/Melee/BlasphemousBlade.cs b/Content/Items/Weapons/Melee/BlasphemousBlade.cs index 1282b4f..09fb516 100644 --- a/Content/Items/Weapons/Melee/BlasphemousBlade.cs +++ b/Content/Items/Weapons/Melee/BlasphemousBlade.cs @@ -29,8 +29,6 @@ public class BlasphemousBlade : ModItem int HurtCount = 0; public int BaseDamage { get; set; } = 55; - float BaseKnockBack = 5f; - float BaseShootSpeed = 14f; SoundStyle BladeIsChargedSound = new SoundStyle("EldenRingItems/Sounds/cs_c2010.832"); SoundStyle BladeIsDichargedSound = new SoundStyle("EldenRingItems/Sounds/cs_c2010.833"); @@ -43,7 +41,7 @@ public override void SetDefaults() Item.height = 92; Item.DamageType = DamageClass.Melee; Item.damage = BaseDamage; - Item.knockBack = BaseKnockBack; + Item.knockBack = 5f; Item.useTime = 30; Item.useAnimation = 30; Item.autoReuse = true; @@ -54,7 +52,7 @@ public override void SetDefaults() Item.rare = ItemRarityID.LightRed; Item.shoot = ModContent.ProjectileType(); - Item.shootSpeed = BaseShootSpeed; + Item.shootSpeed = 14f; } void ResetBladeBonus() @@ -64,11 +62,9 @@ void ResetBladeBonus() MadeChargedAttacks = 0; BladeIsCharged = false; Item.shoot = ModContent.ProjectileType(); - Item.damage = BaseDamage; - Item.knockBack = BaseKnockBack; - Item.shootSpeed = BaseShootSpeed; - Item.useTime = 30; - Item.useAnimation = 30; + Item.shootSpeed -= 6; + Item.useTime += 14; + Item.useAnimation += 14; } public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) @@ -113,10 +109,9 @@ public override void HoldStyle(Player player, Rectangle heldItemFrame) SoundEngine.PlaySound(BladeIsChargedSound); BladeIsCharged = true; Item.shoot = ProjectileID.InfernoFriendlyBlast; - Item.shootSpeed = 20f; - Item.knockBack = 9f; - Item.useTime = 16; - Item.useAnimation = 16; + Item.shootSpeed += 6f; + Item.useTime -= 14; + Item.useAnimation -= 14; } } } diff --git a/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs b/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs index 6fea03a..96ffd3e 100644 --- a/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs +++ b/Content/Items/Weapons/Melee/DarkMoonGreatsword.cs @@ -68,7 +68,6 @@ public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, void Reset(string addtext="") { - //Main.NewText(addtext+ "Resetting an interrupted charge DarkMoonGreatsword"); Charging = false; Item.UseSound = SoundID.Item1; MadeChargedAttacks = 0; diff --git a/Content/Items/Weapons/Melee/Moonveil.cs b/Content/Items/Weapons/Melee/Moonveil.cs index 901e305..713c54b 100644 --- a/Content/Items/Weapons/Melee/Moonveil.cs +++ b/Content/Items/Weapons/Melee/Moonveil.cs @@ -48,11 +48,8 @@ public override void SetDefaults() public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) { - Item.damage = BaseDamage; if (IsCharged) { - if (MadeChargedAttacks == 0) - Item.damage = BaseDamage * 3; if (MadeChargedAttacks == MAX_CHARGED_ATTACKS - 1) { Item.UseSound = SoundID.Item1; @@ -66,6 +63,12 @@ public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, return false; } + public override void ModifyWeaponDamage(Player player, ref StatModifier damage) + { + if (IsCharged) + damage *= 3; + } + public override void HoldStyle(Player player, Rectangle heldItemFrame) { if (Main.mouseRight && !IsCharged) @@ -78,6 +81,7 @@ public override void HoldStyle(Player player, Rectangle heldItemFrame) } } } + public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.NextBool(3)) diff --git a/EldenRingItems.csproj b/EldenRingItems.csproj index be4faae..3623108 100644 --- a/EldenRingItems.csproj +++ b/EldenRingItems.csproj @@ -10,6 +10,8 @@ + + diff --git a/Localization/en-US_Mods.EldenRingItems.hjson b/Localization/en-US_Mods.EldenRingItems.hjson index addafd4..c44be02 100644 --- a/Localization/en-US_Mods.EldenRingItems.hjson +++ b/Localization/en-US_Mods.EldenRingItems.hjson @@ -206,7 +206,7 @@ Items: { ''' When holding it in your hand, press [c/939393:right mouse button] to charge the katana (spends [c/4110a3:{0}] mana) When the katana becomes [c/0078bd:charged] it will make a special sound - Attacking from the [c/0078bd:charged state] deals 3 times more damage and also + Attacking from the [c/0078bd:charged state] deals [c/980000:3] times more damage and also unleashes a huge, super-fast arc that pierces through everything Attack from [c/939393:normal state] deals normal katana strikes [c/757575:Katana forged of glintstone.] diff --git a/Localization/ru-RU_Mods.EldenRingItems.hjson b/Localization/ru-RU_Mods.EldenRingItems.hjson index 98223c4..74e1ee4 100644 --- a/Localization/ru-RU_Mods.EldenRingItems.hjson +++ b/Localization/ru-RU_Mods.EldenRingItems.hjson @@ -206,7 +206,7 @@ Items: { ''' При взятии в руку, нажмите [c/939393:правую кнопку мыши] для зарядки меча (тратит [c/4110a3:{0}] маны) Когда меч станет [c/0078bd:заряжённым] он издаст специальный звук - Атака из [c/0078bd:заряжённого состояния] наносит в 3 раза больше урона, а также + Атака из [c/0078bd:заряжённого состояния] наносит в [c/980000:3] раза больше урона, а также выпускает огромную сверхбыструю дугу, которая пробивает всё Атака из [c/939393:обычного состояния] наносит обычные удары катаной [c/757575:Катана, выкованная из блестящего камня.] diff --git a/build.txt b/build.txt index 38427a8..42fb920 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ displayName = Elden Ring Items author = rzc0d3r -version = 0.0.9 \ No newline at end of file +version = 0.1.0 \ No newline at end of file diff --git a/description.txt b/description.txt index 3385b37..bad18b1 100644 --- a/description.txt +++ b/description.txt @@ -1 +1 @@ -Realizing items from Elden Ring into Terraria! +Realizing items from Elden Ring into Terraria! \ No newline at end of file