Fixes brace style (#248)

This commit is contained in:
Kamron Batman 2020-09-13 21:49:46 -07:00 • committed by GitHub
parent a236617ad9
commit 8149620b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1503 changed files with 28575 additions and 1717 deletions

View file

@ -72,7 +72,9 @@ namespace Server.Items
var version = reader.ReadInt();
if (ItemID == 0x2809) // Temporary solution for clients 7.0.0.0 and up
{
ItemID = 0x2808;
}
}
}
}

View file

@ -78,7 +78,10 @@ namespace Server.Items
public void AttackAnimation(Mobile from, Mobile to)
{
if (from.Body.IsHuman && !from.Mounted) from.Animate(33, 2, 1, true, true, 0);
if (from.Body.IsHuman && !from.Mounted)
{
@from.Animate(33, 2, 1, true, true, 0);
}
from.PlaySound(0x223);
from.MovingEffect(to, 0x2804, 5, 0, false, false);
@ -91,7 +94,9 @@ namespace Server.Items
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
if (m_Poison != null && m_PoisonCharges > 0)
{
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
}
public override void OnDoubleClick(Mobile from)

View file

@ -27,7 +27,9 @@ namespace Server.Items
)
{
if (quality == 2)
{
UsesRemaining *= 2;
}
return quality;
}
@ -78,7 +80,9 @@ namespace Server.Items
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
if (m_Poison != null && m_PoisonCharges > 0)
{
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
}
public override void Serialize(IGenericWriter writer)

View file

@ -80,7 +80,10 @@ namespace Server.Items
public void AttackAnimation(Mobile from, Mobile to)
{
if (from.Body.IsHuman) from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0);
if (from.Body.IsHuman)
{
@from.Animate(@from.Mounted ? 26 : 9, 7, 1, true, false, 0);
}
from.PlaySound(0x23A);
from.MovingEffect(to, 0x27AC, 1, 0, false, false);
@ -93,7 +96,9 @@ namespace Server.Items
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
if (m_Poison != null && m_PoisonCharges > 0)
{
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
}
public override bool OnEquip(Mobile from)

View file

@ -46,7 +46,9 @@ namespace Server.Items
public static void AttemptShoot(PlayerMobile from, INinjaWeapon weapon)
{
if (CanUseWeapon(from, weapon))
from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon);
{
@from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
private static void Shoot(PlayerMobile from, Mobile target, INinjaWeapon weapon)
@ -66,7 +68,9 @@ namespace Server.Items
ConsumeUse(weapon);
if (CombatCheck(from, target))
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, from, target, weapon);
{
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, @from, target, weapon);
}
Timer.DelayCall(TimeSpan.FromSeconds(2.5), ResetUsing, from);
}
@ -117,26 +121,36 @@ namespace Server.Items
else
{
if (weapon.UsesRemaining > 0)
{
if (weapon.Poison == null && ammo.Poison != null
|| weapon.Poison != null && ammo.Poison != null && weapon.Poison.Level != ammo.Poison.Level)
{
Unload(from, weapon);
Unload(@from, weapon);
need = Math.Min(MaxUses, ammo.UsesRemaining);
}
}
var poisonneeded = Math.Min(MaxUses - weapon.PoisonCharges, ammo.PoisonCharges);
weapon.UsesRemaining += need;
weapon.PoisonCharges += poisonneeded;
if (weapon.PoisonCharges > 0) weapon.Poison = ammo.Poison;
if (weapon.PoisonCharges > 0)
{
weapon.Poison = ammo.Poison;
}
ammo.PoisonCharges -= poisonneeded;
ammo.UsesRemaining -= need;
if (ammo.UsesRemaining < 1)
{
((Item)ammo).Delete();
else if (ammo.PoisonCharges < 1) ammo.Poison = null;
}
else if (ammo.PoisonCharges < 1)
{
ammo.Poison = null;
}
}
} // "else" here would mean they targeted "ammo" with 0 uses. undefined behavior.
}
@ -168,7 +182,10 @@ namespace Server.Items
{
if (!from.NinjaWepCooldown)
{
if (BasePotion.HasFreeHand(from)) return true;
if (BasePotion.HasFreeHand(from))
{
return true;
}
from.SendLocalizedMessage(weapon.NoFreeHandMessage);
}
@ -196,40 +213,73 @@ namespace Server.Items
var atSkillValue = attacker.Skills.Ninjitsu.Value;
var defSkillValue = defWeapon?.GetDefendSkillValue(attacker, defender) ?? 0.0;
if (defSkillValue <= -20.0) defSkillValue = -19.9;
if (defSkillValue <= -20.0)
{
defSkillValue = -19.9;
}
double attackValue = AosAttributes.GetValue(attacker, AosAttribute.AttackChance);
if (DivineFurySpell.UnderEffect(attacker)) attackValue += 10;
if (DivineFurySpell.UnderEffect(attacker))
{
attackValue += 10;
}
if (AnimalForm.UnderTransformation(attacker, typeof(GreyWolf)) ||
AnimalForm.UnderTransformation(attacker, typeof(BakeKitsune))) attackValue += 20;
AnimalForm.UnderTransformation(attacker, typeof(BakeKitsune)))
{
attackValue += 20;
}
if (HitLower.IsUnderAttackEffect(attacker)) attackValue -= 25;
if (HitLower.IsUnderAttackEffect(attacker))
{
attackValue -= 25;
}
if (attackValue > 45) attackValue = 45;
if (attackValue > 45)
{
attackValue = 45;
}
attackValue = (atSkillValue + 20.0) * (100 + attackValue);
double defenseValue = AosAttributes.GetValue(defender, AosAttribute.DefendChance);
if (DivineFurySpell.UnderEffect(defender)) defenseValue -= 20;
if (DivineFurySpell.UnderEffect(defender))
{
defenseValue -= 20;
}
if (HitLower.IsUnderDefenseEffect(defender)) defenseValue -= 25;
if (HitLower.IsUnderDefenseEffect(defender))
{
defenseValue -= 25;
}
var refBonus = 0;
if (Block.GetBonus(defender, ref refBonus)) defenseValue += refBonus;
if (Block.GetBonus(defender, ref refBonus))
{
defenseValue += refBonus;
}
if (Discordance.GetEffect(attacker, ref refBonus)) defenseValue -= refBonus;
if (Discordance.GetEffect(attacker, ref refBonus))
{
defenseValue -= refBonus;
}
if (defenseValue > 45) defenseValue = 45;
if (defenseValue > 45)
{
defenseValue = 45;
}
defenseValue = (defSkillValue + 20.0) * (100 + defenseValue);
var chance = attackValue / (defenseValue * 2.0);
if (chance < 0.02) chance = 0.02;
if (chance < 0.02)
{
chance = 0.02;
}
return attacker.CheckSkill(atkSkill.SkillName, chance);
}
@ -237,7 +287,10 @@ namespace Server.Items
private static void OnHit(Mobile from, Mobile target, INinjaWeapon weapon)
{
if (!from.CanBeHarmful(target))
{
return;
}
from.DoHarmful(target);
AOS.Damage(target, from, weapon.WeaponDamage, 100, 0, 0, 0, 0);
@ -245,13 +298,20 @@ namespace Server.Items
if (weapon.Poison != null && weapon.PoisonCharges > 0)
{
if (EvilOmenSpell.TryEndEffect(target))
target.ApplyPoison(from, Poison.GetPoison(weapon.Poison.Level + 1));
{
target.ApplyPoison(@from, Poison.GetPoison(weapon.Poison.Level + 1));
}
else
target.ApplyPoison(from, weapon.Poison);
{
target.ApplyPoison(@from, weapon.Poison);
}
weapon.PoisonCharges--;
if (weapon.PoisonCharges < 1) weapon.Poison = null;
if (weapon.PoisonCharges < 1)
{
weapon.Poison = null;
}
}
}
@ -260,11 +320,17 @@ namespace Server.Items
if (from is PlayerMobile player && WeaponIsValid(weapon, from))
{
if (targeted is Mobile mobile)
{
Shoot(player, mobile, weapon);
}
else if (targeted.GetType() == weapon.AmmoType)
{
Reload(player, weapon, (INinjaAmmo)targeted);
}
else
{
player.SendLocalizedMessage(weapon.WrongAmmoMessage);
}
}
}
@ -282,7 +348,9 @@ namespace Server.Items
public override void OnClick()
{
if (WeaponIsValid(weapon, Owner.From))
{
Owner.From.BeginTarget(10, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
}
@ -300,7 +368,10 @@ namespace Server.Items
public override void OnClick()
{
if (WeaponIsValid(weapon, Owner.From)) Unload(Owner.From, weapon);
if (WeaponIsValid(weapon, Owner.From))
{
Unload(Owner.From, weapon);
}
}
}
}

View file

@ -28,7 +28,9 @@ namespace Server.Items
)
{
if (quality == 2)
{
UsesRemaining *= 2;
}
return quality;
}
@ -79,7 +81,9 @@ namespace Server.Items
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
if (m_Poison != null && m_PoisonCharges > 0)
{
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
}
public override void Serialize(IGenericWriter writer)