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

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