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

fix: Updates messages with clilocs (#1381)

Browse source
This commit is contained in:
Kamron Batman 2023-03-26 00:54:09 -07:00 • committed by GitHub
parent b8b283c210
commit e08efad9be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 79 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/Server/Items/Container.cs
View file

@ -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)

3
Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs
View file

@ -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)
{

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

@ -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;
}

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

@ -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);

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

@ -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);

8
Projects/UOContent/Items/Addons/SolenAntHole.cs
View file

@ -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

4
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -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.
}
}
}

20
Projects/UOContent/Items/Misc/PowerGenerator.cs
View file

@ -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);

5
Projects/UOContent/Items/Talismans/TalismanSummons.cs
View file

@ -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);

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

@ -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;

10
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -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;

5
Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs
View file

@ -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);
}
}

5
Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs
View file

@ -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);
}
}

5
Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs
View file

@ -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);
}
}

5
Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs
View file

@ -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);
}
}

33
Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs
View file

@ -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);

6
Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs
View file

@ -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);