Updates Packets & Randomizer (#43)
* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand. * WIP - Rewriting packets. * Cleanup and updates README * Converts more packets * Fixes header * Converts Effects packets. * Forgot the send command * Adds the start of containers packets. * Adds message packets with caching * Extends the send methods * Starts to add Acquire methods * Converted the packets * Cleanup * Cleanup * Adds more packets * Adds more packets * Fixes clearing arrays from pool. Adds Mobile Incoming * Converts more packets. * Moves more packets * Moves more packets * Test compression * Merges * Migrating to an idiomatic syntax that also supports compression, and proxying. * Optimize the stack alloc. Changes attributes * Converted container packets * Visual Studio doesn't auto save files. I am still getting used to subpar IDEs. * Adds static packet caching. Will profile later. Converts more packets * Fixes packets and changes how compression is configured * WIP - Adds basics for Gumps. Not finished though. * Fix file * Fixes formatting * Changed SpanWriter to be more idiomatic. * Fixes Span vs RawSpan and missing stackallocs * Converts over some more gumps * WIP - Deletes 32bit support. * Drops RDRand32 support. * Fixes gump compilation * Converting gump components * Removes old huffman compression function * Revert signature for backwards compatibility * WIP - Converting more gump components * Creates ArraySet for the strings. Updates AppendTo to reference that. * Converts the maining gump components * Cleans up gump components * Cleans up directives * Cleans up ArraySet and moves it. Adds null-coalescing-assignment * Cleanup, Target Packets, and C# 8 changes. * Removed OPL Packet * World packets * Fixing packet uses * Cleans up code. Fixes packet uses in various places. * More cleanup for packets * Code cleanup * Converts more packet uses and cleans up more code * More code cleanup * Finishes fixing the packets in Item * Updates secure trade packets * Updates core and gets it to compile. * Moved packets to scripts. Fixed account handler use of packets * Code cleanup * Updates chat packets * Code cleanuo * Adds party packets, but need to implement them. * Party packets WIP * Finishes party packets * Rearrange movement namespaces and classes * Finishes plant packets * Code Formatting * Fixes moving effects * Code cleanup, eliminates equipinfo * Adds more packets. Fixes bugs with various packets. * Finishes mahjon packets * Fixes mahjong packet * Code cleanup * Finishes mahjong packets * Adds Map packets * Add multifacet maps and charts * Cleans up some packets with UTF8 * Optimizes packets * Cleans up more packets. Moves the MessageHelper * Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets. * Updates protocol extensions packet receiver * Fixes a few bugs. Fixes a few more packets. * Code cleanup and fixing more packets * Fixes packet effects * Cleaned up more code * Buff Icon cleanup * Removed unused constructors * Code Cleanup. Adds BoatHS Packets * Moves house files. Updates house foundation packets. * Deployment cleanup * Fixes: * Code cleanup * More code cleanup * More code cleanup * Cleaned up BaseHouse * Enforces styling * Converts foreach to linq where possible. * Dont need that * Goals/Readme updates * Removes 32bit support at the highest level. Turns on HRT by default. * Code cleanup. Fixes extended features packet. * Fixes various bugs * Code cleanup * Code cleanup * Code cleanup. Fixes gump X/Y assignment. * Code cleanup using |= operator * More code cleanup * Cleanup * Fixes spacing issues. Thanks Visual Studio. You suck. * Compiler error * Fixes NPE from RunUO 2.7 * Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README * Fixes more packets. Stupid trailing nulls. * Fixes various bugs. * Fixes for gumps * Fixes more gump stuff. Going to split it out later since it is getting insane * Recoded the gump writing * WIP * *Added output path of scripts project to dev branch *Activated debugging in code
This commit is contained in:
Kamron Batman
3HMonkey
parent
7aa8fd3df1
commit
179cb50557
588 changed files with 10843 additions and 16177 deletions
|
|
@ -7,16 +7,6 @@ using Server.Network;
|
|||
|
||||
namespace Server.Items
|
||||
{
|
||||
public sealed class StopMusic : Packet
|
||||
{
|
||||
public static readonly Packet Instance = SetStatic(new StopMusic());
|
||||
|
||||
public StopMusic() : base(0x6D, 3)
|
||||
{
|
||||
m_Stream.Write((short)0x1FFF);
|
||||
}
|
||||
}
|
||||
|
||||
[Flippable(0x2AF9, 0x2AFD)]
|
||||
public class DawnsMusicBox : Item, ISecurable
|
||||
{
|
||||
|
|
@ -158,7 +148,7 @@ namespace Server.Items
|
|||
else
|
||||
m_ItemID = ItemID;
|
||||
|
||||
m.Send(new PlayMusic(music));
|
||||
Packets.SendPlayMusic(m.NetState, music);
|
||||
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(0.5), TimeSpan.FromSeconds(0.5), 4, Animate);
|
||||
}
|
||||
|
||||
|
|
@ -167,7 +157,7 @@ namespace Server.Items
|
|||
if (m_Timer?.Running == true)
|
||||
m_Timer.Stop();
|
||||
|
||||
m.Send(StopMusic.Instance);
|
||||
Packets.SendStopMusic(m.NetState);
|
||||
|
||||
if (m_Count > 0)
|
||||
ItemID = m_ItemID;
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ namespace Server.Items
|
|||
Point3D location = Location;
|
||||
location.Z += 10;
|
||||
|
||||
Effects.SendLocationEffect(location, Map, 0x3709, 10, 10, 0x356, 0);
|
||||
Effects.SendLocationEffect(location, Map, 0x3709, 10, 10, 0x356);
|
||||
Effects.PlaySound(location, Map, 0x32E);
|
||||
|
||||
if (Items.Count > 0)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using Server.Accounting;
|
||||
|
|
@ -290,22 +291,9 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
private bool HasEntered(Mobile from)
|
||||
{
|
||||
if (!(from.Account is Account acc))
|
||||
return false;
|
||||
|
||||
foreach (RaffleEntry entry in Entries)
|
||||
if (entry.From != null)
|
||||
{
|
||||
Account entryAcc = entry.From.Account as Account;
|
||||
|
||||
if (entryAcc == acc)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
private bool HasEntered(Mobile from) =>
|
||||
from.Account is Account acc &&
|
||||
(from entry in Entries select entry.From?.Account as Account).Any(entryAcc => entryAcc == acc);
|
||||
|
||||
private bool IsAtIPLimit(Mobile from)
|
||||
{
|
||||
|
|
@ -315,12 +303,7 @@ namespace Server.Items
|
|||
IPAddress address = from.NetState.Address;
|
||||
int tickets = 0;
|
||||
|
||||
foreach (RaffleEntry entry in Entries)
|
||||
if (Utility.IPMatchClassC(entry.Address, address))
|
||||
if (++tickets >= EntryLimitPerIP)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
return Entries.Where(entry => Utility.IPMatchClassC(entry.Address, address)).Any(entry => ++tickets >= EntryLimitPerIP);
|
||||
}
|
||||
|
||||
public static string FormatLocation(Point3D loc, Map map, bool displayMap)
|
||||
|
|
|
|||
|
|
@ -219,54 +219,34 @@ namespace Server.Items
|
|||
return;
|
||||
|
||||
if (from.Region.IsPartOf<Jail>())
|
||||
{
|
||||
from.SendMessage("You may not do that in jail.");
|
||||
}
|
||||
else if (!m_Bag.IsChildOf(from.Backpack))
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1062334,
|
||||
0x59); // The bag of sending must be in your backpack. 1054107 is gone from client, using generic response
|
||||
}
|
||||
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054107,
|
||||
0x59); // This item must be in your backpack.
|
||||
else if (m_Bag.Charges == 0)
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1042544, 0x59); // This item is out of charges.
|
||||
}
|
||||
else if (targeted is Item item)
|
||||
{
|
||||
int reqCharges = (int)Math.Max(1, Math.Ceiling(item.TotalWeight / 10.0));
|
||||
|
||||
if (!item.IsChildOf(from.Backpack))
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054152,
|
||||
0x59); // You may only send items from your backpack to your bank box.
|
||||
}
|
||||
else if (item is BagOfSending || item is Container)
|
||||
{
|
||||
from.Send(new AsciiMessage(m_Bag.Serial, m_Bag.ItemID, MessageType.Regular, 0x3B2, 3, "",
|
||||
"You cannot send a container through the bag of sending."));
|
||||
}
|
||||
Packets.SendAsciiMessage(from.NetState, m_Bag.Serial, m_Bag.ItemID, MessageType.Regular, 0x3B2, 3, "",
|
||||
"You cannot send a container through the bag of sending." );
|
||||
else if (item.LootType == LootType.Cursed)
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054108,
|
||||
0x59); // The bag of sending rejects the cursed item.
|
||||
}
|
||||
else if (!item.VerifyMove(from) || item is QuestItem || item.Nontransferable)
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054109,
|
||||
0x59); // The bag of sending rejects that item.
|
||||
}
|
||||
else if (SpellHelper.IsDoomGauntlet(from.Map, from.Location))
|
||||
{
|
||||
from.SendLocalizedMessage(1062089); // You cannot use that here.
|
||||
}
|
||||
else if (!from.BankBox.TryDropItem(from, item, false))
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054110, 0x59); // Your bank box is full.
|
||||
}
|
||||
else if (Core.ML && reqCharges > m_Bag.Charges)
|
||||
{
|
||||
from.SendLocalizedMessage(1079932); //You don't have enough charges to send that much weight
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Bag.Charges -= Core.ML ? reqCharges : 1;
|
||||
|
|
@ -278,4 +258,4 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,41 +177,27 @@ namespace Server.Items
|
|||
return;
|
||||
|
||||
if (Charges == 0)
|
||||
{
|
||||
SendLocalizedMessageTo(from,
|
||||
1054122); // The Crystal Ball darkens. It must be charged before it can be used again.
|
||||
}
|
||||
else if (pet is BaseMount mount && mount.Rider == from)
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(this, from, 1054124,
|
||||
0x36); // The Crystal Ball fills with a yellow mist. Why would you summon your pet while riding it?
|
||||
}
|
||||
else if (pet.Map == Map.Internal && (!pet.IsStabled || from.Followers + pet.ControlSlots > from.FollowersMax))
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(this, from, 1054125,
|
||||
0x5); // The Crystal Ball fills with a blue mist. Your pet is not responding to the summons.
|
||||
}
|
||||
else if ((!pet.Controlled || pet.ControlMaster != from) && !from.Stabled.Contains(pet))
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(this, from, 1054126,
|
||||
0x8FD); // The Crystal Ball fills with a grey mist. You are not the owner of the pet you are attempting to summon.
|
||||
}
|
||||
else if (!pet.IsBonded)
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(this, from, 1054127,
|
||||
0x22); // The Crystal Ball fills with a red mist. You appear to have let your bond to your pet deteriorate.
|
||||
}
|
||||
else if (from.Map == Map.Ilshenar || from.Region.IsPartOf<DungeonRegion>() ||
|
||||
from.Region.IsPartOf<Jail>() || from.Region.IsPartOf<SafeZone>())
|
||||
{
|
||||
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Regular, 0x22, 3, "",
|
||||
"You cannot summon your pet to this location."));
|
||||
}
|
||||
Packets.SendAsciiMessage(from.NetState, Serial, ItemID, MessageType.Regular, 0x22, 3, "",
|
||||
"You cannot summon your pet to this location.");
|
||||
else if (Core.ML && from is PlayerMobile mobile && DateTime.UtcNow < mobile.LastPetBallTime.AddSeconds(15.0))
|
||||
{
|
||||
MessageHelper.SendLocalizedMessageTo(this, mobile, 1080072,
|
||||
0x22); // You must wait a few seconds before you can summon your pet.
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Core.ML)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ using Server.Factions;
|
|||
using Server.Misc;
|
||||
using Server.Mobiles;
|
||||
using Server.Network;
|
||||
using Server.Prompts;
|
||||
using Server.Regions;
|
||||
using Server.Spells;
|
||||
using Server.Targeting;
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
using Server.Network;
|
||||
|
||||
namespace Server
|
||||
{
|
||||
public class MessageHelper
|
||||
{
|
||||
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, int hue)
|
||||
{
|
||||
SendLocalizedMessageTo(from, to, number, "", hue);
|
||||
}
|
||||
|
||||
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, string args, int hue)
|
||||
{
|
||||
to.Send(new MessageLocalized(from.Serial, from.ItemID, MessageType.Regular, hue, 3, number, "", args));
|
||||
}
|
||||
|
||||
public static void SendMessageTo(Item from, Mobile to, string text, int hue)
|
||||
{
|
||||
to.Send(new UnicodeMessage(from.Serial, from.ItemID, MessageType.Regular, hue, 3, "ENU", "", text));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using Server.Accounting;
|
||||
using Server.Engines.VeteranRewards;
|
||||
using Server.Factions;
|
||||
|
|
@ -579,7 +580,6 @@ namespace Server.Items
|
|||
return;
|
||||
}
|
||||
|
||||
SkillName skill = m_Stone.Skill;
|
||||
double skillValue = m_Stone.SkillValue;
|
||||
Skill fromSkill = from.Skills[m_Stone.Skill];
|
||||
|
||||
|
|
@ -589,27 +589,8 @@ namespace Server.Items
|
|||
*/
|
||||
int requiredAmount = (int)(skillValue * 10) - fromSkill.BaseFixedPoint - (from.SkillsCap - from.SkillsTotal);
|
||||
|
||||
bool cannotAbsorb = false;
|
||||
|
||||
if (fromSkill.Lock != SkillLock.Up)
|
||||
{
|
||||
cannotAbsorb = true;
|
||||
}
|
||||
else if (requiredAmount > 0)
|
||||
{
|
||||
int available = 0;
|
||||
|
||||
for (int i = 0; i < from.Skills.Length; ++i)
|
||||
{
|
||||
if (from.Skills[i].Lock != SkillLock.Down)
|
||||
continue;
|
||||
|
||||
available += from.Skills[i].BaseFixedPoint;
|
||||
}
|
||||
|
||||
if (requiredAmount > available)
|
||||
cannotAbsorb = true;
|
||||
}
|
||||
bool cannotAbsorb = fromSkill.Lock != SkillLock.Up || requiredAmount > 0 &&
|
||||
requiredAmount > from.Skills.Where(t => t.Lock == SkillLock.Down).Sum(t => t.BaseFixedPoint);
|
||||
|
||||
if (cannotAbsorb)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -81,10 +81,12 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
public override int Message =>
|
||||
1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
|
||||
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
|
||||
* You can view your maximum skill values in your skills window.
|
||||
* You can view your maximum statistic value in your statistics window. */
|
||||
1049469;
|
||||
/* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
|
||||
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
|
||||
* You can view your maximum skill values in your skills window.
|
||||
* You can view your maximum statistic value in your statistics window.
|
||||
*/
|
||||
|
||||
public override int Title
|
||||
{
|
||||
|
|
@ -93,10 +95,12 @@ namespace Server.Items
|
|||
double level = (Value - 105.0) / 5.0;
|
||||
|
||||
if (level >= 0.0 && level <= 3.0 && Value % 5.0 == 0.0)
|
||||
return 1049635 + (int)level; /* Wonderous Scroll (105 Skill): OR
|
||||
* Exalted Scroll (110 Skill): OR
|
||||
* Mythical Scroll (115 Skill): OR
|
||||
* Legendary Scroll (120 Skill): */
|
||||
return 1049635 + (int)level;
|
||||
/* Wonderous Scroll (105 Skill): OR
|
||||
* Exalted Scroll (110 Skill): OR
|
||||
* Mythical Scroll (115 Skill): OR
|
||||
* Legendary Scroll (120 Skill):
|
||||
*/
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -154,10 +158,12 @@ namespace Server.Items
|
|||
double level = (Value - 105.0) / 5.0;
|
||||
|
||||
if (level >= 0.0 && level <= 3.0 && Value % 5.0 == 0.0)
|
||||
list.Add(1049639 + (int)level, GetNameLocalized()); /* a wonderous scroll of ~1_type~ (105 Skill) OR
|
||||
* an exalted scroll of ~1_type~ (110 Skill) OR
|
||||
* a mythical scroll of ~1_type~ (115 Skill) OR
|
||||
* a legendary scroll of ~1_type~ (120 Skill) */
|
||||
list.Add(1049639 + (int)level, GetNameLocalized());
|
||||
/* a wonderous scroll of ~1_type~ (105 Skill) OR
|
||||
* an exalted scroll of ~1_type~ (110 Skill) OR
|
||||
* a mythical scroll of ~1_type~ (115 Skill) OR
|
||||
* a legendary scroll of ~1_type~ (120 Skill)
|
||||
*/
|
||||
else
|
||||
list.Add("a power scroll of {0} ({1} Skill)", GetName(), Value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using Server.Engines.MLQuests;
|
||||
using Server.Engines.MLQuests.Objectives;
|
||||
using Server.Mobiles;
|
||||
|
|
@ -21,9 +22,11 @@ namespace Server.Items
|
|||
public override int LabelNumber => 1078604; // Scroll of Alacrity
|
||||
|
||||
public override int Message =>
|
||||
1078602; /*Using a Scroll of Transcendence for a given skill will permanently increase your current
|
||||
*level in that skill by the amount of points displayed on the scroll.
|
||||
*As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/
|
||||
1078602;
|
||||
/* Using a Scroll of Transcendence for a given skill will permanently increase your current
|
||||
* level in that skill by the amount of points displayed on the scroll.
|
||||
* As you may not gain skills beyond your maximum skill cap, any excess points will be lost.
|
||||
*/
|
||||
|
||||
public override string DefaultTitle => "<basefont color=#FFFFFF>Scroll of Alacrity:</basefont>";
|
||||
|
||||
|
|
@ -74,8 +77,10 @@ namespace Server.Items
|
|||
if (tskill >= tcap || from.Skills[Skill].Lock != SkillLock.Up)
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1094935); /*You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
|
||||
*If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.*/
|
||||
1094935);
|
||||
/* You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
|
||||
* If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.
|
||||
*/
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using Server.Engines.MLQuests;
|
||||
using Server.Engines.MLQuests.Objectives;
|
||||
using Server.Mobiles;
|
||||
|
|
@ -21,9 +22,11 @@ namespace Server.Items
|
|||
public override int LabelNumber => 1094934; // Scroll of Transcendence
|
||||
|
||||
public override int Message =>
|
||||
1094933; /*Using a Scroll of Transcendence for a given skill will permanently increase your current
|
||||
*level in that skill by the amount of points displayed on the scroll.
|
||||
*As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/
|
||||
1094933;
|
||||
/* Using a Scroll of Transcendence for a given skill will permanently increase your current
|
||||
* level in that skill by the amount of points displayed on the scroll.
|
||||
* As you may not gain skills beyond your maximum skill cap, any excess points will be lost.
|
||||
*/
|
||||
|
||||
public override string DefaultTitle =>
|
||||
$"<basefont color=#FFFFFF>Scroll of Transcendence ({Value} Skill):</basefont>";
|
||||
|
|
@ -112,8 +115,10 @@ namespace Server.Items
|
|||
if (!canGain)
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1094935); /*You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
|
||||
*If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.*/
|
||||
1094935);
|
||||
/* You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
|
||||
* If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.
|
||||
*/
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ namespace Server.Items
|
|||
AddHtmlLocalized(310, 20, 120, 20, AosSkillBonuses.GetLabel(m_Scroll.Skill), 0xFFFFFF);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
m_Scroll.Use(m_Mobile);
|
||||
|
|
|
|||
|
|
@ -12,10 +12,12 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
public override int Message =>
|
||||
1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
|
||||
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
|
||||
* You can view your maximum skill values in your skills window.
|
||||
* You can view your maximum statistic value in your statistics window. */
|
||||
1049469;
|
||||
/* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
|
||||
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
|
||||
* You can view your maximum skill values in your skills window.
|
||||
* You can view your maximum statistic value in your statistics window.
|
||||
*/
|
||||
|
||||
public override int Title
|
||||
{
|
||||
|
|
@ -24,11 +26,13 @@ namespace Server.Items
|
|||
int level = ((int)Value - 230) / 5;
|
||||
|
||||
if (level >= 0 && level <= 4 && Value % 5 == 0)
|
||||
return 1049458 + level; /* Wonderous Scroll (+5 Maximum Stats): OR
|
||||
* Exalted Scroll (+10 Maximum Stats): OR
|
||||
* Mythical Scroll (+15 Maximum Stats): OR
|
||||
* Legendary Scroll (+20 Maximum Stats): OR
|
||||
* Ultimate Scroll (+25 Maximum Stats): */
|
||||
return 1049458 + level;
|
||||
/* Wonderous Scroll (+5 Maximum Stats): OR
|
||||
* Exalted Scroll (+10 Maximum Stats): OR
|
||||
* Mythical Scroll (+15 Maximum Stats): OR
|
||||
* Legendary Scroll (+20 Maximum Stats): OR
|
||||
* Ultimate Scroll (+25 Maximum Stats):
|
||||
*/
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -42,11 +46,13 @@ namespace Server.Items
|
|||
int level = ((int)Value - 230) / 5;
|
||||
|
||||
if (level >= 0 && level <= 4 && (int)Value % 5 == 0)
|
||||
list.Add(1049463 + level, "#1049476"); /* a wonderous scroll of ~1_type~ (+5 Maximum Stats) OR
|
||||
* an exalted scroll of ~1_type~ (+10 Maximum Stats) OR
|
||||
* a mythical scroll of ~1_type~ (+15 Maximum Stats) OR
|
||||
* a legendary scroll of ~1_type~ (+20 Maximum Stats) OR
|
||||
* an ultimate scroll of ~1_type~ (+25 Maximum Stats) */
|
||||
list.Add(1049463 + level, "#1049476");
|
||||
/* a wonderous scroll of ~1_type~ (+5 Maximum Stats) OR
|
||||
* an exalted scroll of ~1_type~ (+10 Maximum Stats) OR
|
||||
* a mythical scroll of ~1_type~ (+15 Maximum Stats) OR
|
||||
* a legendary scroll of ~1_type~ (+20 Maximum Stats) OR
|
||||
* an ultimate scroll of ~1_type~ (+25 Maximum Stats)
|
||||
*/
|
||||
else
|
||||
list.Add("a scroll of power ({0}{1} Maximum Stats)", Value - 225 >= 0 ? "+" : "", Value - 225);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -135,9 +135,9 @@ namespace Server.Items
|
|||
{
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
Mobile from = state.Mobile;
|
||||
Mobile from = sender.Mobile;
|
||||
|
||||
if (info.ButtonID == 1 || info.ButtonID == 2)
|
||||
{
|
||||
|
|
@ -147,9 +147,10 @@ namespace Server.Items
|
|||
return;
|
||||
}
|
||||
|
||||
if (from is PlayerMobile mobile) mobile.AnkhNextUse = DateTime.UtcNow + TimeSpan.FromHours(1);
|
||||
if (from is PlayerMobile mobile)
|
||||
mobile.AnkhNextUse = DateTime.UtcNow + TimeSpan.FromHours(1);
|
||||
|
||||
base.OnResponse(state, info);
|
||||
base.OnResponse(sender, info);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,8 +63,7 @@ namespace Server.Items
|
|||
|
||||
public void TurnOn()
|
||||
{
|
||||
if (m_Fire == null)
|
||||
m_Fire = new Item();
|
||||
m_Fire ??= new Item();
|
||||
|
||||
m_Fire.ItemID = 0x19AB;
|
||||
m_Fire.Movable = false;
|
||||
|
|
|
|||
|
|
@ -63,37 +63,37 @@ namespace Server.Items
|
|||
switch (direction)
|
||||
{
|
||||
case CannonDirection.North:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8D), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8C), 0, 1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8B), 0, 2, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8D), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8C), 0, 1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8B), 0, 2, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CannonDirection.East:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE96), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE95), -1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE94), -2, 0, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE96), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE95), -1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE94), -2, 0, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CannonDirection.South:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE91), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE92), 0, -1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE93), 0, -2, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE91), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE92), 0, -1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE93), 0, -2, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8E), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8F), 1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE90), 2, 0, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8E), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8F), 1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE90), 2, 0, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public CannonDirection CannonDirection{ get; private set; }
|
||||
public CannonDirection CannonDirection { get; private set; }
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int Charges
|
||||
|
|
@ -261,34 +261,19 @@ namespace Server.Items
|
|||
{
|
||||
if (!Utility.InRange(new Point3D(p), m_Cannon.Location, 2))
|
||||
{
|
||||
bool allow = false;
|
||||
|
||||
int x = p.X - m_Cannon.X;
|
||||
int y = p.Y - m_Cannon.Y;
|
||||
|
||||
switch (m_Cannon.CannonDirection)
|
||||
bool allow = m_Cannon.CannonDirection switch
|
||||
{
|
||||
case CannonDirection.North:
|
||||
if (y < 0 && Math.Abs(x) <= -y / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
case CannonDirection.East:
|
||||
if (x > 0 && Math.Abs(y) <= x / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
case CannonDirection.South:
|
||||
if (y > 0 && Math.Abs(x) <= y / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
case CannonDirection.West:
|
||||
if (x < 0 && Math.Abs(y) <= -x / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
}
|
||||
CannonDirection.North => y < 0 && Math.Abs(x) <= -y / 3,
|
||||
CannonDirection.East => x > 0 && Math.Abs(y) <= x / 3,
|
||||
CannonDirection.South => y > 0 && Math.Abs(x) <= y / 3,
|
||||
CannonDirection.West => x < 0 && Math.Abs(y) <= -x / 3,
|
||||
_ => false,
|
||||
};
|
||||
|
||||
if (allow && Utility.InRange(new Point3D(p), m_Cannon.Location, 14))
|
||||
m_Cannon.DoFireEffect(p);
|
||||
|
|
@ -301,9 +286,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(1049630); // You cannot see that target!
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnTargetOutOfRange(Mobile from, object targeted)
|
||||
|
|
@ -341,10 +324,10 @@ namespace Server.Items
|
|||
AddHtmlLocalized(195, 109, 120, 20, 1076197, 0x7FFF); // Recharge
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_Cannon?.Deleted == false && info.ButtonID == (int)Buttons.Recharge)
|
||||
m_Cannon.Fill(state.Mobile, m_Keg);
|
||||
m_Cannon.Fill(sender.Mobile, m_Keg);
|
||||
}
|
||||
|
||||
private enum Buttons
|
||||
|
|
@ -373,7 +356,8 @@ namespace Server.Items
|
|||
|
||||
public override BaseAddon Addon => new CannonAddon(m_Direction)
|
||||
{
|
||||
Charges = m_Charges, IsRewardItem = m_IsRewardItem
|
||||
Charges = m_Charges,
|
||||
IsRewardItem = m_IsRewardItem
|
||||
};
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ namespace Server.Items
|
|||
AddTextEntry(75, 245, 350, 40, 0x0, (int)Buttons.Text, "");
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_Tool?.Deleted != false || m_Target?.Deleted != false)
|
||||
return;
|
||||
|
|
@ -319,12 +319,12 @@ namespace Server.Items
|
|||
AddHtmlLocalized(40, 109, 100, 20, 1060051, 0x7FFF); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_Engraver?.Deleted != false || info.ButtonID != (int)Buttons.Confirm)
|
||||
return;
|
||||
|
||||
m_Engraver.Recharge(state.Mobile, m_Guildmaster);
|
||||
m_Engraver.Recharge(sender.Mobile, m_Guildmaster);
|
||||
}
|
||||
|
||||
private enum Buttons
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue