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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Scripts/Engines/Khaldun/Books/GrimmochJournal.cs
View file

@ -65,7 +65,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal1() : base( Utility.Random( 0xFF1, 2 ), false )
@ -172,7 +172,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal2() : base( Utility.Random( 0xFF1, 2 ), false )
@ -276,7 +276,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal3() : base( Utility.Random( 0xFF1, 2 ), false )
@ -375,7 +375,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal6() : base( Utility.Random( 0xFF1, 2 ), false )
@ -462,7 +462,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal7() : base( Utility.Random( 0xFF1, 2 ), false )
@ -532,7 +532,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal11() : base( Utility.Random( 0xFF1, 2 ), false )
@ -619,7 +619,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal14() : base( Utility.Random( 0xFF1, 2 ), false )
@ -711,7 +711,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal17() : base( Utility.Random( 0xFF1, 2 ), false )
@ -751,7 +751,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public GrimmochJournal23() : base( Utility.Random( 0xFF1, 2 ), false )
@ -776,4 +776,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

14
Scripts/Engines/Khaldun/Books/LysanderNotebook.cs
View file

@ -36,7 +36,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public LysanderNotebook1() : base( Utility.Random( 0xFF1, 2 ), false )
@ -131,7 +131,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public LysanderNotebook2() : base( Utility.Random( 0xFF1, 2 ), false )
@ -219,7 +219,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public LysanderNotebook3() : base( Utility.Random( 0xFF1, 2 ), false )
@ -324,7 +324,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public LysanderNotebook7() : base( Utility.Random( 0xFF1, 2 ), false )
@ -419,7 +419,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public LysanderNotebook8() : base( Utility.Random( 0xFF1, 2 ), false )
@ -511,7 +511,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public LysanderNotebook11() : base( Utility.Random( 0xFF1, 2 ), false )
@ -536,4 +536,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

28
Scripts/Engines/Khaldun/Books/TavarasJournal.cs
View file

@ -70,7 +70,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal1() : base( Utility.Random( 0xFF1, 2 ), false )
@ -199,7 +199,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal2() : base( Utility.Random( 0xFF1, 2 ), false )
@ -296,7 +296,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal3() : base( Utility.Random( 0xFF1, 2 ), false )
@ -406,7 +406,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal6() : base( Utility.Random( 0xFF1, 2 ), false )
@ -504,7 +504,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal7() : base( Utility.Random( 0xFF1, 2 ), false )
@ -622,7 +622,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal8() : base( Utility.Random( 0xFF1, 2 ), false )
@ -716,7 +716,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal9() : base( Utility.Random( 0xFF1, 2 ), false )
@ -834,7 +834,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal11() : base( Utility.Random( 0xFF1, 2 ), false )
@ -943,7 +943,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal14() : base( Utility.Random( 0xFF1, 2 ), false )
@ -1064,7 +1064,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal16() : base( Utility.Random( 0xFF1, 2 ), false )
@ -1174,7 +1174,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal16b() : base( Utility.Random( 0xFF1, 2 ), false )
@ -1245,7 +1245,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal17() : base( Utility.Random( 0xFF1, 2 ), false )
@ -1305,7 +1305,7 @@ namespace Server.Items
)
);
public override BookContent DefaultContent{ get{ return Content; } }
public override BookContent DefaultContent => Content;
[Constructible]
public TavarasJournal19() : base( Utility.Random( 0xFF1, 2 ), false )
@ -1330,4 +1330,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

4
Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs
View file

@ -29,7 +29,7 @@ namespace Server.Items
set { m_MapDest = value; }
}
public override int LabelNumber{ get{ return 1016511; } } // the floor of the cavern seems to have collapsed here - a faint light is visible at the bottom of the pit
public override int LabelNumber => 1016511; // the floor of the cavern seems to have collapsed here - a faint light is visible at the bottom of the pit
[Constructible]
public KhaldunPitTeleporter() : this( new Point3D( 5451, 1374, 0 ), Map.Felucca )
@ -105,4 +105,4 @@ namespace Server.Items
m_MapDest = reader.ReadMap();
}
}
}
}

5
Scripts/Engines/Khaldun/PuzzleChest.cs
View file

@ -215,7 +215,7 @@ namespace Server.Items
list.Add( Solution.Cylinders[i] );
m_Hints = new PuzzleChestCylinder[HintsCount];
for ( int i = 0; i < m_Hints.Length; i++ ) {
int pos = Utility.Random( list.Count );
m_Hints[i] = list[pos];
@ -252,8 +252,7 @@ namespace Server.Items
public PuzzleChestSolutionAndTime GetLastGuess( Mobile m )
{
PuzzleChestSolutionAndTime pcst = null;
m_Guesses.TryGetValue( m, out pcst );
m_Guesses.TryGetValue( m, out PuzzleChestSolutionAndTime pcst );
return pcst;
}