Removes literal variables (#257)
This commit is contained in:
parent
580da8a0cc
commit
4d6e584b6c
359 changed files with 1306 additions and 1306 deletions
|
|
@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Ambitious
|
|||
|
||||
if (redSolen)
|
||||
{
|
||||
return @from is RedSolenQueen;
|
||||
return from is RedSolenQueen;
|
||||
}
|
||||
|
||||
return from is BlackSolenQueen;
|
||||
|
|
|
|||
|
|
@ -161,15 +161,15 @@ namespace Server.Engines.Quests.Collector
|
|||
{
|
||||
if (m_Quantity < m_Partial)
|
||||
{
|
||||
LabelTo(@from, 1055137); // a section of an obsidian statue
|
||||
LabelTo(from, 1055137); // a section of an obsidian statue
|
||||
}
|
||||
else if (m_Quantity < m_Completed)
|
||||
{
|
||||
LabelTo(@from, 1055138); // a partially reconstructed obsidian statue
|
||||
LabelTo(from, 1055138); // a partially reconstructed obsidian statue
|
||||
}
|
||||
else
|
||||
{
|
||||
LabelTo(@from, 1055139, m_StatueName); // an obsidian statue of ~1_STATUE_NAME~
|
||||
LabelTo(from, 1055139, m_StatueName); // an obsidian statue of ~1_STATUE_NAME~
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -189,7 +189,7 @@ namespace Server.Engines.Quests.Collector
|
|||
{
|
||||
if (!IsChildOf(from.Backpack))
|
||||
{
|
||||
@from.Send(
|
||||
from.Send(
|
||||
new MessageLocalized(
|
||||
Serial,
|
||||
ItemID,
|
||||
|
|
@ -204,7 +204,7 @@ namespace Server.Engines.Quests.Collector
|
|||
}
|
||||
else
|
||||
{
|
||||
@from.Target = new InternalTarget(this);
|
||||
from.Target = new InternalTarget(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -243,7 +243,7 @@ namespace Server.Engines.Quests.Collector
|
|||
{
|
||||
for (var i = 0; i < m_Obsidian.Quantity - 1; i++)
|
||||
{
|
||||
@from.AddToBackpack(new Obsidian());
|
||||
from.AddToBackpack(new Obsidian());
|
||||
}
|
||||
|
||||
m_Obsidian.Quantity = 1;
|
||||
|
|
@ -283,10 +283,10 @@ namespace Server.Engines.Quests.Collector
|
|||
|
||||
if (targObsidian.Quantity >= m_Completed)
|
||||
{
|
||||
targObsidian.StatueName = RandomName(@from);
|
||||
targObsidian.StatueName = RandomName(from);
|
||||
}
|
||||
|
||||
@from.Send(
|
||||
from.Send(
|
||||
new AsciiMessage(
|
||||
targObsidian.Serial,
|
||||
targObsidian.ItemID,
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ namespace Server.Items
|
|||
{
|
||||
foreach (var entry in moongates.Entries)
|
||||
{
|
||||
var dist = @from.GetDistanceToSqrt(entry.Location);
|
||||
var dist = from.GetDistanceToSqrt(entry.Location);
|
||||
if (moongateDistance > dist)
|
||||
{
|
||||
closestMoongate = entry.Location;
|
||||
|
|
@ -149,7 +149,7 @@ namespace Server.Items
|
|||
{
|
||||
foreach (var p in banks)
|
||||
{
|
||||
var dist = @from.GetDistanceToSqrt(p);
|
||||
var dist = from.GetDistanceToSqrt(p);
|
||||
if (bankDistance > dist)
|
||||
{
|
||||
closestBank = p;
|
||||
|
|
@ -165,11 +165,11 @@ namespace Server.Items
|
|||
}
|
||||
else if (moongateDistance > m_LongDistance)
|
||||
{
|
||||
moonMsg = 1046449 + (int)@from.GetDirectionTo(closestMoongate); // A moongate is * from here
|
||||
moonMsg = 1046449 + (int)from.GetDirectionTo(closestMoongate); // A moongate is * from here
|
||||
}
|
||||
else if (moongateDistance > m_ShortDistance)
|
||||
{
|
||||
moonMsg = 1048010 + (int)@from.GetDirectionTo(closestMoongate); // There is a Moongate * of here.
|
||||
moonMsg = 1048010 + (int)from.GetDirectionTo(closestMoongate); // There is a Moongate * of here.
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -185,11 +185,11 @@ namespace Server.Items
|
|||
}
|
||||
else if (bankDistance > m_LongDistance)
|
||||
{
|
||||
bankMsg = 1046462 + (int)@from.GetDirectionTo(closestBank); // A town is * from here
|
||||
bankMsg = 1046462 + (int)from.GetDirectionTo(closestBank); // A town is * from here
|
||||
}
|
||||
else if (bankDistance > m_ShortDistance)
|
||||
{
|
||||
bankMsg = 1048002 + (int)@from.GetDirectionTo(closestBank); // There is a city Bank * of here.
|
||||
bankMsg = 1048002 + (int)from.GetDirectionTo(closestBank); // There is a city Bank * of here.
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ namespace Server.Engines.Quests.Necro
|
|||
qs.IsObjectiveInProgress(typeof(FindWellOfTearsObjective)) ||
|
||||
qs.IsObjectiveInProgress(typeof(UseCallingScrollObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<KronusScroll>() == null;
|
||||
return from.Backpack?.FindItemByType<KronusScroll>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ namespace Server.Engines.Quests.Necro
|
|||
|
||||
if (from.Alive)
|
||||
{
|
||||
if (@from is PlayerMobile pm)
|
||||
if (from is PlayerMobile pm)
|
||||
{
|
||||
var qs = pm.Quest;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,12 +39,12 @@ namespace Server.Engines.Quests.Necro
|
|||
{
|
||||
if (horn.Charges < 10)
|
||||
{
|
||||
SayTo(@from, 1049384); // I have recharged the item for you.
|
||||
SayTo(from, 1049384); // I have recharged the item for you.
|
||||
horn.Charges = 10;
|
||||
}
|
||||
else
|
||||
{
|
||||
SayTo(@from, 1049385); // That doesn't need recharging yet.
|
||||
SayTo(from, 1049385); // That doesn't need recharging yet.
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ namespace Server.Engines.Quests.Ninja
|
|||
{
|
||||
if (qs.IsObjectiveInProgress(typeof(GiveZoelNoteObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<NoteForZoel>() == null;
|
||||
return from.Backpack?.FindItemByType<NoteForZoel>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ namespace Server.Engines.Quests.Ninja
|
|||
{
|
||||
if (qs.IsObjectiveInProgress(typeof(GiveEminoSwordObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<EminosKatana>() == null;
|
||||
return from.Backpack?.FindItemByType<EminosKatana>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ namespace Server.Engines.Quests.Ninja
|
|||
var obj = player.Quest.FindObjective<HallwayWalkObjective>();
|
||||
if (obj?.StolenTreasure == true)
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
from.SendLocalizedMessage(
|
||||
1063247
|
||||
); // The guard is watching you carefully! It would be unwise to remove another item from here.
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ namespace Server.Engines.Quests.Samurai
|
|||
{
|
||||
if (qs.IsObjectiveInProgress(typeof(FifthTrialReturnObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<HaochisKatana>() == null;
|
||||
return from.Backpack?.FindItemByType<HaochisKatana>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ namespace Server.Engines.Quests.Samurai
|
|||
var obj = player.Quest.FindObjective<FifthTrialIntroObjective>();
|
||||
if (obj?.StolenTreasure == true)
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
from.SendLocalizedMessage(
|
||||
1063247
|
||||
); // The guard is watching you carefully! It would be unwise to remove another item from here.
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ namespace Server.Engines.Quests.Samurai
|
|||
obj.Complete();
|
||||
qs.AddObjective(new FourthTrialReturnObjective(false));
|
||||
|
||||
SayTo(@from, 1063241); // I thank thee. This gold will be a great help to me and mine!
|
||||
SayTo(from, 1063241); // I thank thee. This gold will be a great help to me and mine!
|
||||
|
||||
gold.Consume(); // Intentional difference from OSI: don't take all the gold of poor newbies!
|
||||
return gold.Deleted;
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ namespace Server.Engines.Quests.Matriarch
|
|||
|
||||
if (from.Alive)
|
||||
{
|
||||
if (@from is PlayerMobile pm)
|
||||
if (from is PlayerMobile pm)
|
||||
{
|
||||
if (pm.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Matriarch
|
|||
|
||||
if (redSolen)
|
||||
{
|
||||
return @from is BlackSolenInfiltratorWarrior || @from is BlackSolenInfiltratorQueen;
|
||||
return from is BlackSolenInfiltratorWarrior || from is BlackSolenInfiltratorQueen;
|
||||
}
|
||||
|
||||
return from is RedSolenInfiltratorWarrior || from is RedSolenInfiltratorQueen;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ namespace Server.Engines.Quests.Naturalist
|
|||
{
|
||||
if (!nest.Special)
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
from.SendLocalizedMessage(
|
||||
1054058
|
||||
); // You begin recording your completed notes on a bit of parchment.
|
||||
}
|
||||
|
|
@ -69,7 +69,7 @@ namespace Server.Engines.Quests.Naturalist
|
|||
{
|
||||
if (m_StudyState != StudyState.Inactive)
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
from.SendLocalizedMessage(
|
||||
1054046
|
||||
); // You abandon your study of the Solen Egg Nest without gathering the needed information.
|
||||
}
|
||||
|
|
@ -100,24 +100,24 @@ namespace Server.Engines.Quests.Naturalist
|
|||
|
||||
if (nest.Special)
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
from.SendLocalizedMessage(
|
||||
1054056
|
||||
); // You notice something very odd about this Solen Egg Nest. You begin taking notes.
|
||||
}
|
||||
else
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
from.SendLocalizedMessage(
|
||||
1054045
|
||||
); // You begin studying the Solen Egg Nest to gather information.
|
||||
}
|
||||
|
||||
if (from.Female)
|
||||
{
|
||||
@from.PlaySound(0x30B);
|
||||
from.PlaySound(0x30B);
|
||||
}
|
||||
else
|
||||
{
|
||||
@from.PlaySound(0x419);
|
||||
from.PlaySound(0x419);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@ namespace Server.Engines.Quests.Doom
|
|||
{
|
||||
if (from.InRange(GetWorldLocation(), 2))
|
||||
{
|
||||
BeginSummon(@from);
|
||||
BeginSummon(from);
|
||||
}
|
||||
else
|
||||
{
|
||||
@from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
|
||||
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ namespace Server.Engines.Quests.Doom
|
|||
if (!bones.Deleted)
|
||||
{
|
||||
SayTo(
|
||||
@from,
|
||||
from,
|
||||
1050038
|
||||
); // You have already given me all the Daemon bones necessary to weave the spell. Keep these for a later time.
|
||||
}
|
||||
|
|
@ -112,7 +112,7 @@ namespace Server.Engines.Quests.Doom
|
|||
{
|
||||
// TODO: Accurate?
|
||||
SayTo(
|
||||
@from,
|
||||
from,
|
||||
1050038
|
||||
); // You have already given me all the Daemon bones necessary to weave the spell. Keep these for a later time.
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ namespace Server.Engines.Quests.Haven
|
|||
|
||||
if (ItemID == 0x2006) // Corpse form
|
||||
{
|
||||
@from.Send(
|
||||
from.Send(
|
||||
new MessageLocalized(
|
||||
Serial,
|
||||
ItemID,
|
||||
|
|
@ -104,7 +104,7 @@ namespace Server.Engines.Quests.Haven
|
|||
}
|
||||
else
|
||||
{
|
||||
@from.Send(
|
||||
from.Send(
|
||||
new MessageLocalized(
|
||||
Serial,
|
||||
ItemID,
|
||||
|
|
|
|||
|
|
@ -108,9 +108,9 @@ namespace Server.Engines.Quests.Haven
|
|||
if (from is PlayerMobile player)
|
||||
{
|
||||
if (player.Quest is UzeraanTurmoilQuest qs && dropped is Apple &&
|
||||
UzeraanTurmoilQuest.HasLostFertileDirt(@from))
|
||||
UzeraanTurmoilQuest.HasLostFertileDirt(from))
|
||||
{
|
||||
FocusTo(@from);
|
||||
FocusTo(from);
|
||||
|
||||
Item fertileDirt = new QuestFertileDirt();
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ namespace Server.Engines.Quests.Haven
|
|||
|
||||
if (ItemID == 0x2006) // Corpse form
|
||||
{
|
||||
@from.Send(
|
||||
from.Send(
|
||||
new MessageLocalized(
|
||||
Serial,
|
||||
ItemID,
|
||||
|
|
@ -142,7 +142,7 @@ namespace Server.Engines.Quests.Haven
|
|||
}
|
||||
else
|
||||
{
|
||||
@from.Send(
|
||||
from.Send(
|
||||
new MessageLocalized(
|
||||
Serial,
|
||||
ItemID,
|
||||
|
|
@ -161,7 +161,7 @@ namespace Server.Engines.Quests.Haven
|
|||
{
|
||||
if (from.InRange(GetWorldLocation(), 2))
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
from.SendLocalizedMessage(
|
||||
1049661,
|
||||
"",
|
||||
0x22
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ namespace Server.Engines.Quests.Haven
|
|||
{
|
||||
if (qs.IsObjectiveInProgress(typeof(ReturnScrollOfPowerObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<SchmendrickScrollOfPower>() == null;
|
||||
return from.Backpack?.FindItemByType<SchmendrickScrollOfPower>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -141,7 +141,7 @@ namespace Server.Engines.Quests.Haven
|
|||
{
|
||||
if (qs.IsObjectiveInProgress(typeof(ReturnFertileDirtObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<QuestFertileDirt>() == null;
|
||||
return from.Backpack?.FindItemByType<QuestFertileDirt>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -161,7 +161,7 @@ namespace Server.Engines.Quests.Haven
|
|||
{
|
||||
if (qs.IsObjectiveInProgress(typeof(ReturnDaemonBloodObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<QuestDaemonBlood>() == null;
|
||||
return from.Backpack?.FindItemByType<QuestDaemonBlood>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -181,7 +181,7 @@ namespace Server.Engines.Quests.Haven
|
|||
{
|
||||
if (qs.IsObjectiveInProgress(typeof(ReturnDaemonBoneObjective)))
|
||||
{
|
||||
return @from.Backpack?.FindItemByType<QuestDaemonBone>() == null;
|
||||
return from.Backpack?.FindItemByType<QuestDaemonBone>() == null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue