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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Projects/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs
View file

@ -65,16 +65,22 @@ namespace Server.Engines.CannedEvil
Skull = null;
if (from.Map != Map || !from.InRange(GetWorldLocation(), 3))
{
from.SendLocalizedMessage(500446); // That is too far away.
}
else if (!Harrower.CanSpawn)
{
from.SendMessage("The harrower has already been spawned.");
}
else if (m_Skull == null)
{
from.SendLocalizedMessage(1049485); // What would you like to sacrifice?
from.Target = new SacrificeTarget(this);
}
else
SendLocalizedMessageTo(from, 1049487); // I already have my champions awakening skull!
{
SendLocalizedMessageTo(from, 1049487, ""); // I already have my champions awakening skull!
}
}
public void EndSacrifice(Mobile from, ChampionSkull skull)
@ -86,15 +92,25 @@ namespace Server.Engines.CannedEvil
Skull = null;
if (from.Map != Map || !from.InRange(GetWorldLocation(), 3))
{
from.SendLocalizedMessage(500446); // That is too far away.
}
else if (!Harrower.CanSpawn)
{
from.SendMessage("The harrower has already been spawned.");
}
else if (skull == null)
SendLocalizedMessageTo(from, 1049488); // That is not my champions awakening skull!
{
SendLocalizedMessageTo(from, 1049488, ""); // That is not my champions awakening skull!
}
else if (m_Skull != null)
SendLocalizedMessageTo(from, 1049487); // I already have my champions awakening skull!
{
SendLocalizedMessageTo(from, 1049487, ""); // I already have my champions awakening skull!
}
else if (!skull.IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1049486); // You can only sacrifice items that are in your backpack!
}
else
{
if (skull.Type == Type)
@ -105,7 +121,9 @@ namespace Server.Engines.CannedEvil
Skull = skull;
}
else
SendLocalizedMessageTo(from, 1049488); // That is not my champions awakening skull!
{
SendLocalizedMessageTo(from, 1049488, ""); // That is not my champions awakening skull!
}
}
}

20
Projects/Scripts/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -950,24 +950,24 @@ namespace Server.Engines.CannedEvil
Dictionary<Mobile, int> validEntries = new Dictionary<Mobile, int>();
foreach (var (key, value) in m_DamageEntries)
if (IsEligible(key, artifact))
foreach (KeyValuePair<Mobile, int> kvp in m_DamageEntries)
if (IsEligible(kvp.Key, artifact))
{
validEntries.Add(key, value);
totalDamage += value;
validEntries.Add(kvp.Key, kvp.Value);
totalDamage += kvp.Value;
}
int randomDamage = Utility.RandomMinMax(1, totalDamage);
totalDamage = 0;
foreach (var (key, value) in validEntries)
foreach (KeyValuePair<Mobile, int> kvp in validEntries)
{
totalDamage += value;
totalDamage += kvp.Value;
if (totalDamage >= randomDamage)
{
GiveArtifact(key, artifact);
GiveArtifact(kvp.Key, artifact);
return;
}
}
@ -1001,10 +1001,10 @@ namespace Server.Engines.CannedEvil
writer.Write(m_SPawnSzMod);
writer.Write(m_DamageEntries.Count);
foreach (var (key, value) in m_DamageEntries)
foreach (KeyValuePair<Mobile, int> kvp in m_DamageEntries)
{
writer.Write(key);
writer.Write(value);
writer.Write(kvp.Key);
writer.Write(kvp.Value);
}
writer.Write(ConfinedRoaming);