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

fix: Fixes crafter deserialize, cleans up bandages, and codegens misc items (#1350)

Browse source
This commit is contained in:
Kamron Batman 2023-02-25 00:54:12 -08:00 • committed by GitHub
parent 22376cfc20
commit 42012538bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 994 additions and 1262 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Projects/UOContent/Engines/Bulk Orders/Books/BulkOrderBook.cs
View file

@ -4,7 +4,6 @@ using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Multis;
using Server.Network;
using Server.Prompts;
namespace Server.Engines.BulkOrders

1
Projects/UOContent/Engines/ConPVP/DuelContext.cs
View file

@ -6,7 +6,6 @@ using Server.Factions;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Network;
using Server.Regions;
using Server.Spells;
using Server.Spells.Bushido;

1
Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs
View file

@ -4,7 +4,6 @@ using System.Text;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Network;
using Server.Targeting;
namespace Server.Engines.ConPVP

1
Projects/UOContent/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -4,7 +4,6 @@ using System.Text;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.ConPVP
{

1
Projects/UOContent/Engines/ConPVP/Participant.cs
View file

@ -1,7 +1,6 @@
using System;
using System.Text;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.ConPVP
{

1
Projects/UOContent/Engines/ConPVP/Tournament.cs
View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Text;
using Server.Factions;
using Server.Items;
using Server.Network;
using Server.Regions;
namespace Server.Engines.ConPVP

2
Projects/UOContent/Engines/ConPVP/TournamentBracketItem.cs
View file

@ -1,5 +1,3 @@
using Server.Network;
namespace Server.Engines.ConPVP
{
public class TournamentBracketItem : Item

1
Projects/UOContent/Engines/ConPVP/TournamentRegistrar.cs
View file

@ -1,7 +1,6 @@
using System;
using Server.Factions;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.ConPVP
{

1
Projects/UOContent/Engines/ConPVP/TournamentSignupItem.cs
View file

@ -1,7 +1,6 @@
using System.Collections.Generic;
using Server.Factions;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.ConPVP
{

1
Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Mobiles;
using Server.Network;
using Server.Spells;
namespace Server.Engines.Doom

2
Projects/UOContent/Engines/Ethics/Core/Power.cs
View file

@ -1,5 +1,3 @@
using Server.Network;
namespace Server.Ethics
{
public abstract class Power

1
Projects/UOContent/Engines/Ethics/Evil/Powers/Blight.cs
View file

@ -1,5 +1,4 @@
using System;
using Server.Network;
using Server.Spells;
using Server.Targeting;

1
Projects/UOContent/Engines/Ethics/Evil/Powers/SummonFamiliar.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Mobiles;
using Server.Network;
namespace Server.Ethics.Evil
{

1
Projects/UOContent/Engines/Ethics/Evil/Powers/UnholyItem.cs
View file

@ -1,5 +1,4 @@
using Server.Items;
using Server.Network;
using Server.Targeting;
namespace Server.Ethics.Evil

1
Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySense.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Buffers;
using Server.Network;
namespace Server.Ethics.Evil
{

2
Projects/UOContent/Engines/Ethics/Evil/Powers/UnholyShield.cs
View file

@ -1,5 +1,3 @@
using Server.Network;
namespace Server.Ethics.Evil
{
public sealed class UnholyShield : Power

1
Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySteed.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Mobiles;
using Server.Network;
namespace Server.Ethics.Evil
{

1
Projects/UOContent/Engines/Ethics/Hero/Powers/Bless.cs
View file

@ -1,5 +1,4 @@
using System;
using Server.Network;
using Server.Spells;
using Server.Targeting;

1
Projects/UOContent/Engines/Ethics/Hero/Powers/HolyItem.cs
View file

@ -1,5 +1,4 @@
using Server.Items;
using Server.Network;
using Server.Targeting;
namespace Server.Ethics.Hero

1
Projects/UOContent/Engines/Ethics/Hero/Powers/HolySense.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Buffers;
using Server.Network;
namespace Server.Ethics.Hero
{

2
Projects/UOContent/Engines/Ethics/Hero/Powers/HolyShield.cs
View file

@ -1,5 +1,3 @@
using Server.Network;
namespace Server.Ethics.Hero
{
public sealed class HolyShield : Power

1
Projects/UOContent/Engines/Ethics/Hero/Powers/HolySteed.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Mobiles;
using Server.Network;
namespace Server.Ethics.Hero
{

1
Projects/UOContent/Engines/Ethics/Hero/Powers/SummonFamiliar.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Mobiles;
using Server.Network;
namespace Server.Ethics.Hero
{

1
Projects/UOContent/Engines/Factions/Core/Keywords.cs
View file

@ -1,5 +1,4 @@
using Server.Mobiles;
using Server.Network;
namespace Server.Factions
{

1
Projects/UOContent/Engines/Factions/Items/FactionStone.cs
View file

@ -1,5 +1,4 @@
using Server.Mobiles;
using Server.Network;
namespace Server.Factions
{

1
Projects/UOContent/Engines/Factions/Items/JoinStone.cs
View file

@ -1,5 +1,4 @@
using Server.Mobiles;
using Server.Network;
namespace Server.Factions
{

1
Projects/UOContent/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs
View file

@ -1,5 +1,4 @@
using Server.Factions;
using Server.Network;
namespace Server
{

1
Projects/UOContent/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs
View file

@ -2,7 +2,6 @@ using System;
using System.IO;
using Server.Factions;
using Server.Mobiles;
using Server.Network;
using Server.Utilities;
namespace Server

1
Projects/UOContent/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
View file

@ -1,7 +1,6 @@
using Server.Factions;
using Server.Gumps;
using Server.Multis;
using Server.Network;
namespace Server
{

1
Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -2,7 +2,6 @@ using System;
using Server.Factions.AI;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Factions
{

23
Projects/UOContent/Engines/Factions/Mobiles/Guards/GuardAI.cs
View file

@ -106,7 +106,7 @@ namespace Server.Factions
private const int ManaReserve = 30;
private readonly BaseFactionGuard m_Guard;
private BandageContext m_Bandage;
private BandageContext _bandage;
private DateTime m_BandageStart;
private SpellCombo m_Combo;
@ -123,21 +123,21 @@ namespace Server.Factions
{
get
{
if (m_Bandage != null && m_Bandage.Timer == null)
if (_bandage != null && !_bandage.Running)
{
m_Bandage = null;
_bandage = null;
}
if (m_Bandage == null)
if (_bandage == null)
{
return TimeSpan.MaxValue;
}
var ts = m_BandageStart + m_Bandage.Timer.Delay - Core.Now;
var ts = m_BandageStart + _bandage.Delay - Core.Now;
if (ts < TimeSpan.FromSeconds(-1.0))
{
m_Bandage = null;
_bandage = null;
return TimeSpan.MaxValue;
}
@ -174,16 +174,15 @@ namespace Server.Factions
public bool StartBandage()
{
m_Bandage = null;
_bandage = null;
if (m_Guard.Backpack?.FindItemByType<Bandage>() == null)
if (m_Guard.Backpack?.FindItemByType<Bandage>() != null)
{
return false;
_bandage = BandageContext.BeginHeal(m_Guard, m_Guard);
m_BandageStart = Core.Now;
}
m_Bandage = BandageContext.BeginHeal(m_Guard, m_Guard);
m_BandageStart = Core.Now;
return m_Bandage != null;
return _bandage != null;
}
public bool UseItemByType(Type type)

1
Projects/UOContent/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs
View file

@ -1,7 +1,6 @@
using System.Collections.Generic;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Factions
{

1
Projects/UOContent/Engines/Harvest/Lumberjacking.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Items;
using Server.Network;
using Server.Targeting;
namespace Server.Engines.Harvest

1
Projects/UOContent/Engines/Khaldun/RaiseSwitch.cs
View file

@ -1,5 +1,4 @@
using System;
using Server.Network;
namespace Server.Items
{

1
Projects/UOContent/Engines/ML Quests/Items/BedlamTeleporter.cs
View file

@ -1,5 +1,4 @@
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.MLQuests.Items
{

1
Projects/UOContent/Engines/ML Quests/Items/PrismaticCrystal.cs
View file

@ -1,7 +1,6 @@
using Server.Engines.MLQuests;
using Server.Engines.MLQuests.Definitions;
using Server.Mobiles;
using Server.Network;
namespace Server.Items
{

1
Projects/UOContent/Engines/ML Quests/Items/QuestGiverItem.cs
View file

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.MLQuests.Items
{

1
Projects/UOContent/Engines/ML Quests/MLQuestSystem.cs
View file

@ -8,7 +8,6 @@ using Server.Engines.MLQuests.Objectives;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Network;
using Server.Utilities;
namespace Server.Engines.MLQuests

1
Projects/UOContent/Engines/ML Quests/Mobiles/BoonCollector.cs
View file

@ -4,7 +4,6 @@ using Server.Engines.MLQuests.Definitions;
using Server.Engines.MLQuests.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.MLQuests.Mobiles
{

1
Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -1,6 +1,5 @@
using System;
using Server.Mobiles;
using Server.Network;
using Server.Targeting;
using Server.Utilities;

1
Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using Server.Network;
namespace Server.Items
{

1
Projects/UOContent/Engines/Plants/PlantBowl.cs
View file

@ -1,5 +1,4 @@
using Server.Items;
using Server.Network;
using Server.Targeting;
namespace Server.Engines.Plants

1
Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs
View file

@ -1,5 +1,4 @@
using Server.Gumps;
using Server.Network;
namespace Server.Engines.Quests.Collector
{

1
Projects/UOContent/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs
View file

@ -1,6 +1,5 @@
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.Quests.Ninja
{

2
Projects/UOContent/Engines/Quests/Regions/CancelQuestRegion.cs
View file

@ -1,6 +1,4 @@
using System;
using System.Xml;
using Server;
using Server.Regions;
using Server.Mobiles;

2
Projects/UOContent/Engines/Quests/Regions/QuestCompleteObjectiveRegion.cs
View file

@ -1,6 +1,4 @@
using System;
using System.Xml;
using Server;
using Server.Regions;
using Server.Mobiles;

2
Projects/UOContent/Engines/Quests/Regions/QuestNoEntryRegion.cs
View file

@ -1,6 +1,4 @@
using System;
using System.Xml;
using Server;
using Server.Regions;
using Server.Mobiles;

2
Projects/UOContent/Engines/Quests/Regions/QuestOfferRegion.cs
View file

@ -1,6 +1,4 @@
using System;
using System.Xml;
using Server;
using Server.Logging;
using Server.Regions;
using Server.Mobiles;

1
Projects/UOContent/Engines/Quests/The Summoning/Items/BellOfTheDead.cs
View file

@ -1,7 +1,6 @@
using System;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.Quests.Doom
{

1
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Objectives.cs
View file

@ -1,7 +1,6 @@
using Server.Engines.Help;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.Quests.Haven
{

1
Projects/UOContent/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs
View file

@ -1,7 +1,6 @@
using System;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.Quests.Hag
{

1
Projects/UOContent/Engines/Virtues/Sacrifice.cs
View file

@ -2,7 +2,6 @@ using System;
using System.Runtime.CompilerServices;
using Server.Gumps;
using Server.Mobiles;
using Server.Network;
using Server.Targeting;
namespace Server