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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Scripts/Engines/Harvest/Core/HarvestSystem.cs
View file

@ -96,11 +96,7 @@ namespace Server.Engines.Harvest
if (!CheckHarvest(from, tool))
return;
int tileID;
Map map;
Point3D loc;
if (!GetHarvestDetails(from, tool, toHarvest, out tileID, out map, out loc))
if (!GetHarvestDetails(from, tool, toHarvest, out int tileID, out Map map, out Point3D loc))
{
OnBadHarvestTarget(from, tool, toHarvest);
return;
@ -340,11 +336,7 @@ namespace Server.Engines.Harvest
return false;
}
int tileID;
Map map;
Point3D loc;
if (!GetHarvestDetails(from, tool, toHarvest, out tileID, out map, out loc))
if (!GetHarvestDetails(from, tool, toHarvest, out int tileID, out Map map, out Point3D loc))
{
from.EndAction(locked);
OnBadHarvestTarget(from, tool, toHarvest);
@ -417,11 +409,7 @@ namespace Server.Engines.Harvest
if (!CheckHarvest(from, tool))
return;
int tileID;
Map map;
Point3D loc;
if (!GetHarvestDetails(from, tool, toHarvest, out tileID, out map, out loc))
if (!GetHarvestDetails(from, tool, toHarvest, out int tileID, out Map map, out Point3D loc))
{
OnBadHarvestTarget(from, tool, toHarvest);
return;

8
Scripts/Engines/Harvest/Core/HarvestTarget.cs
View file

@ -31,10 +31,12 @@ namespace Server.Engines.Harvest
if (from is PlayerMobile player)
{
QuestSystem qs = player.Quest;
if (!(qs is WitchApprenticeQuest))
return;
if (qs is WitchApprenticeQuest &&
qs.FindObjective(typeof(FindIngredientObjective)) is FindIngredientObjective obj &&
!obj.Completed && obj.Ingredient == Ingredient.Bones)
FindIngredientObjective obj = qs.FindObjective<FindIngredientObjective>();
if (obj?.Completed == false && obj.Ingredient == Ingredient.Bones)
{
player.SendLocalizedMessage(
1055037); // You finish your grim work, finding some of the specific bones listed in the Hag's recipe.

14
Scripts/Engines/Harvest/Fishing.cs
View file

@ -137,9 +137,9 @@ namespace Server.Engines.Harvest
if (qs is CollectorQuest)
{
QuestObjective obj = qs.FindObjective(typeof(FishPearlsObjective));
QuestObjective obj = qs.FindObjective<FishPearlsObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
if (Utility.RandomDouble() < 0.5)
{
@ -167,8 +167,8 @@ namespace Server.Engines.Harvest
{
bool deepWater = SpecialFishingNet.FullValidation(map, loc.X, loc.Y);
double skillBase = from.Skills[SkillName.Fishing].Base;
double skillValue = from.Skills[SkillName.Fishing].Value;
double skillBase = from.Skills.Fishing.Base;
double skillValue = from.Skills.Fishing.Value;
for (int i = 0; i < m_MutateTable.Length; ++i)
{
@ -468,11 +468,7 @@ namespace Server.Engines.Harvest
{
base.OnHarvestStarted(from, tool, def, toHarvest);
int tileID;
Map map;
Point3D loc;
if (GetHarvestDetails(from, tool, toHarvest, out tileID, out map, out loc))
if (GetHarvestDetails(from, tool, toHarvest, out _, out Map map, out Point3D loc))
Timer.DelayCall(TimeSpan.FromSeconds(1.5),
delegate
{

4
Scripts/Engines/Harvest/Mining.cs
View file

@ -209,7 +209,7 @@ namespace Server.Engines.Harvest
if (def == OreAndStone)
{
if (from is PlayerMobile pm && pm.StoneMining && pm.ToggleMiningStone &&
from.Skills[SkillName.Mining].Base >= 100.0 && 0.1 > Utility.RandomDouble())
from.Skills.Mining.Base >= 100.0 && 0.1 > Utility.RandomDouble())
return resource.Types[1];
return resource.Types[0];
@ -251,7 +251,7 @@ namespace Server.Engines.Harvest
if (!base.CheckHarvest(from, tool, def, toHarvest))
return false;
if (def == Sand && !(from is PlayerMobile mobile && mobile.Skills[SkillName.Mining].Base >= 100.0 &&
if (def == Sand && !(from is PlayerMobile mobile && mobile.Skills.Mining.Base >= 100.0 &&
mobile.SandMining))
{
OnBadHarvestTarget(from, tool, toHarvest);