Upgrades code style - First batch (#22)
This commit is contained in:
Kamron Batman
GitHub
parent
8ee42c8ea2
commit
632e8b4757
1834 changed files with 10245 additions and 10437 deletions
|
|
@ -12,7 +12,7 @@ namespace Server.Factions
|
|||
private PlayerMobile m_From;
|
||||
private Faction m_Faction;
|
||||
|
||||
public override int ButtonTypes{ get{ return 4; } }
|
||||
public override int ButtonTypes => 4;
|
||||
|
||||
public FactionStoneGump( PlayerMobile from, Faction faction ) : base( 20, 30 )
|
||||
{
|
||||
|
|
@ -29,16 +29,16 @@ namespace Server.Factions
|
|||
|
||||
AddHtmlText( 20, 30, 510, 20, faction.Definition.Header, false, false );
|
||||
|
||||
AddHtmlLocalized( 20, 60, 100, 20, 1011429, false, false ); // Led By :
|
||||
AddHtmlLocalized( 20, 60, 100, 20, 1011429, false, false ); // Led By :
|
||||
AddHtml( 125, 60, 200, 20, faction.Commander != null ? faction.Commander.Name : "Nobody", false, false );
|
||||
|
||||
AddHtmlLocalized( 20, 80, 100, 20, 1011457, false, false ); // Tithe rate :
|
||||
AddHtmlLocalized( 20, 80, 100, 20, 1011457, false, false ); // Tithe rate :
|
||||
if ( faction.Tithe >= 0 && faction.Tithe <= 100 && (faction.Tithe % 10) == 0 )
|
||||
AddHtmlLocalized( 125, 80, 350, 20, 1011480 + (faction.Tithe / 10), false, false );
|
||||
else
|
||||
AddHtml( 125, 80, 350, 20, faction.Tithe + "%", false, false );
|
||||
|
||||
AddHtmlLocalized( 20, 100, 100, 20, 1011458, false, false ); // Traps placed :
|
||||
AddHtmlLocalized( 20, 100, 100, 20, 1011458, false, false ); // Traps placed :
|
||||
AddHtml( 125, 100, 50, 20, faction.Traps.Count.ToString(), false, false );
|
||||
|
||||
AddHtmlLocalized( 55, 225, 200, 20, 1011428, false, false ); // VOTE FOR LEADERSHIP
|
||||
|
|
@ -126,13 +126,13 @@ namespace Server.Factions
|
|||
|
||||
AddHtmlLocalized( 20, 30, 150, 20, 1011444, false, false ); // STATISTICS
|
||||
|
||||
AddHtmlLocalized( 20, 100, 100, 20, 1011445, false, false ); // Name :
|
||||
AddHtmlLocalized( 20, 100, 100, 20, 1011445, false, false ); // Name :
|
||||
AddHtml( 120, 100, 150, 20, from.Name, false, false );
|
||||
|
||||
AddHtmlLocalized( 20, 130, 100, 20, 1018064, false, false ); // score :
|
||||
AddHtmlLocalized( 20, 130, 100, 20, 1018064, false, false ); // score :
|
||||
AddHtml( 120, 130, 100, 20, (pl != null ? pl.KillPoints : 0).ToString(), false, false );
|
||||
|
||||
AddHtmlLocalized( 20, 160, 100, 20, 1011446, false, false ); // Rank :
|
||||
AddHtmlLocalized( 20, 160, 100, 20, 1011446, false, false ); // Rank :
|
||||
AddHtml( 120, 160, 100, 20, (pl != null ? pl.Rank.Rank : 0).ToString(), false, false );
|
||||
|
||||
AddHtmlLocalized( 55, 250, 100, 20, 1011447, false, false ); // BACK
|
||||
|
|
@ -175,13 +175,13 @@ namespace Server.Factions
|
|||
|
||||
AddHtmlLocalized( 20, 30, 200, 20, 1011461, false, false ); // COMMANDER OPTIONS
|
||||
|
||||
AddHtmlLocalized( 20, 70, 120, 20, 1011457, false, false ); // Tithe rate :
|
||||
AddHtmlLocalized( 20, 70, 120, 20, 1011457, false, false ); // Tithe rate :
|
||||
if ( faction.Tithe >= 0 && faction.Tithe <= 100 && (faction.Tithe % 10) == 0 )
|
||||
AddHtmlLocalized( 140, 70, 250, 20, 1011480 + (faction.Tithe / 10), false, false );
|
||||
else
|
||||
AddHtml( 140, 70, 250, 20, faction.Tithe + "%", false, false );
|
||||
|
||||
AddHtmlLocalized( 20, 100, 120, 20, 1011474, false, false ); // Silver available :
|
||||
AddHtmlLocalized( 20, 100, 120, 20, 1011474, false, false ); // Silver available :
|
||||
AddHtml( 140, 100, 50, 20, faction.Silver.ToString( "N0" ), false, false ); // NOTE: Added 'N0' formatting
|
||||
|
||||
AddHtmlLocalized( 55, 130, 200, 20, 1011478, false, false ); // CHANGE TITHE RATE
|
||||
|
|
@ -344,4 +344,4 @@ namespace Server.Factions
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ namespace Server.Factions
|
|||
+50, +100, +150, +200, +250, +300
|
||||
};
|
||||
|
||||
public override int ButtonTypes{ get{ return 2; } }
|
||||
public override int ButtonTypes => 2;
|
||||
|
||||
public FinanceGump( PlayerMobile from, Faction faction, Town town ) : base( 50, 50 )
|
||||
{
|
||||
|
|
@ -44,7 +44,7 @@ namespace Server.Factions
|
|||
AddHtmlLocalized( 55, 90, 200, 25, 1011539, false, false ); // CHANGE PRICES
|
||||
AddButton( 20, 90, 4005, 4007, 0, GumpButtonType.Page, 2 );
|
||||
|
||||
AddHtmlLocalized( 55, 120, 200, 25, 1011540, false, false ); // BUY SHOPKEEPERS
|
||||
AddHtmlLocalized( 55, 120, 200, 25, 1011540, false, false ); // BUY SHOPKEEPERS
|
||||
AddButton( 20, 120, 4005, 4007, 0, GumpButtonType.Page, 3 );
|
||||
|
||||
AddHtmlLocalized( 55, 150, 200, 25, 1011495, false, false ); // VIEW FINANCES
|
||||
|
|
@ -114,20 +114,20 @@ namespace Server.Factions
|
|||
|
||||
|
||||
AddHtmlLocalized( 20, 30, 300, 25, 1011524, false, false ); // FINANCE STATEMENT
|
||||
|
||||
AddHtmlLocalized( 20, 80, 300, 25, 1011538, false, false ); // Current total money for town :
|
||||
|
||||
AddHtmlLocalized( 20, 80, 300, 25, 1011538, false, false ); // Current total money for town :
|
||||
AddLabel( 20, 100, 0x44, town.Silver.ToString() );
|
||||
|
||||
AddHtmlLocalized( 20, 130, 300, 25, 1011520, false, false ); // Finance Minister Upkeep :
|
||||
AddHtmlLocalized( 20, 130, 300, 25, 1011520, false, false ); // Finance Minister Upkeep :
|
||||
AddLabel( 20, 150, 0x44, financeUpkeep.ToString( "N0" ) ); // NOTE: Added 'N0'
|
||||
|
||||
AddHtmlLocalized( 20, 180, 300, 25, 1011521, false, false ); // Sheriff Upkeep :
|
||||
AddHtmlLocalized( 20, 180, 300, 25, 1011521, false, false ); // Sheriff Upkeep :
|
||||
AddLabel( 20, 200, 0x44, sheriffUpkeep.ToString( "N0" ) ); // NOTE: Added 'N0'
|
||||
|
||||
AddHtmlLocalized( 20, 230, 300, 25, 1011522, false, false ); // Town Income :
|
||||
AddHtmlLocalized( 20, 230, 300, 25, 1011522, false, false ); // Town Income :
|
||||
AddLabel( 20, 250, 0x44, dailyIncome.ToString( "N0" ) ); // NOTE: Added 'N0'
|
||||
|
||||
AddHtmlLocalized( 20, 280, 300, 25, 1011523, false, false ); // Net Cash flow per day :
|
||||
AddHtmlLocalized( 20, 280, 300, 25, 1011523, false, false ); // Net Cash flow per day :
|
||||
AddLabel( 20, 300, 0x44, netCashFlow.ToString( "N0" ) ); // NOTE: Added 'N0'
|
||||
|
||||
AddHtmlLocalized( 55, 360, 200, 25, 1011067, false, false ); // Previous page
|
||||
|
|
@ -144,10 +144,10 @@ namespace Server.Factions
|
|||
AddHtmlText( 60, 30, 300, 25, vendorList.Definition.Header, false, false );
|
||||
AddItem( 20, 30, vendorList.Definition.ItemID );
|
||||
|
||||
AddHtmlLocalized( 20, 90, 200, 25, 1011514, false, false ); // You have :
|
||||
AddHtmlLocalized( 20, 90, 200, 25, 1011514, false, false ); // You have :
|
||||
AddLabel( 230, 90, 0x26, vendorList.Vendors.Count.ToString() );
|
||||
|
||||
AddHtmlLocalized( 20, 120, 200, 25, 1011515, false, false ); // Maximum :
|
||||
AddHtmlLocalized( 20, 120, 200, 25, 1011515, false, false ); // Maximum :
|
||||
AddLabel( 230, 120, 0x256, vendorList.Definition.Maximum.ToString() );
|
||||
|
||||
AddHtmlLocalized( 20, 150, 200, 25, 1011516, false, false ); // Cost :
|
||||
|
|
@ -221,7 +221,7 @@ namespace Server.Factions
|
|||
m_From.SendLocalizedMessage( 1042167 ); // You must wait up to an hour before changing prices again.
|
||||
else if ( remaining.TotalHours < 4 )
|
||||
m_From.SendLocalizedMessage( 1042168 ); // You must wait a few hours before changing prices again.
|
||||
else
|
||||
else
|
||||
m_From.SendLocalizedMessage( 1042169 ); // You must wait several hours before changing prices again.
|
||||
}
|
||||
else
|
||||
|
|
@ -278,4 +278,4 @@ namespace Server.Factions
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue