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

Fixes implicit ternary expressions

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 14:56:48 -07:00
parent c85b0a740c
commit ff26dfa375
345 changed files with 1905 additions and 2336 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Engines/Quests/Dark Tides/Conversations.cs
View file

@ -178,14 +178,12 @@ namespace Server.Engines.Quests.Necro
*/
return 1062058;
}
else // from well of tears
{
/* You have arrived at the well, but no longer have the scroll
/* You have arrived at the well, but no longer have the scroll
* of calling. Use Mardoth's teleporter to return to the
* Crystal Cave and fetch another scroll from the box.
*/
return 1060129;
}
return 1060129;
}
}

9
Scripts/Engines/Quests/Dark Tides/Items/DarkTidesTeleporter.cs
View file

@ -22,25 +22,26 @@ namespace Server.Engines.Quests.Necro
qs.AddConversation( new RadarConversation() );
return true;
}
else if ( qs.IsObjectiveInProgress( typeof( FindCrystalCaveObjective ) ) )
if ( qs.IsObjectiveInProgress( typeof( FindCrystalCaveObjective ) ) )
{
loc = new Point3D( 1194, 521, -90 );
map = Map.Malas;
return true;
}
else if ( qs.IsObjectiveInProgress( typeof( FindCityOfLightObjective ) ) )
if ( qs.IsObjectiveInProgress( typeof( FindCityOfLightObjective ) ) )
{
loc = new Point3D( 1091, 519, -90 );
map = Map.Malas;
return true;
}
else if ( qs.IsObjectiveInProgress( typeof( ReturnToCrystalCaveObjective ) ) )
if ( qs.IsObjectiveInProgress( typeof( ReturnToCrystalCaveObjective ) ) )
{
loc = new Point3D( 1194, 521, -90 );
map = Map.Malas;
return true;
}
else if ( DarkTidesQuest.HasLostCallingScroll( player ) )
if ( DarkTidesQuest.HasLostCallingScroll( player ) )
{
loc = new Point3D( 1194, 521, -90 );
map = Map.Malas;

8
Scripts/Engines/Quests/Dark Tides/Objectives.cs
View file

@ -382,14 +382,12 @@ namespace Server.Engines.Quests.Necro
*/
return 1060131;
}
else
{
/* Although you were slain by the cowardly paladin,
/* Although you were slain by the cowardly paladin,
* you managed to complete the rite of calling as
* instructed. Return to Mardoth.
*/
return 1060132;
}
return 1060132;
}
}