diff --git a/Projects/Server/Items/Container.cs b/Projects/Server/Items/Container.cs index 91bf7efff..379741ba3 100644 --- a/Projects/Server/Items/Container.cs +++ b/Projects/Server/Items/Container.cs @@ -244,12 +244,14 @@ public class Container : Item public virtual void SendFullItemsMessage(Mobile to, Item item) { - to.SendMessage("That container cannot hold more items."); + // That container cannot hold more items. + to.SendLocalizedMessage(1080017); } public virtual void SendFullWeightMessage(Mobile to, Item item) { - to.SendMessage("That container cannot hold more weight."); + // That container cannot hold more weight. + to.SendLocalizedMessage(1080016); } public virtual void SendCantStoreMessage(Mobile to, Item item) diff --git a/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs b/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs index 442c1a2f3..38b2bb33f 100644 --- a/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs @@ -727,7 +727,8 @@ namespace Server.Engines.BulkOrders entry.Price = price; } - from.SendMessage("Deed prices set."); + // Deed price set. + from.SendLocalizedMessage(1062384); if (from is PlayerMobile mobile) { diff --git a/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholyItem.cs b/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholyItem.cs index 246d9586d..70e803394 100644 --- a/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholyItem.cs +++ b/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholyItem.cs @@ -40,7 +40,7 @@ namespace Server.Ethics.Evil if ((item.SavedFlags & 0x300) != 0) { - from.Mobile.LocalOverheadMessage(MessageType.Regular, 0x3B2, false, "That has already beem imbued."); + from.Mobile.LocalOverheadMessage(MessageType.Regular, 0x3B2, false, "That has already been imbued."); return; } diff --git a/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs b/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs index 07dfb5649..f4449d0cb 100644 --- a/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs +++ b/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs @@ -416,12 +416,9 @@ namespace Server.Items case 3: { var dummy = EffectItem.Create(Location, Map, TimeSpan.FromSeconds(20.0)); - dummy.PublicOverheadMessage( - MessageType.Regular, - 0x3B2, - true, - "* The ground erupts with chaotic growth! *" - ); + + // * The ground erupts with chaotic growth! * + dummy.PublicOverheadMessage(MessageType.Regular, 0x3B2, 1114432); Effects.PlaySound(Location, Map, 0x12D); @@ -526,12 +523,8 @@ namespace Server.Items default: { var dummy = EffectItem.Create(Location, Map, TimeSpan.FromSeconds(20.0)); - dummy.PublicOverheadMessage( - MessageType.Regular, - 0x3B2, - true, - "* A magical bunny leaps out of its hole, disturbed by the thorn's effect! *" - ); + // * A magical bunny leaps out of its hole, disturbed by the thorn's effect! * + dummy.PublicOverheadMessage(MessageType.Regular, 0x3B2, 1114428); BaseCreature spawn = new VorpalBunny(); if (!SpawnCreature(spawn)) @@ -583,12 +576,9 @@ namespace Server.Items default: { var dummy = EffectItem.Create(Location, Map, TimeSpan.FromSeconds(20.0)); - dummy.PublicOverheadMessage( - MessageType.Regular, - 0x3B2, - true, - "* Strange green tendrils rise from the ground, whipping wildly! *" - ); + + // * Strange green tendrils rise from the ground, whipping wildly! * + dummy.PublicOverheadMessage(MessageType.Regular, 0x3B2, 1114429); Effects.PlaySound(Location, Map, 0x2B0); BaseCreature spawn = new WhippingVine(); @@ -641,12 +631,9 @@ namespace Server.Items default: { var dummy = EffectItem.Create(Location, Map, TimeSpan.FromSeconds(20.0)); - dummy.PublicOverheadMessage( - MessageType.Regular, - 0x3B2, - true, - "* Slithering ice serpents rise to the surface to investigate the disturbance! *" - ); + + // * Slithering ice serpents rise to the surface to investigate the disturbance! * + dummy.PublicOverheadMessage(MessageType.Regular, 0x3B2, 1114430); BaseCreature spawn = new GiantIceWorm(); if (!SpawnCreature(spawn)) @@ -707,12 +694,9 @@ namespace Server.Items default: { var dummy = EffectItem.Create(Location, Map, TimeSpan.FromSeconds(20.0)); - dummy.PublicOverheadMessage( - MessageType.Regular, - 0x3B2, - true, - "* The sand collapses, revealing a dark hole. *" - ); + + // * The sand collapses, revealing a dark hole. * + dummy.PublicOverheadMessage(MessageType.Regular, 0x3B2, 1114431); GreenThornsSHTeleporter.Create(Location, Map); diff --git a/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs b/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs index 853670de3..8e1b2c8b9 100644 --- a/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs +++ b/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs @@ -115,12 +115,8 @@ namespace Server.Items { if (!m_Mobile.Deleted) { - m_Mobile.LocalOverheadMessage( - MessageType.Regular, - 0x3F, - true, - "* You feel the effects of your poison resistance wearing off *" - ); + // * You feel the effects of your poison resistance wearing off * + m_Mobile.LocalOverheadMessage(MessageType.Regular, 0x3F, 1053091); } RemoveContext(m_Mobile); diff --git a/Projects/UOContent/Items/Addons/SolenAntHole.cs b/Projects/UOContent/Items/Addons/SolenAntHole.cs index 623161bb2..3b234a6ed 100644 --- a/Projects/UOContent/Items/Addons/SolenAntHole.cs +++ b/Projects/UOContent/Items/Addons/SolenAntHole.cs @@ -21,12 +21,8 @@ namespace Server.Items if (map == Map.Trammel || map == Map.Felucca) { from.MoveToWorld(new Point3D(5922, 2024, 0), map); - PublicOverheadMessage( - MessageType.Regular, - 0x3B2, - true, - $"* {from.Name} dives into the hole and disappears!*" - ); + // * ~1_NAME~ dives into the mysterious hole! * + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1114446, from.Name); } } else diff --git a/Projects/UOContent/Items/Maps/TreasureMap.cs b/Projects/UOContent/Items/Maps/TreasureMap.cs index ff8dd7d26..20d733126 100644 --- a/Projects/UOContent/Items/Maps/TreasureMap.cs +++ b/Projects/UOContent/Items/Maps/TreasureMap.cs @@ -572,7 +572,7 @@ public partial class TreasureMap : MapItem } else if (!HasDiggingTool(from)) { - from.SendMessage("You must have a digging tool to dig for treasure."); + from.SendLocalizedMessage(1114416); // You must have a digging tool to dig for treasure. } else if (from.Map != map) { @@ -900,7 +900,7 @@ public partial class TreasureMap : MapItem } else { - from.SendMessage("You must have a digging tool to dig for treasure."); + from.SendLocalizedMessage(1114416); // You must have a digging tool to dig for treasure. } } } diff --git a/Projects/UOContent/Items/Misc/PowerGenerator.cs b/Projects/UOContent/Items/Misc/PowerGenerator.cs index 70bc92131..3ccb9f4e9 100644 --- a/Projects/UOContent/Items/Misc/PowerGenerator.cs +++ b/Projects/UOContent/Items/Misc/PowerGenerator.cs @@ -206,8 +206,12 @@ public partial class ControlPanel : AddonComponent ); to.BoltEffect(0); - to.LocalOverheadMessage(MessageType.Regular, 0xC9, true, "* Your body convulses from electric shock *"); - to.NonlocalOverheadMessage(MessageType.Regular, 0xC9, true, $"* {to.Name} spasms from electric shock *"); + + // * Your body convulses from electric shock * + to.LocalOverheadMessage(MessageType.Regular, 0xC9, 1114443); + + // * ~1_NAME~ spasms from electric shock * + to.NonlocalOverheadMessage(MessageType.Regular, 0xC9, 1114444, to.Name); AOS.Damage(to, to, 60, 0, 0, 0, 0, 100); @@ -514,13 +518,11 @@ public partial class ControlPanel : AddonComponent m_To.PlaySound(0x28); - m_To.LocalOverheadMessage(MessageType.Regular, 0xC9, true, "* Your body convulses from electric shock *"); - m_To.NonlocalOverheadMessage( - MessageType.Regular, - 0xC9, - true, - $"* {m_To.Name} spasms from electric shock *" - ); + // * Your body convulses from electric shock * + m_To.LocalOverheadMessage(MessageType.Regular, 0xC9, 1114443); + + // * ~1_NAME~ spasms from electric shock * + m_To.NonlocalOverheadMessage(MessageType.Regular, 0xC9, 1114444, m_To.Name); AOS.Damage(m_To, m_To, 20, 0, 0, 0, 0, 100); diff --git a/Projects/UOContent/Items/Talismans/TalismanSummons.cs b/Projects/UOContent/Items/Talismans/TalismanSummons.cs index 262334eb7..fc74d6fed 100644 --- a/Projects/UOContent/Items/Talismans/TalismanSummons.cs +++ b/Projects/UOContent/Items/Talismans/TalismanSummons.cs @@ -588,9 +588,10 @@ namespace Server.Mobiles } new VorpalBunny.BunnyHole().MoveToWorld(Location, Map); - Frozen = true; - Say("* The bunny begins to dig a tunnel back to its underground lair *"); + + // * The bunny begins to dig a tunnel back to its underground lair * + Say(1114450); PlaySound(0x247); Timer.StartTimer(TimeSpan.FromSeconds(5.0), Delete); diff --git a/Projects/UOContent/Misc/Poison.cs b/Projects/UOContent/Misc/Poison.cs index 7434ee2c8..57135718d 100644 --- a/Projects/UOContent/Misc/Poison.cs +++ b/Projects/UOContent/Misc/Poison.cs @@ -98,19 +98,11 @@ namespace Server { if (m_Mobile.CurePoison(m_Mobile)) { - m_Mobile.LocalOverheadMessage( - MessageType.Emote, - 0x3F, - true, - "* You feel yourself resisting the effects of the poison *" - ); + // * You feel yourself resisting the effects of the poison * + m_Mobile.LocalOverheadMessage(MessageType.Emote, 0x3F, 1114441); - m_Mobile.NonlocalOverheadMessage( - MessageType.Emote, - 0x3F, - true, - $"* {m_Mobile.Name} seems resistant to the poison *" - ); + // * ~1_NAME~ seems resistant to the poison * + m_Mobile.NonlocalOverheadMessage(MessageType.Emote, 0x3F, 1114442, m_Mobile.Name); Stop(); return; diff --git a/Projects/UOContent/Mobiles/BaseCreature.cs b/Projects/UOContent/Mobiles/BaseCreature.cs index a66049c5e..254f49043 100644 --- a/Projects/UOContent/Mobiles/BaseCreature.cs +++ b/Projects/UOContent/Mobiles/BaseCreature.cs @@ -1460,12 +1460,8 @@ namespace Server.Mobiles if (SubdueBeforeTame && !Controlled && oldHits > HitsMax / 10 && Hits <= HitsMax / 10) { - PublicOverheadMessage( - MessageType.Regular, - 0x3B2, - false, - "* The creature has been beaten into subjugation! *" - ); + // * The creature has been beaten into subjugation! * + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080057); } } @@ -1794,7 +1790,7 @@ namespace Server.Mobiles } } - from.SendMessage("You cut away some scales, but they remain on the corpse."); + from.SendLocalizedMessage(1079284); // You cut away some scales, but they remain on the corpse. } corpse.Carved = true; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs index cb8c937ba..9a599f2f2 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs @@ -91,12 +91,15 @@ namespace Server.Mobiles { if (Hits < 50) { - PublicOverheadMessage(MessageType.Regular, 0x3B2, true, "* The solen's acid sac is burst open! *"); + // The solen's acid sac is burst open! + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080038); BurstSac = true; } } else if (from != null && from != this && InRange(from, 1)) { + // * The solen's damaged acid sac squirts acid! * + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080060); SpillAcid(from, 1); } } diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs index 2d597f04c..5b7407c55 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs @@ -92,12 +92,15 @@ namespace Server.Mobiles { if (Hits < 50) { - PublicOverheadMessage(MessageType.Regular, 0x3B2, true, "* The solen's acid sac is burst open! *"); + // The solen's acid sac is burst open! + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080038); BurstSac = true; } } else if (from != null && from != this && InRange(from, 1)) { + // * The solen's damaged acid sac squirts acid! * + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080060); SpillAcid(from, 1); } } diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs index 89a856235..6f22d0461 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs @@ -90,12 +90,15 @@ namespace Server.Mobiles { if (Hits < 50) { - PublicOverheadMessage(MessageType.Regular, 0x3B2, true, "* The solen's acid sac is burst open! *"); + // The solen's acid sac is burst open! + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080038); BurstSac = true; } } else if (from != null && from != this && InRange(from, 1)) { + // * The solen's damaged acid sac squirts acid! * + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080060); SpillAcid(from, 1); } } diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs index 42e1b0e09..80f7cbcfd 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs @@ -90,12 +90,15 @@ namespace Server.Mobiles { if (Hits < 50) { - PublicOverheadMessage(MessageType.Regular, 0x3B2, true, "* The solen's acid sac is burst open! *"); + // The solen's acid sac is burst open! + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080038); BurstSac = true; } } else if (from != null && from != this && InRange(from, 1)) { + // * The solen's damaged acid sac squirts acid! * + PublicOverheadMessage(MessageType.Regular, 0x3B2, 1080060); SpillAcid(from, 1); } } diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs index 9e721b111..c34c9b9ab 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -126,13 +126,13 @@ namespace Server.Mobiles rabid.MoveToWorld(loc, combatant.Map); } - Say( - 1071932 - ); // Creatures of the forest, I call to thee! Aid me in the fight against all that is evil! + // Creatures of the forest, I call to thee! Aid me in the fight against all that is evil! + Say(1071932); } else if (combatant.Player) { - Say(true, "I call a plague of insects to sting your flesh!"); + // I call a plague of insects to sting your flesh! + Say(1071931); var count = 0; Timer.StartTimer( @@ -158,12 +158,8 @@ namespace Server.Mobiles { if (message) { - m.PublicOverheadMessage( - MessageType.Emote, - m.SpeechHue, - true, - "* The open flame begins to scatter the swarm of insects *" - ); + // * The open flame begins to scatter the swarm of insects! * + m.PublicOverheadMessage(MessageType.Emote, m.SpeechHue, 1071925); } timer.Cancel(); @@ -186,18 +182,11 @@ namespace Server.Mobiles if (count % 4 == 0) { - m.LocalOverheadMessage( - MessageType.Emote, - m.SpeechHue, - true, - "* The swarm of insects bites and stings your flesh! *" - ); - m.NonlocalOverheadMessage( - MessageType.Emote, - m.SpeechHue, - true, - $"* {m.Name} is stung by a swarm of insects *" - ); + // * The swarm of insects bites and stings your flesh! * + m.LocalOverheadMessage(MessageType.Emote, m.SpeechHue, 1071905); + + // * ~1_VAL~ is stung by a swarm of insects * + m.NonlocalOverheadMessage(MessageType.Emote, m.SpeechHue, 1071924); } m.FixedParticles(0x91C, 10, 180, 9539, EffectLayer.Waist); diff --git a/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs b/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs index 3e8968483..b6adac231 100644 --- a/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs +++ b/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs @@ -72,10 +72,12 @@ namespace Server.Mobiles return; } + // TODO: Add splashing in the water - cliloc 1114451 new BunnyHole().MoveToWorld(Location, Map); - Frozen = true; - Say("* The bunny begins to dig a tunnel back to its underground lair *"); + + // * The bunny begins to dig a tunnel back to its underground lair * + Say(1114450); PlaySound(0x247); Timer.StartTimer(TimeSpan.FromSeconds(5.0), Delete);