warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes badly formatted files (#878)

Browse source
This commit is contained in:
Kamron Batman 2021-12-05 08:56:09 -08:00 • committed by GitHub
parent b3c153eae3
commit 1cf7b6c056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 274 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Shields/Artifacts/Aegis.cs
View file

@ -16,7 +16,7 @@ namespace Server.Items
{
}
public override int LabelNumber => 1061602; // <EFBFBD>gis
public override int LabelNumber => 1061602; // Ægis
public override int ArtifactRarity => 11;
public override int BasePhysicalResistance => 15;

34
Projects/UOContent/Items/Shields/BaseShield.cs
View file

@ -78,16 +78,7 @@ namespace Server.Items
absorbed = 2;
}
int wear;
if (weapon.Type == WeaponType.Bashing)
{
wear = absorbed / 2;
}
else
{
wear = Utility.Random(2);
}
var wear = weapon.Type == WeaponType.Bashing ? absorbed / 2 : Utility.Random(2);
if (wear > 0 && MaxHitPoints > 0)
{
@ -110,11 +101,8 @@ namespace Server.Items
if (Parent is Mobile mobile)
{
mobile.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061121
); // Your equipment is severely damaged.
// Your equipment is severely damaged.
mobile.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061121);
}
}
else
@ -128,7 +116,7 @@ namespace Server.Items
return 0;
}
if (!(Parent is Mobile owner))
if (Parent is not Mobile owner)
{
return damage;
}
@ -141,13 +129,6 @@ namespace Server.Items
chance = 0.01;
}
/*
FORMULA: Displayed AR = ((Parrying Skill * Base AR of Shield) <EFBFBD> 200) + 1
FORMULA: % Chance of Blocking = parry skill - (shieldAR * 2)
FORMULA: Melee Damage Absorbed = (AR of Shield) / 2 | Archery Damage Absorbed = AR of Shield
*/
if (owner.CheckSkill(SkillName.Parry, chance))
{
damage -= Math.Min(damage, weapon.Skill == SkillName.Archery ? (int)ar : (int)(ar / 2.0));
@ -177,11 +158,8 @@ namespace Server.Items
{
MaxHitPoints -= wear;
((Mobile)Parent).LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061121
); // Your equipment is severely damaged.
// Your equipment is severely damaged.
((Mobile)Parent).LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061121);
}
else
{

2
Projects/UOContent/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -281,7 +281,7 @@ namespace Server.Items
if (Sextant.Format(loc, map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth))
{
fmt = $"{yLat}°{yMins}'{(ySouth ? "S" : "N")},{xLong}°{xMins}'{(xEast ? "E" : "W")}";
fmt = $"{yLat}° {yMins}'{(ySouth ? "S" : "N")}, {xLong}°{xMins}'{(xEast ? "E" : "W")}";
}
else
{

2
Projects/UOContent/Items/Skill Items/Fishing/Misc/Sextant.cs
View file

@ -33,7 +33,7 @@ namespace Server.Items
if (Format(from.Location, from.Map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth))
{
var location = $"{yLat}<EFBFBD> {yMins}'{(ySouth ? "S" : "N")}, {xLong}<7D> {xMins}'{(xEast ? "E" : "W")}";
var location = $"{yLat}° {yMins}'{(ySouth ? "S" : "N")}, {xLong}' {xMins}'{(xEast ? "E" : "W")}";
from.LocalOverheadMessage(MessageType.Regular, from.SpeechHue, false, location);
}
}

2
Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs
View file

@ -123,7 +123,7 @@ namespace Server.Items
{
}
public override int LabelNumber => 1075198; // Dawn<EFBFBD>s Music Box
public override int LabelNumber => 1075198; // Dawn's Music Box
public List<MusicName> Tracks { get; private set; }

2
Projects/UOContent/Items/Special/8th Anniversary Items/DupresShield.cs
View file

@ -18,7 +18,7 @@ namespace Server.Items
{
}
public override int LabelNumber => 1075196; // Dupre<EFBFBD>s Shield
public override int LabelNumber => 1075196; // Dupre's Shield
public override int BasePhysicalResistance => 1;
public override int BaseFireResistance => 0;

2
Projects/UOContent/Items/Special/Gifts/ShaminoCrossbow.cs
View file

@ -18,7 +18,7 @@ namespace Server.Items
{
}
public override int LabelNumber => 1062915; // Shamino<EFBFBD>s Best Crossbow
public override int LabelNumber => 1062915; // Shamino's Best Crossbow
public override int InitMinHits => 255;
public override int InitMaxHits => 255;

4
Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs
View file

@ -118,9 +118,9 @@ namespace Server.Items
1077396, // Noooo!
1077397, // Please don't eat me... *whimper*
1077405, // Not the face!
1077406, // Ahhhhhh! My foot<EFBFBD>s gone!
1077406, // Ahhhhhh! My foot's gone!
1077407, // Please. No! I have gingerkids!
1077408, // No, no! I<EFBFBD>m really made of poison. Really.
1077408, // No, no! I'm really made of poison. Really.
1077409 // Run, run as fast as you can! You can't catch me! I'm the gingerbread man!
};

9
Projects/UOContent/Items/Wands/BaseWand.cs
View file

@ -34,14 +34,7 @@ namespace Server.Items
[SerializableField(1)]
private int _charges;
public BaseWand(WandEffect effect, int minCharges, int maxCharges) : base(
Utility.RandomList(
0xDF2,
0xDF3,
0xDF4,
0xDF5
)
)
public BaseWand(WandEffect effect, int minCharges, int maxCharges) : base(0xDF2 + Utility.Random(4))
{
Weight = 1.0;
_wandEffect = effect;

2
Projects/UOContent/Items/Weapons/Abilities/InfectiousStrike.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
/// <summary>
/// This special move represents a significant change to the use of poisons in Age of Shadows.
/// Now, only certain weapon types <20> those that have Infectious Strike as an available special move <20> will be able to be
/// Now, only certain weapon types, those that have Infectious Strike as an available special move will be able to be
/// poisoned.
/// Targets will no longer be poisoned at random when hit by poisoned weapons.
/// Instead, the wielder must use this ability to deliver the venom.

2
Projects/UOContent/Items/Weapons/Abilities/ShadowStrike.cs
View file

@ -2,7 +2,7 @@ namespace Server.Items
{
/// <summary>
/// This powerful ability requires secondary skills to activate.
/// Successful use of Shadowstrike deals extra damage to the target <20> and renders the attacker invisible!
/// Successful use of Shadowstrike deals extra damage to the target and renders the attacker invisible!
/// Only those who are adept at the art of stealth will be able to use this ability.
/// </summary>
public class ShadowStrike : WeaponAbility