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

36
Scripts/Engines/Quests/Witch Apprentice/Conversations.cs
View file

@ -193,9 +193,8 @@ namespace Server.Engines.Quests.Hag
*/
return 1055059;
}
else
{
/* <I>Captain Blackheart looks up from polishing his cutlass, glaring at
/* <I>Captain Blackheart looks up from polishing his cutlass, glaring at
* you with red-rimmed eyes.</I><BR><BR>
*
* Well, well. Lookit the wee little deck swabby. Aren't ye a cute lil'
@ -215,14 +214,12 @@ namespace Server.Engines.Quests.Hag
* <I>The drunken pirate captain leans back in his chair, taking another gulp of
* his drink before he starts in on another bawdy pirate song.</I>
*/
return 1055057;
}
return 1055057;
}
else
if ( m_Drunken )
{
if ( m_Drunken )
{
/* <I>The inebriated pirate looks up at you with a wry grin.</I><BR><BR>
/* <I>The inebriated pirate looks up at you with a wry grin.</I><BR><BR>
*
* Well hello again, me little matey. I see ye have a belly full of rotgut
* in ye. I bet ye think you're a right hero, ready te face the world. But
@ -238,11 +235,10 @@ namespace Server.Engines.Quests.Hag
* <I>Captain Blackheart shoves you aside, banging his cutlass against the
* table as he calls to the waitress for another round.</I>
*/
return 1055056;
}
else
{
/* <I>Captain Blackheart looks up from his drink, almost tipping over
return 1055056;
}
/* <I>Captain Blackheart looks up from his drink, almost tipping over
* his chair as he looks you up and down.</I><BR><BR>
*
* You again? I thought I told ye te get lost? Go on with ye! Ye ain't
@ -255,9 +251,7 @@ namespace Server.Engines.Quests.Hag
* <I>The inebriated pirate bolts back another mug of ale and brushes you
* off with a wave of his hand.</I>
*/
return 1055058;
}
}
return 1055058;
}
}
@ -319,9 +313,8 @@ namespace Server.Engines.Quests.Hag
*/
return 1055054;
}
else
{
/* <I>The drunken pirate, Captain Blackheart, looks up from his bottle
/* <I>The drunken pirate, Captain Blackheart, looks up from his bottle
* of whiskey with a pleased expression.</I><BR><BR>
*
* Well looky here! I didn't think a landlubber like yourself had the pirate
@ -341,8 +334,7 @@ namespace Server.Engines.Quests.Hag
* <I>Captain Blackheart hands you a jug of his famous Whiskey. You think it best
* to return it to the Hag, rather than drink any of the noxious swill.</I>
*/
return 1055011;
}
return 1055011;
}
}

3
Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs
View file

@ -63,8 +63,7 @@ namespace Server.Engines.Quests.Hag
if ( index >= 0 && index < m_Table.Length )
return m_Table[index];
else
return m_Table[0];
return m_Table[0];
}
public static Ingredient RandomIngredient( Ingredient[] oldIngredients )

8
Scripts/Engines/Quests/Witch Apprentice/Objectives.cs
View file

@ -297,15 +297,13 @@ namespace Server.Engines.Quests.Hag
return 1055045;
}
}
else
{
/* You are still attempting to obtain a jug of Captain Blackheart's
/* You are still attempting to obtain a jug of Captain Blackheart's
* Whiskey, but the drunkard Captain refuses to share his unique brew.
* You must prove your worthiness as a pirate to Blackheart before he'll
* offer you a jug.
*/
return 1055055;
}
return 1055055;
}
}