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

C# 9 Cleanup (#325)

Browse source 
- [X] Removes EventArgs - not needed
- [X] Merges sequential checks
- [X] Removes redundant type declarations
This commit is contained in:
Kamron Batman 2020-11-27 00:29:21 -08:00 • committed by GitHub
parent 351611a23a
commit 3551d962f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
417 changed files with 2209 additions and 2213 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Misc/CharacterCreation.cs
View file

@ -10,7 +10,7 @@ namespace Server.Misc
public static class CharacterCreation
{
private static readonly CityInfo m_NewHavenInfo =
new CityInfo("New Haven", "The Bountiful Harvest Inn", 3503, 2574, 14, Map.Trammel);
new("New Haven", "The Bountiful Harvest Inn", 3503, 2574, 14, Map.Trammel);
private static Mobile m_Mobile;

36
Projects/UOContent/Misc/DoorGenerator.cs
View file

@ -7,32 +7,32 @@ namespace Server
{
private static readonly Rectangle2D[] m_BritRegions =
{
new Rectangle2D(new Point2D(250, 750), new Point2D(775, 1330)),
new Rectangle2D(new Point2D(525, 2095), new Point2D(925, 2430)),
new Rectangle2D(new Point2D(1025, 2155), new Point2D(1265, 2310)),
new Rectangle2D(new Point2D(1635, 2430), new Point2D(1705, 2508)),
new Rectangle2D(new Point2D(1775, 2605), new Point2D(2165, 2975)),
new Rectangle2D(new Point2D(1055, 3520), new Point2D(1570, 4075)),
new Rectangle2D(new Point2D(2860, 3310), new Point2D(3120, 3630)),
new Rectangle2D(new Point2D(2470, 1855), new Point2D(3950, 3045)),
new Rectangle2D(new Point2D(3425, 990), new Point2D(3900, 1455)),
new Rectangle2D(new Point2D(4175, 735), new Point2D(4840, 1600)),
new Rectangle2D(new Point2D(2375, 330), new Point2D(3100, 1045)),
new Rectangle2D(new Point2D(2100, 1090), new Point2D(2310, 1450)),
new Rectangle2D(new Point2D(1495, 1400), new Point2D(1550, 1475)),
new Rectangle2D(new Point2D(1085, 1520), new Point2D(1415, 1910)),
new Rectangle2D(new Point2D(1410, 1500), new Point2D(1745, 1795)),
new Rectangle2D(new Point2D(5120, 2300), new Point2D(6143, 4095))
new(new Point2D(250, 750), new Point2D(775, 1330)),
new(new Point2D(525, 2095), new Point2D(925, 2430)),
new(new Point2D(1025, 2155), new Point2D(1265, 2310)),
new(new Point2D(1635, 2430), new Point2D(1705, 2508)),
new(new Point2D(1775, 2605), new Point2D(2165, 2975)),
new(new Point2D(1055, 3520), new Point2D(1570, 4075)),
new(new Point2D(2860, 3310), new Point2D(3120, 3630)),
new(new Point2D(2470, 1855), new Point2D(3950, 3045)),
new(new Point2D(3425, 990), new Point2D(3900, 1455)),
new(new Point2D(4175, 735), new Point2D(4840, 1600)),
new(new Point2D(2375, 330), new Point2D(3100, 1045)),
new(new Point2D(2100, 1090), new Point2D(2310, 1450)),
new(new Point2D(1495, 1400), new Point2D(1550, 1475)),
new(new Point2D(1085, 1520), new Point2D(1415, 1910)),
new(new Point2D(1410, 1500), new Point2D(1745, 1795)),
new(new Point2D(5120, 2300), new Point2D(6143, 4095))
};
private static readonly Rectangle2D[] m_IlshRegions =
{
new Rectangle2D(new Point2D(0, 0), new Point2D(288 * 8, 200 * 8))
new(new Point2D(0, 0), new Point2D(288 * 8, 200 * 8))
};
private static readonly Rectangle2D[] m_MalasRegions =
{
new Rectangle2D(new Point2D(0, 0), new Point2D(320 * 8, 256 * 8))
new(new Point2D(0, 0), new Point2D(320 * 8, 256 * 8))
};
private static readonly int[] m_SouthFrames =

4
Projects/UOContent/Misc/Gifts/Winter2004/Winter2004.cs
View file

@ -5,8 +5,8 @@ namespace Server.Misc
{
public class WinterGiftGiver2004 : GiftGiver
{
public override DateTime Start => new DateTime(2004, 12, 24);
public override DateTime Finish => new DateTime(2005, 1, 1);
public override DateTime Start => new(2004, 12, 24);
public override DateTime Finish => new(2005, 1, 1);
public static void Initialize()
{

16
Projects/UOContent/Misc/Guild.cs
View file

@ -32,16 +32,16 @@ namespace Server.Guilds
{
public static RankDefinition[] Ranks =
{
new RankDefinition(1062963, 0, RankFlags.None), // Ronin
new RankDefinition(1062962, 1, RankFlags.Member), // Member
new RankDefinition(
new(1062963, 0, RankFlags.None), // Ronin
new(1062962, 1, RankFlags.Member), // Member
new(
1062961,
2,
RankFlags.Member | RankFlags.RemovePlayers | RankFlags.CanInvitePlayer | RankFlags.CanSetGuildTitle |
RankFlags.CanPromoteDemote
), // Emmissary
new RankDefinition(1062960, 3, RankFlags.Member | RankFlags.ControlWarStatus), // Warlord
new RankDefinition(1062959, 4, RankFlags.All) // Leader
), // Emmissary
new(1062960, 3, RankFlags.Member | RankFlags.ControlWarStatus), // Warlord
new(1062959, 4, RankFlags.All) // Leader
};
public RankDefinition(TextDefinition name, int rank, RankFlags flags)
@ -115,7 +115,7 @@ namespace Server.Guilds
}
}
public static Dictionary<string, AllianceInfo> Alliances { get; } = new Dictionary<string, AllianceInfo>();
public static Dictionary<string, AllianceInfo> Alliances { get; } = new();
public string Name { get; }
@ -1538,7 +1538,7 @@ namespace Server.Guilds
var votingMembers = 0;
for (var i = 0; Members != null && i < Members.Count; ++i)
for (var i = 0; i < Members?.Count; ++i)
{
var memb = Members[i];

274
Projects/UOContent/Misc/LanguageStatistics.cs
View file

@ -23,141 +23,141 @@ namespace Server.Misc
{
private static readonly InternationalCode[] InternationalCodes =
{
new InternationalCode("ARA", "Arabic", "Saudi Arabia", "العربية", "السعودية"),
new InternationalCode("ARI", "Arabic", "Iraq", "العربية", "العراق"),
new InternationalCode("ARE", "Arabic", "Egypt", "العربية", "مصر"),
new InternationalCode("ARL", "Arabic", "Libya", "العربية", "ليبيا"),
new InternationalCode("ARG", "Arabic", "Algeria", "العربية", "الجزائر"),
new InternationalCode("ARM", "Arabic", "Morocco", "العربية", "المغرب"),
new InternationalCode("ART", "Arabic", "Tunisia", "العربية", "تونس"),
new InternationalCode("ARO", "Arabic", "Oman", "العربية", "عمان"),
new InternationalCode("ARY", "Arabic", "Yemen", "العربية", "اليمن"),
new InternationalCode("ARS", "Arabic", "Syria", "العربية", "سورية"),
new InternationalCode("ARJ", "Arabic", "Jordan", "العربية", "الأردن"),
new InternationalCode("ARB", "Arabic", "Lebanon", "العربية", "لبنان"),
new InternationalCode("ARK", "Arabic", "Kuwait", "العربية", "الكويت"),
new InternationalCode("ARU", "Arabic", "U.A.E.", "العربية", "الامارات"),
new InternationalCode("ARH", "Arabic", "Bahrain", "العربية", "البحرين"),
new InternationalCode("ARQ", "Arabic", "Qatar", "العربية", "قطر"),
new InternationalCode("BGR", "Bulgarian", "Bulgaria", "Български", "България"),
new InternationalCode("CAT", "Catalan", "Spain", "Català", "Espanya"),
new InternationalCode("CHT", "Chinese", "Taiwan", "台語", "臺灣"),
new InternationalCode("CHS", "Chinese", "PRC", "中文", "中国"),
new InternationalCode("ZHH", "Chinese", "Hong Kong", "中文", "香港"),
new InternationalCode("ZHI", "Chinese", "Singapore", "中文", "新加坡"),
new InternationalCode("ZHM", "Chinese", "Macau", "中文", "澳門"),
new InternationalCode("CSY", "Czech", "Czech Republic", "Čeština", "Česká republika"),
new InternationalCode("DAN", "Danish", "Denmark", "Dansk", "Danmark"),
new InternationalCode("DEU", "German", "Germany", "Deutsch", "Deutschland"),
new InternationalCode("DES", "German", "Switzerland", "Deutsch", "der Schweiz"),
new InternationalCode("DEA", "German", "Austria", "Deutsch", "Österreich"),
new InternationalCode("DEL", "German", "Luxembourg", "Deutsch", "Luxembourg"),
new InternationalCode("DEC", "German", "Liechtenstein", "Deutsch", "Liechtenstein"),
new InternationalCode("ELL", "Greek", "Greece", "Ελληνικά", "Ελλάδα"),
new InternationalCode("ENU", "English", "United States"),
new InternationalCode("ENG", "English", "United Kingdom"),
new InternationalCode("ENA", "English", "Australia"),
new InternationalCode("ENC", "English", "Canada"),
new InternationalCode("ENZ", "English", "New Zealand"),
new InternationalCode("ENI", "English", "Ireland"),
new InternationalCode("ENS", "English", "South Africa"),
new InternationalCode("ENJ", "English", "Jamaica"),
new InternationalCode("ENB", "English", "Caribbean"),
new InternationalCode("ENL", "English", "Belize"),
new InternationalCode("ENT", "English", "Trinidad"),
new InternationalCode("ENW", "English", "Zimbabwe"),
new InternationalCode("ENP", "English", "Philippines"),
new InternationalCode("ESP", "Spanish", "Spain (Traditional Sort)", "Español", "España (tipo tradicional)"),
new InternationalCode("ESM", "Spanish", "Mexico", "Español", "México"),
new InternationalCode("ESN", "Spanish", "Spain (International Sort)", "Español", "España (tipo internacional)"),
new InternationalCode("ESG", "Spanish", "Guatemala", "Español", "Guatemala"),
new InternationalCode("ESC", "Spanish", "Costa Rica", "Español", "Costa Rica"),
new InternationalCode("ESA", "Spanish", "Panama", "Español", "Panama"),
new InternationalCode("ESD", "Spanish", "Dominican Republic", "Español", "Republica Dominicana"),
new InternationalCode("ESV", "Spanish", "Venezuela", "Español", "Venezuela"),
new InternationalCode("ESO", "Spanish", "Colombia", "Español", "Colombia"),
new InternationalCode("ESR", "Spanish", "Peru", "Español", "Peru"),
new InternationalCode("ESS", "Spanish", "Argentina", "Español", "Argentina"),
new InternationalCode("ESF", "Spanish", "Ecuador", "Español", "Ecuador"),
new InternationalCode("ESL", "Spanish", "Chile", "Español", "Chile"),
new InternationalCode("ESY", "Spanish", "Uruguay", "Español", "Uruguay"),
new InternationalCode("ESZ", "Spanish", "Paraguay", "Español", "Paraguay"),
new InternationalCode("ESB", "Spanish", "Bolivia", "Español", "Bolivia"),
new InternationalCode("ESE", "Spanish", "El Salvador", "Español", "El Salvador"),
new InternationalCode("ESH", "Spanish", "Honduras", "Español", "Honduras"),
new InternationalCode("ESI", "Spanish", "Nicaragua", "Español", "Nicaragua"),
new InternationalCode("ESU", "Spanish", "Puerto Rico", "Español", "Puerto Rico"),
new InternationalCode("FIN", "Finnish", "Finland", "Suomi", "Suomi"),
new InternationalCode("FRA", "French", "France", "Français", "France"),
new InternationalCode("FRB", "French", "Belgium", "Français", "Belgique"),
new InternationalCode("FRC", "French", "Canada", "Français", "Canada"),
new InternationalCode("FRS", "French", "Switzerland", "Français", "Suisse"),
new InternationalCode("FRL", "French", "Luxembourg", "Français", "Luxembourg"),
new InternationalCode("FRM", "French", "Monaco", "Français", "Monaco"),
new InternationalCode("HEB", "Hebrew", "Israel", "עִבְרִית", "ישׂראל"),
new InternationalCode("HUN", "Hungarian", "Hungary", "Magyar", "Magyarország"),
new InternationalCode("ISL", "Icelandic", "Iceland", "Íslenska", "Ísland"),
new InternationalCode("ITA", "Italian", "Italy", "Italiano", "Italia"),
new InternationalCode("ITS", "Italian", "Switzerland", "Italiano", "Svizzera"),
new InternationalCode("JPN", "Japanese", "Japan", "日本語", "日本"),
new InternationalCode("KOR", "Korean (Extended Wansung)", "Korea", "한국어", "한국"),
new InternationalCode("NLD", "Dutch", "Netherlands", "Nederlands", "Nederland"),
new InternationalCode("NLB", "Dutch", "Belgium", "Nederlands", "België"),
new InternationalCode("NOR", "Norwegian", "Norway (Bokmål)", "Norsk", "Norge (Bokmål)"),
new InternationalCode("NON", "Norwegian", "Norway (Nynorsk)", "Norsk", "Norge (Nynorsk)"),
new InternationalCode("PLK", "Polish", "Poland", "Polski", "Polska"),
new InternationalCode("PTB", "Portuguese", "Brazil", "Português", "Brasil"),
new InternationalCode("PTG", "Portuguese", "Portugal", "Português", "Brasil"),
new InternationalCode("ROM", "Romanian", "Romania", "Limba Română", "România"),
new InternationalCode("RUS", "Russian", "Russia", "Русский", "Россия"),
new InternationalCode("HRV", "Croatian", "Croatia", "Hrvatski", "Hrvatska"),
new InternationalCode("SRL", "Serbian", "Serbia (Latin)", "Srpski", "Srbija i Crna Gora"),
new InternationalCode("SRB", "Serbian", "Serbia (Cyrillic)", "Српски", "Србија и Црна Гора"),
new InternationalCode("SKY", "Slovak", "Slovakia", "Slovenčina", "Slovensko"),
new InternationalCode("SQI", "Albanian", "Albania", "Shqip", "Shqipëria"),
new InternationalCode("SVE", "Swedish", "Sweden", "Svenska", "Sverige"),
new InternationalCode("SVF", "Swedish", "Finland", "Svenska", "Finland"),
new InternationalCode("THA", "Thai", "Thailand", "ภาษาไทย", "ประเทศไทย"),
new InternationalCode("TRK", "Turkish", "Turkey", "Türkçe", "Türkiye"),
new InternationalCode("URP", "Urdu", "Pakistan", "اردو", "پاکستان"),
new InternationalCode("IND", "Indonesian", "Indonesia", "Bahasa Indonesia", "Indonesia"),
new InternationalCode("UKR", "Ukrainian", "Ukraine", "Українська", "Украина"),
new InternationalCode("BEL", "Belarusian", "Belarus", "Беларускі", "Беларусь"),
new InternationalCode("SLV", "Slovene", "Slovenia", "Slovenščina", "Slovenija"),
new InternationalCode("ETI", "Estonian", "Estonia", "Eesti", "Eesti"),
new InternationalCode("LVI", "Latvian", "Latvia", "Latviešu", "Latvija"),
new InternationalCode("LTH", "Lithuanian", "Lithuania", "Lietuvių", "Lietuva"),
new InternationalCode("LTC", "Classic Lithuanian", "Lithuania", "Lietuviškai", "Lietuva"),
new InternationalCode("FAR", "Farsi", "Iran", "فارسى", "ايران"),
new InternationalCode("VIT", "Vietnamese", "Viet Nam", "tiếng Việt", "Việt Nam"),
new InternationalCode("HYE", "Armenian", "Armenia", "Հայերէն", "Հայաստան"),
new InternationalCode("AZE", "Azeri", "Azerbaijan (Latin)", "Azərbaycanca", "Azərbaycan"),
new InternationalCode("AZE", "Azeri", "Azerbaijan (Cyrillic)", "Азәрбајҹанҹа", "Азәрбајҹан"),
new InternationalCode("EUQ", "Basque", "Spain", "Euskera", "Espainia"),
new InternationalCode("MKI", "Macedonian", "Macedonia", "Македонски", "Македонија"),
new InternationalCode("AFK", "Afrikaans", "South Africa", "Afrikaans", "Republiek van Suid-Afrika"),
new InternationalCode("KAT", "Georgian", "Georgia", "ქართული", "საკარტველო"),
new InternationalCode("FOS", "Faeroese", "Faeroe Islands", "Føroyska", "Føroya"),
new InternationalCode("HIN", "Hindi", "India", "हिन्दी", "भारत"),
new InternationalCode("MSL", "Malay", "Malaysia", "Bahasa melayu", "Malaysia"),
new InternationalCode("MSB", "Malay", "Brunei Darussalam", "Bahasa melayu", "Negara Brunei Darussalam"),
new InternationalCode("KAZ", "Kazak", "Kazakstan", "Қазақ", "Қазақстан"),
new InternationalCode("SWK", "Swahili", "Kenya", "Kiswahili", "Kenya"),
new InternationalCode("UZB", "Uzbek", "Uzbekistan (Latin)", "O'zbek", "O'zbekiston"),
new InternationalCode("UZB", "Uzbek", "Uzbekistan (Cyrillic)", "Ўзбек", "Ўзбекистон"),
new InternationalCode("TAT", "Tatar", "Tatarstan", "Татарча", "Татарстан"),
new InternationalCode("BEN", "Bengali", "India", "বাংলা", "ভারত"),
new InternationalCode("PAN", "Punjabi", "India", "ਪੰਜਾਬੀ", "ਭਾਰਤ"),
new InternationalCode("GUJ", "Gujarati", "India", "ગુજરાતી", "ભારત"),
new InternationalCode("ORI", "Oriya", "India", "ଓଡ଼ିଆ", "ଭାରତ"),
new InternationalCode("TAM", "Tamil", "India", "தமிழ்", "இந்தியா"),
new InternationalCode("TEL", "Telugu", "India", "తెలుగు", "భారత"),
new InternationalCode("KAN", "Kannada", "India", "ಕನ್ನಡ", "ಭಾರತ"),
new InternationalCode("MAL", "Malayalam", "India", "മലയാളം", "ഭാരത"),
new InternationalCode("ASM", "Assamese", "India", "অসমিয়া", "Bhārat"), // missing correct country name
new InternationalCode("MAR", "Marathi", "India", "मराठी", "भारत"),
new InternationalCode("SAN", "Sanskrit", "India", "संस्कृत", "भारतम्"),
new InternationalCode("KOK", "Konkani", "India", "कोंकणी", "भारत")
new("ARA", "Arabic", "Saudi Arabia", "العربية", "السعودية"),
new("ARI", "Arabic", "Iraq", "العربية", "العراق"),
new("ARE", "Arabic", "Egypt", "العربية", "مصر"),
new("ARL", "Arabic", "Libya", "العربية", "ليبيا"),
new("ARG", "Arabic", "Algeria", "العربية", "الجزائر"),
new("ARM", "Arabic", "Morocco", "العربية", "المغرب"),
new("ART", "Arabic", "Tunisia", "العربية", "تونس"),
new("ARO", "Arabic", "Oman", "العربية", "عمان"),
new("ARY", "Arabic", "Yemen", "العربية", "اليمن"),
new("ARS", "Arabic", "Syria", "العربية", "سورية"),
new("ARJ", "Arabic", "Jordan", "العربية", "الأردن"),
new("ARB", "Arabic", "Lebanon", "العربية", "لبنان"),
new("ARK", "Arabic", "Kuwait", "العربية", "الكويت"),
new("ARU", "Arabic", "U.A.E.", "العربية", "الامارات"),
new("ARH", "Arabic", "Bahrain", "العربية", "البحرين"),
new("ARQ", "Arabic", "Qatar", "العربية", "قطر"),
new("BGR", "Bulgarian", "Bulgaria", "Български", "България"),
new("CAT", "Catalan", "Spain", "Català", "Espanya"),
new("CHT", "Chinese", "Taiwan", "台語", "臺灣"),
new("CHS", "Chinese", "PRC", "中文", "中国"),
new("ZHH", "Chinese", "Hong Kong", "中文", "香港"),
new("ZHI", "Chinese", "Singapore", "中文", "新加坡"),
new("ZHM", "Chinese", "Macau", "中文", "澳門"),
new("CSY", "Czech", "Czech Republic", "Čeština", "Česká republika"),
new("DAN", "Danish", "Denmark", "Dansk", "Danmark"),
new("DEU", "German", "Germany", "Deutsch", "Deutschland"),
new("DES", "German", "Switzerland", "Deutsch", "der Schweiz"),
new("DEA", "German", "Austria", "Deutsch", "Österreich"),
new("DEL", "German", "Luxembourg", "Deutsch", "Luxembourg"),
new("DEC", "German", "Liechtenstein", "Deutsch", "Liechtenstein"),
new("ELL", "Greek", "Greece", "Ελληνικά", "Ελλάδα"),
new("ENU", "English", "United States"),
new("ENG", "English", "United Kingdom"),
new("ENA", "English", "Australia"),
new("ENC", "English", "Canada"),
new("ENZ", "English", "New Zealand"),
new("ENI", "English", "Ireland"),
new("ENS", "English", "South Africa"),
new("ENJ", "English", "Jamaica"),
new("ENB", "English", "Caribbean"),
new("ENL", "English", "Belize"),
new("ENT", "English", "Trinidad"),
new("ENW", "English", "Zimbabwe"),
new("ENP", "English", "Philippines"),
new("ESP", "Spanish", "Spain (Traditional Sort)", "Español", "España (tipo tradicional)"),
new("ESM", "Spanish", "Mexico", "Español", "México"),
new("ESN", "Spanish", "Spain (International Sort)", "Español", "España (tipo internacional)"),
new("ESG", "Spanish", "Guatemala", "Español", "Guatemala"),
new("ESC", "Spanish", "Costa Rica", "Español", "Costa Rica"),
new("ESA", "Spanish", "Panama", "Español", "Panama"),
new("ESD", "Spanish", "Dominican Republic", "Español", "Republica Dominicana"),
new("ESV", "Spanish", "Venezuela", "Español", "Venezuela"),
new("ESO", "Spanish", "Colombia", "Español", "Colombia"),
new("ESR", "Spanish", "Peru", "Español", "Peru"),
new("ESS", "Spanish", "Argentina", "Español", "Argentina"),
new("ESF", "Spanish", "Ecuador", "Español", "Ecuador"),
new("ESL", "Spanish", "Chile", "Español", "Chile"),
new("ESY", "Spanish", "Uruguay", "Español", "Uruguay"),
new("ESZ", "Spanish", "Paraguay", "Español", "Paraguay"),
new("ESB", "Spanish", "Bolivia", "Español", "Bolivia"),
new("ESE", "Spanish", "El Salvador", "Español", "El Salvador"),
new("ESH", "Spanish", "Honduras", "Español", "Honduras"),
new("ESI", "Spanish", "Nicaragua", "Español", "Nicaragua"),
new("ESU", "Spanish", "Puerto Rico", "Español", "Puerto Rico"),
new("FIN", "Finnish", "Finland", "Suomi", "Suomi"),
new("FRA", "French", "France", "Français", "France"),
new("FRB", "French", "Belgium", "Français", "Belgique"),
new("FRC", "French", "Canada", "Français", "Canada"),
new("FRS", "French", "Switzerland", "Français", "Suisse"),
new("FRL", "French", "Luxembourg", "Français", "Luxembourg"),
new("FRM", "French", "Monaco", "Français", "Monaco"),
new("HEB", "Hebrew", "Israel", "עִבְרִית", "ישׂראל"),
new("HUN", "Hungarian", "Hungary", "Magyar", "Magyarország"),
new("ISL", "Icelandic", "Iceland", "Íslenska", "Ísland"),
new("ITA", "Italian", "Italy", "Italiano", "Italia"),
new("ITS", "Italian", "Switzerland", "Italiano", "Svizzera"),
new("JPN", "Japanese", "Japan", "日本語", "日本"),
new("KOR", "Korean (Extended Wansung)", "Korea", "한국어", "한국"),
new("NLD", "Dutch", "Netherlands", "Nederlands", "Nederland"),
new("NLB", "Dutch", "Belgium", "Nederlands", "België"),
new("NOR", "Norwegian", "Norway (Bokmål)", "Norsk", "Norge (Bokmål)"),
new("NON", "Norwegian", "Norway (Nynorsk)", "Norsk", "Norge (Nynorsk)"),
new("PLK", "Polish", "Poland", "Polski", "Polska"),
new("PTB", "Portuguese", "Brazil", "Português", "Brasil"),
new("PTG", "Portuguese", "Portugal", "Português", "Brasil"),
new("ROM", "Romanian", "Romania", "Limba Română", "România"),
new("RUS", "Russian", "Russia", "Русский", "Россия"),
new("HRV", "Croatian", "Croatia", "Hrvatski", "Hrvatska"),
new("SRL", "Serbian", "Serbia (Latin)", "Srpski", "Srbija i Crna Gora"),
new("SRB", "Serbian", "Serbia (Cyrillic)", "Српски", "Србија и Црна Гора"),
new("SKY", "Slovak", "Slovakia", "Slovenčina", "Slovensko"),
new("SQI", "Albanian", "Albania", "Shqip", "Shqipëria"),
new("SVE", "Swedish", "Sweden", "Svenska", "Sverige"),
new("SVF", "Swedish", "Finland", "Svenska", "Finland"),
new("THA", "Thai", "Thailand", "ภาษาไทย", "ประเทศไทย"),
new("TRK", "Turkish", "Turkey", "Türkçe", "Türkiye"),
new("URP", "Urdu", "Pakistan", "اردو", "پاکستان"),
new("IND", "Indonesian", "Indonesia", "Bahasa Indonesia", "Indonesia"),
new("UKR", "Ukrainian", "Ukraine", "Українська", "Украина"),
new("BEL", "Belarusian", "Belarus", "Беларускі", "Беларусь"),
new("SLV", "Slovene", "Slovenia", "Slovenščina", "Slovenija"),
new("ETI", "Estonian", "Estonia", "Eesti", "Eesti"),
new("LVI", "Latvian", "Latvia", "Latviešu", "Latvija"),
new("LTH", "Lithuanian", "Lithuania", "Lietuvių", "Lietuva"),
new("LTC", "Classic Lithuanian", "Lithuania", "Lietuviškai", "Lietuva"),
new("FAR", "Farsi", "Iran", "فارسى", "ايران"),
new("VIT", "Vietnamese", "Viet Nam", "tiếng Việt", "Việt Nam"),
new("HYE", "Armenian", "Armenia", "Հայերէն", "Հայաստան"),
new("AZE", "Azeri", "Azerbaijan (Latin)", "Azərbaycanca", "Azərbaycan"),
new("AZE", "Azeri", "Azerbaijan (Cyrillic)", "Азәрбајҹанҹа", "Азәрбајҹан"),
new("EUQ", "Basque", "Spain", "Euskera", "Espainia"),
new("MKI", "Macedonian", "Macedonia", "Македонски", "Македонија"),
new("AFK", "Afrikaans", "South Africa", "Afrikaans", "Republiek van Suid-Afrika"),
new("KAT", "Georgian", "Georgia", "ქართული", "საკარტველო"),
new("FOS", "Faeroese", "Faeroe Islands", "Føroyska", "Føroya"),
new("HIN", "Hindi", "India", "हिन्दी", "भारत"),
new("MSL", "Malay", "Malaysia", "Bahasa melayu", "Malaysia"),
new("MSB", "Malay", "Brunei Darussalam", "Bahasa melayu", "Negara Brunei Darussalam"),
new("KAZ", "Kazak", "Kazakstan", "Қазақ", "Қазақстан"),
new("SWK", "Swahili", "Kenya", "Kiswahili", "Kenya"),
new("UZB", "Uzbek", "Uzbekistan (Latin)", "O'zbek", "O'zbekiston"),
new("UZB", "Uzbek", "Uzbekistan (Cyrillic)", "Ўзбек", "Ўзбекистон"),
new("TAT", "Tatar", "Tatarstan", "Татарча", "Татарстан"),
new("BEN", "Bengali", "India", "বাংলা", "ভারত"),
new("PAN", "Punjabi", "India", "ਪੰਜਾਬੀ", "ਭਾਰਤ"),
new("GUJ", "Gujarati", "India", "ગુજરાતી", "ભારત"),
new("ORI", "Oriya", "India", "ଓଡ଼ିଆ", "ଭାରତ"),
new("TAM", "Tamil", "India", "தமிழ்", "இந்தியா"),
new("TEL", "Telugu", "India", "తెలుగు", "భారత"),
new("KAN", "Kannada", "India", "ಕನ್ನಡ", "ಭಾರತ"),
new("MAL", "Malayalam", "India", "മലയാളം", "ഭാരത"),
new("ASM", "Assamese", "India", "অসমিয়া", "Bhārat"), // missing correct country name
new("MAR", "Marathi", "India", "मराठी", "भारत"),
new("SAN", "Sanskrit", "India", "संस्कृत", "भारतम्"),
new("KOK", "Konkani", "India", "कोंकणी", "भारत")
};
private static readonly bool DefaultLocalNames = false;
@ -166,7 +166,7 @@ namespace Server.Misc
private static string GetFormattedInfo(string code)
{
if (code == null || code.Length != 3)
if (code?.Length != 3)
{
return $"Unknown code {code}";
}
@ -341,7 +341,7 @@ namespace Server.Misc
private class InternationalCodeComparer : IComparer<InternationalCodeCounter>
{
public static readonly InternationalCodeComparer Instance = new InternationalCodeComparer();
public static readonly InternationalCodeComparer Instance = new();
public int Compare(InternationalCodeCounter x, InternationalCodeCounter y)
{

188
Projects/UOContent/Misc/LootPack.cs
View file

@ -9,82 +9,82 @@ namespace Server
{
public static readonly LootPackItem[] Gold =
{
new LootPackItem(typeof(Gold), 1)
new(typeof(Gold), 1)
};
public static readonly LootPackItem[] Instruments =
{
new LootPackItem(typeof(BaseInstrument), 1)
new(typeof(BaseInstrument), 1)
};
public static readonly LootPackItem[] LowScrollItems =
{
new LootPackItem(typeof(ClumsyScroll), 1)
new(typeof(ClumsyScroll), 1)
};
public static readonly LootPackItem[] MedScrollItems =
{
new LootPackItem(typeof(ArchCureScroll), 1)
new(typeof(ArchCureScroll), 1)
};
public static readonly LootPackItem[] HighScrollItems =
{
new LootPackItem(typeof(SummonAirElementalScroll), 1)
new(typeof(SummonAirElementalScroll), 1)
};
public static readonly LootPackItem[] GemItems =
{
new LootPackItem(typeof(Amber), 1)
new(typeof(Amber), 1)
};
public static readonly LootPackItem[] PotionItems =
{
new LootPackItem(typeof(AgilityPotion), 1),
new LootPackItem(typeof(StrengthPotion), 1),
new LootPackItem(typeof(RefreshPotion), 1),
new LootPackItem(typeof(LesserCurePotion), 1),
new LootPackItem(typeof(LesserHealPotion), 1),
new LootPackItem(typeof(LesserPoisonPotion), 1)
new(typeof(AgilityPotion), 1),
new(typeof(StrengthPotion), 1),
new(typeof(RefreshPotion), 1),
new(typeof(LesserCurePotion), 1),
new(typeof(LesserHealPotion), 1),
new(typeof(LesserPoisonPotion), 1)
};
public static readonly LootPackItem[] OldMagicItems =
{
new LootPackItem(typeof(BaseJewel), 1),
new LootPackItem(typeof(BaseArmor), 4),
new LootPackItem(typeof(BaseWeapon), 3),
new LootPackItem(typeof(BaseRanged), 1),
new LootPackItem(typeof(BaseShield), 1)
new(typeof(BaseJewel), 1),
new(typeof(BaseArmor), 4),
new(typeof(BaseWeapon), 3),
new(typeof(BaseRanged), 1),
new(typeof(BaseShield), 1)
};
public static readonly LootPack LowScrolls = new LootPack(
public static readonly LootPack LowScrolls = new(
new[]
{
new LootPackEntry(false, LowScrollItems, 100.00, 1)
}
);
public static readonly LootPack MedScrolls = new LootPack(
public static readonly LootPack MedScrolls = new(
new[]
{
new LootPackEntry(false, MedScrollItems, 100.00, 1)
}
);
public static readonly LootPack HighScrolls = new LootPack(
public static readonly LootPack HighScrolls = new(
new[]
{
new LootPackEntry(false, HighScrollItems, 100.00, 1)
}
);
public static readonly LootPack Gems = new LootPack(
public static readonly LootPack Gems = new(
new[]
{
new LootPackEntry(false, GemItems, 100.00, 1)
}
);
public static readonly LootPack Potions = new LootPack(
public static readonly LootPack Potions = new(
new[]
{
new LootPackEntry(false, PotionItems, 100.00, 1)
@ -193,14 +193,14 @@ namespace Server
public static readonly LootPackItem[] AosMagicItemsRichType1 =
{
new LootPackItem(typeof(BaseWeapon), 211),
new LootPackItem(typeof(BaseRanged), 53),
new LootPackItem(typeof(BaseArmor), 303),
new LootPackItem(typeof(BaseShield), 39),
new LootPackItem(typeof(BaseJewel), 158)
new(typeof(BaseWeapon), 211),
new(typeof(BaseRanged), 53),
new(typeof(BaseArmor), 303),
new(typeof(BaseShield), 39),
new(typeof(BaseJewel), 158)
};
public static readonly LootPack MlRich = new LootPack(
public static readonly LootPack MlRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "4d50+450"),
@ -213,86 +213,86 @@ namespace Server
public static readonly LootPackItem[] AosMagicItemsPoor =
{
new LootPackItem(typeof(BaseWeapon), 3),
new LootPackItem(typeof(BaseRanged), 1),
new LootPackItem(typeof(BaseArmor), 4),
new LootPackItem(typeof(BaseShield), 1),
new LootPackItem(typeof(BaseJewel), 2)
new(typeof(BaseWeapon), 3),
new(typeof(BaseRanged), 1),
new(typeof(BaseArmor), 4),
new(typeof(BaseShield), 1),
new(typeof(BaseJewel), 2)
};
public static readonly LootPackItem[] AosMagicItemsMeagerType1 =
{
new LootPackItem(typeof(BaseWeapon), 56),
new LootPackItem(typeof(BaseRanged), 14),
new LootPackItem(typeof(BaseArmor), 81),
new LootPackItem(typeof(BaseShield), 11),
new LootPackItem(typeof(BaseJewel), 42)
new(typeof(BaseWeapon), 56),
new(typeof(BaseRanged), 14),
new(typeof(BaseArmor), 81),
new(typeof(BaseShield), 11),
new(typeof(BaseJewel), 42)
};
public static readonly LootPackItem[] AosMagicItemsMeagerType2 =
{
new LootPackItem(typeof(BaseWeapon), 28),
new LootPackItem(typeof(BaseRanged), 7),
new LootPackItem(typeof(BaseArmor), 40),
new LootPackItem(typeof(BaseShield), 5),
new LootPackItem(typeof(BaseJewel), 21)
new(typeof(BaseWeapon), 28),
new(typeof(BaseRanged), 7),
new(typeof(BaseArmor), 40),
new(typeof(BaseShield), 5),
new(typeof(BaseJewel), 21)
};
public static readonly LootPackItem[] AosMagicItemsAverageType1 =
{
new LootPackItem(typeof(BaseWeapon), 90),
new LootPackItem(typeof(BaseRanged), 23),
new LootPackItem(typeof(BaseArmor), 130),
new LootPackItem(typeof(BaseShield), 17),
new LootPackItem(typeof(BaseJewel), 68)
new(typeof(BaseWeapon), 90),
new(typeof(BaseRanged), 23),
new(typeof(BaseArmor), 130),
new(typeof(BaseShield), 17),
new(typeof(BaseJewel), 68)
};
public static readonly LootPackItem[] AosMagicItemsAverageType2 =
{
new LootPackItem(typeof(BaseWeapon), 54),
new LootPackItem(typeof(BaseRanged), 13),
new LootPackItem(typeof(BaseArmor), 77),
new LootPackItem(typeof(BaseShield), 10),
new LootPackItem(typeof(BaseJewel), 40)
new(typeof(BaseWeapon), 54),
new(typeof(BaseRanged), 13),
new(typeof(BaseArmor), 77),
new(typeof(BaseShield), 10),
new(typeof(BaseJewel), 40)
};
public static readonly LootPackItem[] AosMagicItemsRichType2 =
{
new LootPackItem(typeof(BaseWeapon), 170),
new LootPackItem(typeof(BaseRanged), 43),
new LootPackItem(typeof(BaseArmor), 245),
new LootPackItem(typeof(BaseShield), 32),
new LootPackItem(typeof(BaseJewel), 128)
new(typeof(BaseWeapon), 170),
new(typeof(BaseRanged), 43),
new(typeof(BaseArmor), 245),
new(typeof(BaseShield), 32),
new(typeof(BaseJewel), 128)
};
public static readonly LootPackItem[] AosMagicItemsFilthyRichType1 =
{
new LootPackItem(typeof(BaseWeapon), 219),
new LootPackItem(typeof(BaseRanged), 55),
new LootPackItem(typeof(BaseArmor), 315),
new LootPackItem(typeof(BaseShield), 41),
new LootPackItem(typeof(BaseJewel), 164)
new(typeof(BaseWeapon), 219),
new(typeof(BaseRanged), 55),
new(typeof(BaseArmor), 315),
new(typeof(BaseShield), 41),
new(typeof(BaseJewel), 164)
};
public static readonly LootPackItem[] AosMagicItemsFilthyRichType2 =
{
new LootPackItem(typeof(BaseWeapon), 239),
new LootPackItem(typeof(BaseRanged), 60),
new LootPackItem(typeof(BaseArmor), 343),
new LootPackItem(typeof(BaseShield), 90),
new LootPackItem(typeof(BaseJewel), 45)
new(typeof(BaseWeapon), 239),
new(typeof(BaseRanged), 60),
new(typeof(BaseArmor), 343),
new(typeof(BaseShield), 90),
new(typeof(BaseJewel), 45)
};
public static readonly LootPackItem[] AosMagicItemsUltraRich =
{
new LootPackItem(typeof(BaseWeapon), 276),
new LootPackItem(typeof(BaseRanged), 69),
new LootPackItem(typeof(BaseArmor), 397),
new LootPackItem(typeof(BaseShield), 52),
new LootPackItem(typeof(BaseJewel), 207)
new(typeof(BaseWeapon), 276),
new(typeof(BaseRanged), 69),
new(typeof(BaseArmor), 397),
new(typeof(BaseShield), 52),
new(typeof(BaseJewel), 207)
};
public static readonly LootPack SePoor = new LootPack(
public static readonly LootPack SePoor = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "2d10+20"),
@ -301,7 +301,7 @@ namespace Server
}
);
public static readonly LootPack SeMeager = new LootPack(
public static readonly LootPack SeMeager = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "4d10+40"),
@ -311,7 +311,7 @@ namespace Server
}
);
public static readonly LootPack SeAverage = new LootPack(
public static readonly LootPack SeAverage = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "8d10+100"),
@ -322,7 +322,7 @@ namespace Server
}
);
public static readonly LootPack SeRich = new LootPack(
public static readonly LootPack SeRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "15d10+225"),
@ -333,7 +333,7 @@ namespace Server
}
);
public static readonly LootPack SeFilthyRich = new LootPack(
public static readonly LootPack SeFilthyRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "3d100+400"),
@ -344,7 +344,7 @@ namespace Server
}
);
public static readonly LootPack SeUltraRich = new LootPack(
public static readonly LootPack SeUltraRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "6d100+600"),
@ -358,7 +358,7 @@ namespace Server
}
);
public static readonly LootPack SeSuperBoss = new LootPack(
public static readonly LootPack SeSuperBoss = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "10d100+800"),
@ -376,7 +376,7 @@ namespace Server
}
);
public static readonly LootPack AosPoor = new LootPack(
public static readonly LootPack AosPoor = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "1d10+10"),
@ -385,7 +385,7 @@ namespace Server
}
);
public static readonly LootPack AosMeager = new LootPack(
public static readonly LootPack AosMeager = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "3d10+20"),
@ -395,7 +395,7 @@ namespace Server
}
);
public static readonly LootPack AosAverage = new LootPack(
public static readonly LootPack AosAverage = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "5d10+50"),
@ -406,7 +406,7 @@ namespace Server
}
);
public static readonly LootPack AosRich = new LootPack(
public static readonly LootPack AosRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "10d10+150"),
@ -417,7 +417,7 @@ namespace Server
}
);
public static readonly LootPack AosFilthyRich = new LootPack(
public static readonly LootPack AosFilthyRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "2d100+200"),
@ -429,7 +429,7 @@ namespace Server
}
);
public static readonly LootPack AosUltraRich = new LootPack(
public static readonly LootPack AosUltraRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "5d100+500"),
@ -443,7 +443,7 @@ namespace Server
}
);
public static readonly LootPack AosSuperBoss = new LootPack(
public static readonly LootPack AosSuperBoss = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "5d100+500"),
@ -461,7 +461,7 @@ namespace Server
}
);
public static readonly LootPack OldPoor = new LootPack(
public static readonly LootPack OldPoor = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "1d25"),
@ -469,7 +469,7 @@ namespace Server
}
);
public static readonly LootPack OldMeager = new LootPack(
public static readonly LootPack OldMeager = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "5d10+25"),
@ -479,7 +479,7 @@ namespace Server
}
);
public static readonly LootPack OldAverage = new LootPack(
public static readonly LootPack OldAverage = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "10d10+50"),
@ -490,7 +490,7 @@ namespace Server
}
);
public static readonly LootPack OldRich = new LootPack(
public static readonly LootPack OldRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "10d10+250"),
@ -501,7 +501,7 @@ namespace Server
}
);
public static readonly LootPack OldFilthyRich = new LootPack(
public static readonly LootPack OldFilthyRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "2d125+400"),
@ -513,7 +513,7 @@ namespace Server
}
);
public static readonly LootPack OldUltraRich = new LootPack(
public static readonly LootPack OldUltraRich = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "5d100+500"),
@ -527,7 +527,7 @@ namespace Server
}
);
public static readonly LootPack OldSuperBoss = new LootPack(
public static readonly LootPack OldSuperBoss = new(
new[]
{
new LootPackEntry(true, Gold, 100.00, "5d100+500"),

2
Projects/UOContent/Misc/NameList.cs
View file

@ -9,7 +9,7 @@ namespace Server
public class NameList
{
private static readonly Dictionary<string, NameList> m_Table =
new Dictionary<string, NameList>(StringComparer.OrdinalIgnoreCase);
new(StringComparer.OrdinalIgnoreCase);
[JsonPropertyName("type")] public string Type { get; set; }

2
Projects/UOContent/Misc/Notoriety.cs
View file

@ -365,7 +365,7 @@ namespace Server.Misc
return Notoriety.Murderer;
}
if (target.Criminal && target.Map != null && (target.Map.Rules & MapRules.HarmfulRestrictions) == 0)
if (target.Criminal && (target.Map?.Rules & MapRules.HarmfulRestrictions) == 0)
{
return Notoriety.Criminal;
}

2
Projects/UOContent/Misc/RegenRates.cs
View file

@ -254,7 +254,7 @@ namespace Server.Misc
private static double GetArmorMeditationValue(BaseArmor ar)
{
if (ar == null || ar.ArmorAttributes.MageArmor != 0 || ar.Attributes.SpellChanneling != 0)
if (ar?.ArmorAttributes.MageArmor != 0 || ar.Attributes.SpellChanneling != 0)
{
return 0.0;
}

78
Projects/UOContent/Misc/ResourceInfo.cs
View file

@ -417,7 +417,7 @@ namespace Server.Items
{
private static readonly CraftResourceInfo[] m_MetalInfo =
{
new CraftResourceInfo(
new(
0x000,
1053109,
"Iron",
@ -427,7 +427,7 @@ namespace Server.Items
typeof(IronOre),
typeof(Granite)
),
new CraftResourceInfo(
new(
0x973,
1053108,
"Dull Copper",
@ -437,7 +437,7 @@ namespace Server.Items
typeof(DullCopperOre),
typeof(DullCopperGranite)
),
new CraftResourceInfo(
new(
0x966,
1053107,
"Shadow Iron",
@ -447,7 +447,7 @@ namespace Server.Items
typeof(ShadowIronOre),
typeof(ShadowIronGranite)
),
new CraftResourceInfo(
new(
0x96D,
1053106,
"Copper",
@ -457,7 +457,7 @@ namespace Server.Items
typeof(CopperOre),
typeof(CopperGranite)
),
new CraftResourceInfo(
new(
0x972,
1053105,
"Bronze",
@ -467,7 +467,7 @@ namespace Server.Items
typeof(BronzeOre),
typeof(BronzeGranite)
),
new CraftResourceInfo(
new(
0x8A5,
1053104,
"Gold",
@ -477,7 +477,7 @@ namespace Server.Items
typeof(GoldOre),
typeof(GoldGranite)
),
new CraftResourceInfo(
new(
0x979,
1053103,
"Agapite",
@ -487,7 +487,7 @@ namespace Server.Items
typeof(AgapiteOre),
typeof(AgapiteGranite)
),
new CraftResourceInfo(
new(
0x89F,
1053102,
"Verite",
@ -497,7 +497,7 @@ namespace Server.Items
typeof(VeriteOre),
typeof(VeriteGranite)
),
new CraftResourceInfo(
new(
0x8AB,
1053101,
"Valorite",
@ -511,7 +511,7 @@ namespace Server.Items
private static readonly CraftResourceInfo[] m_ScaleInfo =
{
new CraftResourceInfo(
new(
0x66D,
1053129,
"Red Scales",
@ -519,7 +519,7 @@ namespace Server.Items
CraftResource.RedScales,
typeof(RedScales)
),
new CraftResourceInfo(
new(
0x8A8,
1053130,
"Yellow Scales",
@ -527,7 +527,7 @@ namespace Server.Items
CraftResource.YellowScales,
typeof(YellowScales)
),
new CraftResourceInfo(
new(
0x455,
1053131,
"Black Scales",
@ -535,7 +535,7 @@ namespace Server.Items
CraftResource.BlackScales,
typeof(BlackScales)
),
new CraftResourceInfo(
new(
0x851,
1053132,
"Green Scales",
@ -543,7 +543,7 @@ namespace Server.Items
CraftResource.GreenScales,
typeof(GreenScales)
),
new CraftResourceInfo(
new(
0x8FD,
1053133,
"White Scales",
@ -551,7 +551,7 @@ namespace Server.Items
CraftResource.WhiteScales,
typeof(WhiteScales)
),
new CraftResourceInfo(
new(
0x8B0,
1053134,
"Blue Scales",
@ -563,7 +563,7 @@ namespace Server.Items
private static readonly CraftResourceInfo[] m_LeatherInfo =
{
new CraftResourceInfo(
new(
0x000,
1049353,
"Normal",
@ -572,7 +572,7 @@ namespace Server.Items
typeof(Leather),
typeof(Hides)
),
new CraftResourceInfo(
new(
0x283,
1049354,
"Spined",
@ -581,7 +581,7 @@ namespace Server.Items
typeof(SpinedLeather),
typeof(SpinedHides)
),
new CraftResourceInfo(
new(
0x227,
1049355,
"Horned",
@ -590,7 +590,7 @@ namespace Server.Items
typeof(HornedLeather),
typeof(HornedHides)
),
new CraftResourceInfo(
new(
0x1C1,
1049356,
"Barbed",
@ -603,7 +603,7 @@ namespace Server.Items
private static readonly CraftResourceInfo[] m_AOSLeatherInfo =
{
new CraftResourceInfo(
new(
0x000,
1049353,
"Normal",
@ -612,7 +612,7 @@ namespace Server.Items
typeof(Leather),
typeof(Hides)
),
new CraftResourceInfo(
new(
0x8AC,
1049354,
"Spined",
@ -621,7 +621,7 @@ namespace Server.Items
typeof(SpinedLeather),
typeof(SpinedHides)
),
new CraftResourceInfo(
new(
0x845,
1049355,
"Horned",
@ -630,7 +630,7 @@ namespace Server.Items
typeof(HornedLeather),
typeof(HornedHides)
),
new CraftResourceInfo(
new(
0x851,
1049356,
"Barbed",
@ -643,7 +643,7 @@ namespace Server.Items
private static readonly CraftResourceInfo[] m_WoodInfo =
{
new CraftResourceInfo(
new(
0x000,
1011542,
"Normal",
@ -652,7 +652,7 @@ namespace Server.Items
typeof(Log),
typeof(Board)
),
new CraftResourceInfo(
new(
0x7DA,
1072533,
"Oak",
@ -661,7 +661,7 @@ namespace Server.Items
typeof(OakLog),
typeof(OakBoard)
),
new CraftResourceInfo(
new(
0x4A7,
1072534,
"Ash",
@ -670,7 +670,7 @@ namespace Server.Items
typeof(AshLog),
typeof(AshBoard)
),
new CraftResourceInfo(
new(
0x4A8,
1072535,
"Yew",
@ -679,7 +679,7 @@ namespace Server.Items
typeof(YewLog),
typeof(YewBoard)
),
new CraftResourceInfo(
new(
0x4A9,
1072536,
"Heartwood",
@ -688,7 +688,7 @@ namespace Server.Items
typeof(HeartwoodLog),
typeof(HeartwoodBoard)
),
new CraftResourceInfo(
new(
0x4AA,
1072538,
"Bloodwood",
@ -697,7 +697,7 @@ namespace Server.Items
typeof(BloodwoodLog),
typeof(BloodwoodBoard)
),
new CraftResourceInfo(
new(
0x47F,
1072539,
"Frostwood",
@ -934,15 +934,15 @@ namespace Server.Items
// No changes to it should be required for custom resources.
public class OreInfo
{
public static readonly OreInfo Iron = new OreInfo(0, 0x000, "Iron");
public static readonly OreInfo DullCopper = new OreInfo(1, 0x973, "Dull Copper");
public static readonly OreInfo ShadowIron = new OreInfo(2, 0x966, "Shadow Iron");
public static readonly OreInfo Copper = new OreInfo(3, 0x96D, "Copper");
public static readonly OreInfo Bronze = new OreInfo(4, 0x972, "Bronze");
public static readonly OreInfo Gold = new OreInfo(5, 0x8A5, "Gold");
public static readonly OreInfo Agapite = new OreInfo(6, 0x979, "Agapite");
public static readonly OreInfo Verite = new OreInfo(7, 0x89F, "Verite");
public static readonly OreInfo Valorite = new OreInfo(8, 0x8AB, "Valorite");
public static readonly OreInfo Iron = new(0, 0x000, "Iron");
public static readonly OreInfo DullCopper = new(1, 0x973, "Dull Copper");
public static readonly OreInfo ShadowIron = new(2, 0x966, "Shadow Iron");
public static readonly OreInfo Copper = new(3, 0x96D, "Copper");
public static readonly OreInfo Bronze = new(4, 0x972, "Bronze");
public static readonly OreInfo Gold = new(5, 0x8A5, "Gold");
public static readonly OreInfo Agapite = new(6, 0x979, "Agapite");
public static readonly OreInfo Verite = new(7, 0x89F, "Verite");
public static readonly OreInfo Valorite = new(8, 0x8AB, "Valorite");
public OreInfo(int level, int hue, string name)
{

4
Projects/UOContent/Misc/ShardPoller.cs
View file

@ -10,7 +10,7 @@ namespace Server.Misc
{
public class ShardPoller : Item
{
private static readonly List<ShardPoller> m_ActivePollers = new List<ShardPoller>();
private static readonly List<ShardPoller> m_ActivePollers = new();
private bool m_Active;
private string m_Title;
@ -621,7 +621,7 @@ namespace Server.Misc
public class ShardPollPrompt : Prompt
{
private static readonly Regex m_UrlRegex =
new Regex(@"\[url(?:=(.*?))?\](.*?)\[/url\]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
new(@"\[url(?:=(.*?))?\](.*?)\[/url\]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
private readonly ShardPollOption m_Option;
private readonly ShardPoller m_Poller;

4
Projects/UOContent/Misc/TextDefinition.cs
View file

@ -83,9 +83,9 @@ namespace Server
}
}
public static implicit operator TextDefinition(int v) => new TextDefinition(v);
public static implicit operator TextDefinition(int v) => new(v);
public static implicit operator TextDefinition(string s) => new TextDefinition(s);
public static implicit operator TextDefinition(string s) => new(s);
public static implicit operator int(TextDefinition m) => m?.Number ?? 0;

10
Projects/UOContent/Misc/Titles.cs
View file

@ -35,7 +35,7 @@ namespace Server.Misc
private static readonly FameEntry[] m_FameEntries =
{
new FameEntry(
new(
1249,
new[]
{
@ -52,7 +52,7 @@ namespace Server.Misc
new KarmaEntry(10000, "The Trustworthy {0}")
}
),
new FameEntry(
new(
2499,
new[]
{
@ -69,7 +69,7 @@ namespace Server.Misc
new KarmaEntry(10000, "The Estimable {0}")
}
),
new FameEntry(
new(
4999,
new[]
{
@ -86,7 +86,7 @@ namespace Server.Misc
new KarmaEntry(10000, "The Great {0}")
}
),
new FameEntry(
new(
9999,
new[]
{
@ -103,7 +103,7 @@ namespace Server.Misc
new KarmaEntry(10000, "The Glorious {0}")
}
),
new FameEntry(
new(
10000,
new[]
{

34
Projects/UOContent/Misc/VendorGenerator.cs
View file

@ -9,27 +9,27 @@ namespace Server
{
private static readonly Rectangle2D[] m_BritRegions =
{
new Rectangle2D(new Point2D(250, 750), new Point2D(775, 1330)),
new Rectangle2D(new Point2D(525, 2095), new Point2D(925, 2430)),
new Rectangle2D(new Point2D(1025, 2155), new Point2D(1265, 2310)),
new Rectangle2D(new Point2D(1635, 2430), new Point2D(1705, 2508)),
new Rectangle2D(new Point2D(1775, 2605), new Point2D(2165, 2975)),
new Rectangle2D(new Point2D(1055, 3520), new Point2D(1570, 4075)),
new Rectangle2D(new Point2D(2860, 3310), new Point2D(3120, 3630)),
new Rectangle2D(new Point2D(2470, 1855), new Point2D(3950, 3045)),
new Rectangle2D(new Point2D(3425, 990), new Point2D(3900, 1455)),
new Rectangle2D(new Point2D(4175, 735), new Point2D(4840, 1600)),
new Rectangle2D(new Point2D(2375, 330), new Point2D(3100, 1045)),
new Rectangle2D(new Point2D(2100, 1090), new Point2D(2310, 1450)),
new Rectangle2D(new Point2D(1495, 1400), new Point2D(1550, 1475)),
new Rectangle2D(new Point2D(1085, 1520), new Point2D(1415, 1910)),
new Rectangle2D(new Point2D(1410, 1500), new Point2D(1745, 1795)),
new Rectangle2D(new Point2D(5120, 2300), new Point2D(6143, 4095))
new(new Point2D(250, 750), new Point2D(775, 1330)),
new(new Point2D(525, 2095), new Point2D(925, 2430)),
new(new Point2D(1025, 2155), new Point2D(1265, 2310)),
new(new Point2D(1635, 2430), new Point2D(1705, 2508)),
new(new Point2D(1775, 2605), new Point2D(2165, 2975)),
new(new Point2D(1055, 3520), new Point2D(1570, 4075)),
new(new Point2D(2860, 3310), new Point2D(3120, 3630)),
new(new Point2D(2470, 1855), new Point2D(3950, 3045)),
new(new Point2D(3425, 990), new Point2D(3900, 1455)),
new(new Point2D(4175, 735), new Point2D(4840, 1600)),
new(new Point2D(2375, 330), new Point2D(3100, 1045)),
new(new Point2D(2100, 1090), new Point2D(2310, 1450)),
new(new Point2D(1495, 1400), new Point2D(1550, 1475)),
new(new Point2D(1085, 1520), new Point2D(1415, 1910)),
new(new Point2D(1410, 1500), new Point2D(1745, 1795)),
new(new Point2D(5120, 2300), new Point2D(6143, 4095))
};
private static readonly Rectangle2D[] m_IlshRegions =
{
new Rectangle2D(new Point2D(0, 0), new Point2D(288 * 8, 200 * 8))
new(new Point2D(0, 0), new Point2D(288 * 8, 200 * 8))
};
private static Dictionary<Point2D, ShopInfo> m_ShopTable;

2
Projects/UOContent/Misc/Weather.cs
View file

@ -8,7 +8,7 @@ namespace Server.Misc
public class Weather
{
private static Map[] m_Facets;
private static readonly Dictionary<Map, List<Weather>> m_WeatherByFacet = new Dictionary<Map, List<Weather>>();
private static readonly Dictionary<Map, List<Weather>> m_WeatherByFacet = new();
private bool m_Active;
private bool m_ExtremeTemperature;

2
Projects/UOContent/Misc/WebStatus.cs
View file

@ -17,7 +17,7 @@ namespace Server.Misc
private static string _StatusPage = string.Empty;
private static byte[] _StatusBuffer = Array.Empty<byte>();
private static readonly object _StatusLock = new object();
private static readonly object _StatusLock = new();
public StatusPage()
: base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(60.0)) =>