Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -3,142 +3,130 @@ using Server.Mobiles;
namespace Server.Engines.Quests.Zento
{
public class FirstKillObjective : QuestObjective
{
public override object Message => 1063316;
public class FirstKillObjective : QuestObjective
{
public override object Message => 1063316;
public override void RenderProgress( BaseQuestGump gump )
{
if ( !Completed )
{
// Deathwatch Beetle Hatchlings killed:
gump.AddHtmlLocalized( 70, 260, 270, 100, 1063318, 0x12DC6BF, false, false );
public override void RenderProgress(BaseQuestGump gump)
{
if (!Completed)
{
// Deathwatch Beetle Hatchlings killed:
gump.AddHtmlLocalized(70, 260, 270, 100, 1063318, 0x12DC6BF, false, false);
gump.AddLabel( 70, 280, 0x64, "0" );
gump.AddLabel( 100, 280, 0x64, "/" );
gump.AddLabel( 130, 280, 0x64, "10" );
}
else
{
base.RenderProgress( gump );
}
}
gump.AddLabel(70, 280, 0x64, "0");
gump.AddLabel(100, 280, 0x64, "/");
gump.AddLabel(130, 280, 0x64, "10");
}
else
{
base.RenderProgress(gump);
}
}
public FirstKillObjective()
{
}
public override void OnKill(BaseCreature creature, Container corpse)
{
if (creature is DeathwatchBeetleHatchling)
Complete();
}
public override void OnKill( BaseCreature creature, Container corpse )
{
if ( creature is DeathwatchBeetleHatchling )
Complete();
}
public override void OnComplete()
{
System.AddObjective(new SecondKillObjective());
}
}
public override void OnComplete()
{
System.AddObjective( new SecondKillObjective() );
}
}
public class SecondKillObjective : QuestObjective
{
public override object Message => 1063320;
public class SecondKillObjective : QuestObjective
{
public override object Message => 1063320;
public override void RenderProgress(BaseQuestGump gump)
{
if (!Completed)
{
// Deathwatch Beetle Hatchlings killed:
gump.AddHtmlLocalized(70, 260, 270, 100, 1063318, 0x12DC6BF, false, false);
public override void RenderProgress( BaseQuestGump gump )
{
if ( !Completed )
{
// Deathwatch Beetle Hatchlings killed:
gump.AddHtmlLocalized( 70, 260, 270, 100, 1063318, 0x12DC6BF, false, false );
gump.AddLabel(70, 280, 0x64, "1");
gump.AddLabel(100, 280, 0x64, "/");
gump.AddLabel(130, 280, 0x64, "10");
}
else
{
base.RenderProgress(gump);
}
}
gump.AddLabel( 70, 280, 0x64, "1" );
gump.AddLabel( 100, 280, 0x64, "/" );
gump.AddLabel( 130, 280, 0x64, "10" );
}
else
{
base.RenderProgress( gump );
}
}
public override void OnKill(BaseCreature creature, Container corpse)
{
if (creature is DeathwatchBeetleHatchling)
{
Complete();
System.AddObjective(new ThirdKillObjective(2));
}
}
public SecondKillObjective()
{
}
public override void OnRead()
{
if (!Completed)
{
Complete();
System.AddObjective(new ThirdKillObjective(1));
}
}
}
public override void OnKill( BaseCreature creature, Container corpse )
{
if ( creature is DeathwatchBeetleHatchling )
{
Complete();
System.AddObjective( new ThirdKillObjective( 2 ) );
}
}
public class ThirdKillObjective : QuestObjective
{
public ThirdKillObjective(int startingProgress)
{
CurProgress = startingProgress;
}
public override void OnRead()
{
if ( !Completed )
{
Complete();
System.AddObjective( new ThirdKillObjective( 1 ) );
}
}
}
public ThirdKillObjective()
{
}
public class ThirdKillObjective : QuestObjective
{
public override object Message => 1063319;
public override object Message => 1063319;
public override void RenderProgress( BaseQuestGump gump )
{
if ( !Completed )
{
// Deathwatch Beetle Hatchlings killed:
gump.AddHtmlLocalized( 70, 260, 270, 100, 1063318, 0x12DC6BF, false, false );
public override int MaxProgress => 10;
gump.AddLabel( 70, 280, 0x64, CurProgress.ToString() );
gump.AddLabel( 100, 280, 0x64, "/" );
gump.AddLabel( 130, 280, 0x64, "10" );
}
else
{
base.RenderProgress( gump );
}
}
public override void RenderProgress(BaseQuestGump gump)
{
if (!Completed)
{
// Deathwatch Beetle Hatchlings killed:
gump.AddHtmlLocalized(70, 260, 270, 100, 1063318, 0x12DC6BF, false, false);
public override int MaxProgress => 10;
gump.AddLabel(70, 280, 0x64, CurProgress.ToString());
gump.AddLabel(100, 280, 0x64, "/");
gump.AddLabel(130, 280, 0x64, "10");
}
else
{
base.RenderProgress(gump);
}
}
public ThirdKillObjective( int startingProgress )
{
CurProgress = startingProgress;
}
public override void OnKill(BaseCreature creature, Container corpse)
{
if (creature is DeathwatchBeetleHatchling)
CurProgress++;
}
public ThirdKillObjective()
{
}
public override void OnComplete()
{
System.AddObjective(new ReturnObjective());
}
}
public override void OnKill( BaseCreature creature, Container corpse )
{
if ( creature is DeathwatchBeetleHatchling )
CurProgress++;
}
public class ReturnObjective : QuestObjective
{
public override object Message => 1063313;
public override void OnComplete()
{
System.AddObjective( new ReturnObjective() );
}
}
public class ReturnObjective : QuestObjective
{
public override object Message => 1063313;
public ReturnObjective()
{
}
public override void OnComplete()
{
System.AddConversation( new EndConversation() );
}
}
}
public override void OnComplete()
{
System.AddConversation(new EndConversation());
}
}
}