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

fix: Cleans up some comments and spell code (#1120)

Browse source
This commit is contained in:
Kamron Batman 2022-07-16 19:45:41 -07:00 • committed by GitHub
parent 56c97ca84a
commit fa3515f930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 338 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/UOContent/Engines/Plants/MainPlantGump.cs
View file

@ -336,10 +336,9 @@ namespace Server.Engines.Plants
if (bev == null)
{
from.Target = new PlantPourTarget(m_Plant);
from.SendLocalizedMessage(
1060808,
$"#{m_Plant.GetLocalizedPlantStatus()}"
); // Target the container you wish to use to water the ~1_val~.
// Target the container you wish to use to water the ~1_val~.
from.SendLocalizedMessage(1060808, $"#{m_Plant.GetLocalizedPlantStatus()}");
}
else
{
@ -406,10 +405,9 @@ namespace Server.Engines.Plants
from.SendLocalizedMessage(1061884); // You don't have any strong potions of that type in your pack.
from.Target = new PlantPourTarget(m_Plant);
from.SendLocalizedMessage(
1060808,
$"#{m_Plant.GetLocalizedPlantStatus()}"
); // Target the container you wish to use to water the ~1_val~.
// Target the container you wish to use to water the ~1_val~.
from.SendLocalizedMessage(1060808, $"#{m_Plant.GetLocalizedPlantStatus()}");
return;
}

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

@ -33,11 +33,8 @@ namespace Server.Items
if (!from.CanBeginAction<GreenThorns>())
{
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061908
); // * You must wait a while before planting another thorn. *
// * You must wait a while before planting another thorn. *
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061908);
return;
}
@ -80,11 +77,8 @@ namespace Server.Items
if (!from.CanBeginAction<GreenThorns>())
{
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061908
); // * You must wait a while before planting another thorn. *
// * You must wait a while before planting another thorn. *
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061908);
return;
}
@ -101,11 +95,8 @@ namespace Server.Items
if (targeted is not LandTarget land)
{
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061912
); // * You cannot plant a green thorn there! *
// * You cannot plant a green thorn there! *
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061912);
}
else
{
@ -113,27 +104,18 @@ namespace Server.Items
if (effect == null)
{
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061913
); // * You sense it would be useless to plant a green thorn there. *
// * You sense it would be useless to plant a green thorn there. *
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061913);
}
else
{
m_Thorn.Consume();
from.LocalOverheadMessage(
MessageType.Emote,
0x961,
1061914
); // * You push the strange green thorn into the ground *
from.NonlocalOverheadMessage(
MessageType.Emote,
0x961,
1061915,
from.Name
); // * ~1_PLAYER_NAME~ pushes a strange green thorn into the ground. *
// * You push the strange green thorn into the ground *
from.LocalOverheadMessage(MessageType.Emote, 0x961, 1061914);
// * ~1_PLAYER_NAME~ pushes a strange green thorn into the ground. *
from.NonlocalOverheadMessage(MessageType.Emote, 0x961, 1061915, from.Name);
from.BeginAction<GreenThorns>();
new EndActionTimer(from).Start();

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

@ -142,11 +142,8 @@ namespace Server.Engines.Plants
}
else if (dirt.Amount < _dirtNeeded)
{
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061896
); // You need more dirt to fill a plant bowl!
// You need more dirt to fill a plant bowl!
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061896);
}
else
{
@ -157,21 +154,15 @@ namespace Server.Engines.Plants
dirt.Consume(_dirtNeeded);
m_PlantBowl.Delete();
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061895
); // You fill the bowl with fresh dirt.
// You fill the bowl with fresh dirt.
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061895);
}
else
{
fullBowl.Delete();
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061894
); // There is no room in your backpack for a bowl full of dirt!
// There is no room in your backpack for a bowl full of dirt!
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061894);
}
}
}
@ -189,20 +180,14 @@ namespace Server.Engines.Plants
{
fullBowl.Delete();
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061894
); // There is no room in your backpack for a bowl full of dirt!
// There is no room in your backpack for a bowl full of dirt!
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061894);
}
}
else
{
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1061893
); // You'll want to gather fresh dirt in order to raise a healthy plant!
// You'll want to gather fresh dirt in order to raise a healthy plant!
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061893);
}
}

6
Projects/UOContent/Engines/Plants/PlantItem.cs
View file

@ -475,10 +475,8 @@ namespace Server.Engines.Plants
}
else if (m_PlantStatus != PlantStatus.BowlOfDirt)
{
from.SendLocalizedMessage(
1080389,
$"#{GetLocalizedPlantStatus()}"
); // This bowl of dirt already has a ~1_val~ in it!
// This bowl of dirt already has a ~1_val~ in it!
from.SendLocalizedMessage(1080389, $"#{GetLocalizedPlantStatus()}");
}
else if (PlantSystem.Water < 2)
{

12
Projects/UOContent/Engines/Plants/PollinateTarget.cs
View file

@ -15,10 +15,8 @@ namespace Server.Engines.Plants
{
if (!m_Plant.IsUsableBy(from))
{
m_Plant.LabelTo(
from,
1061856
); // You must have the item in your backpack or locked down in order to use it.
// You must have the item in your backpack or locked down in order to use it.
m_Plant.LabelTo(from, 1061856);
}
else if (!m_Plant.IsCrossable)
{
@ -40,10 +38,8 @@ namespace Server.Engines.Plants
}
else if (!targ.IsUsableBy(from))
{
targ.LabelTo(
from,
1061856
); // You must have the item in your backpack or locked down in order to use it.
// You must have the item in your backpack or locked down in order to use it.
targ.LabelTo(from, 1061856);
}
else if (!targ.IsCrossable)
{

18
Projects/UOContent/Engines/Plants/ReproductionGump.cs
View file

@ -195,10 +195,8 @@ namespace Server.Engines.Plants
}
else if (!m_Plant.PlantSystem.PollenProducing)
{
m_Plant.LabelTo(
from,
1053051
); // You cannot gather pollen from a plant in this stage of development!
// You cannot gather pollen from a plant in this stage of development!
m_Plant.LabelTo(from, 1053051);
}
else if (m_Plant.PlantSystem.Health < PlantHealth.Healthy)
{
@ -248,10 +246,8 @@ namespace Server.Engines.Plants
else
{
resource.Delete();
m_Plant.LabelTo(
from,
1053058
); // You attempt to gather as many resources as you can hold, but your backpack is full.
// You attempt to gather as many resources as you can hold, but your backpack is full.
m_Plant.LabelTo(from, 1053058);
}
}
@ -283,10 +279,8 @@ namespace Server.Engines.Plants
else
{
seed.Delete();
m_Plant.LabelTo(
from,
1053062
); // You attempt to gather as many seeds as you can hold, but your backpack is full.
// You attempt to gather as many seeds as you can hold, but your backpack is full.
m_Plant.LabelTo(from, 1053062);
}
}

7
Projects/UOContent/Engines/Plants/SetToDecorativeGump.cs
View file

@ -76,10 +76,9 @@ namespace Server.Engines.Plants
case 3: // Ok
{
m_Plant.PlantStatus = PlantStatus.DecorativePlant;
m_Plant.LabelTo(
from,
1053077
); // You prune the plant. This plant will no longer produce resources or seeds, but will require no upkeep.
// You prune the plant.
// This plant will no longer produce resources or seeds, but will require no upkeep.
m_Plant.LabelTo(from, 1053077);
break;
}