Skip to content

Commit 9129243

Browse files
author
Justin
committed
More cleanup
1 parent 158b401 commit 9129243

14 files changed

+30
-30
lines changed

src/Steam.Models/DOTA2/PlayerCountModel.cs renamed to src/Steam.Models/DOTA2/Cleaned/PlayerCountModel.cs

File renamed without changes.

src/Steam.Models/DOTA2/External/BarracksStateModel.cs renamed to src/Steam.Models/DOTA2/External/BarracksState.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
namespace Steam.Models.DOTA2
22
{
3-
public class BarracksStateModel
3+
public class BarracksState
44
{
5-
public BarracksStateModel()
5+
public BarracksState()
66
{
77
}
88

9-
public BarracksStateModel(uint barracksState)
9+
public BarracksState(uint barracksState)
1010
{
1111
IsTopMeleeAlive = ((barracksState >> 0) & 1) == 1 ? true : false;
1212
IsTopRangedAlive = ((barracksState >> 1) & 1) == 1 ? true : false;

src/Steam.Models/DOTA2/External/GameItemModel.cs renamed to src/Steam.Models/DOTA2/External/GameItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Steam.Models.DOTA2
22
{
3-
public class GameItemModel
3+
public class GameItem
44
{
55
public uint Id { get; set; }
66
public uint Cost { get; set; }

src/Steam.Models/DOTA2/External/TowerStateModel.cs renamed to src/Steam.Models/DOTA2/External/TowerState.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
namespace Steam.Models.DOTA2
22
{
3-
public class TowerStateModel
3+
public class TowerState
44
{
5-
public TowerStateModel()
5+
public TowerState()
66
{
77
}
88

9-
public TowerStateModel(uint towerState)
9+
public TowerState(uint towerState)
1010
{
1111
IsAncientBottomAlive = ((towerState >> 10) & 1) == 1 ? true : false;
1212
IsAncientTopAlive = ((towerState >> 9) & 1) == 1 ? true : false;

‎src/Steam.Models/DOTA2/LiveLeagueGameFlattenedModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public class LiveLeagueGameFlattenedModel
2424
public double StreamDelay { get; set; }
2525
public IReadOnlyCollection<LiveLeagueGamePlayerModel> Players { get; set; }
2626
public double ElapsedTime { get; set; }
27-
public TowerStateModel RadiantTowerStates { get; set; }
28-
public TowerStateModel DireTowerStates { get; set; }
27+
public TowerState RadiantTowerStates { get; set; }
28+
public TowerState DireTowerStates { get; set; }
2929
public IReadOnlyCollection<LiveLeagueGameHeroModel> RadiantPicks { get; set; }
3030
public IReadOnlyCollection<LiveLeagueGameHeroModel> DirePicks { get; set; }
3131
public IReadOnlyCollection<LiveLeagueGameHeroModel> RadiantBans { get; set; }

‎src/Steam.Models/DOTA2/LiveLeagueGameTeamDireDetailModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public class LiveLeagueGameTeamDireDetailModel
1515
public IReadOnlyCollection<LiveLeagueGamePlayerDetailModel> Players { get; set; }
1616
public IReadOnlyCollection<LiveLeagueGameAbilityModel> Abilities { get; set; }
1717

18-
public TowerStateModel TowerStates { get { return new TowerStateModel(TowerState); } }
18+
public TowerState TowerStates { get { return new TowerState(TowerState); } }
1919
}
2020
}

‎src/Steam.Models/DOTA2/LiveLeagueGameTeamRadiantDetailModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class LiveLeagueGameTeamRadiantDetailModel
1515
public IReadOnlyCollection<LiveLeagueGamePlayerDetailModel> Players { get; set; }
1616
public IReadOnlyCollection<LiveLeagueGameAbilityModel> Abilities { get; set; }
1717

18-
public TowerStateModel TowerStates { get { return new TowerStateModel(TowerState); } }
19-
public TowerStateModel BarracksStates { get { return new TowerStateModel(BarracksState); } }
18+
public TowerState TowerStates { get { return new TowerState(TowerState); } }
19+
public TowerState BarracksStates { get { return new TowerState(BarracksState); } }
2020
}
2121
}

‎src/Steam.Models/DOTA2/MatchDetailModel.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ public class MatchDetailModel
1919

2020
public uint TowerStatusRadiant { get; set; }
2121

22-
public TowerStateModel TowerStatesRadiant { get { return new TowerStateModel(TowerStatusRadiant); } }
22+
public TowerState TowerStatesRadiant { get { return new TowerState(TowerStatusRadiant); } }
2323

2424
public uint TowerStatusDire { get; set; }
2525

26-
public TowerStateModel TowerStatesDire { get { return new TowerStateModel(TowerStatusDire); } }
26+
public TowerState TowerStatesDire { get { return new TowerState(TowerStatusDire); } }
2727

2828
public uint BarracksStatusRadiant { get; set; }
2929

30-
public BarracksStateModel BarracksStatesRadiant { get { return new BarracksStateModel(BarracksStatusRadiant); } }
30+
public BarracksState BarracksStatesRadiant { get { return new BarracksState(BarracksStatusRadiant); } }
3131

3232
public uint BarracksStatusDire { get; set; }
3333

34-
public BarracksStateModel BarracksStatesDire { get { return new BarracksStateModel(BarracksStatusDire); } }
34+
public BarracksState BarracksStatesDire { get { return new BarracksState(BarracksStatusDire); } }
3535

3636
public uint Cluster { get; set; }
3737

‎src/Steam.Models/DOTA2/MatchHistoryBySequenceNumberMatchModel.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ public class MatchHistoryBySequenceNumberMatchModel
2020

2121
public ulong MatchSequenceNumber { get; set; }
2222

23-
public TowerStateModel TowerStatesRadiant { get { return new TowerStateModel(TowerStatusRadiant); } }
23+
public TowerState TowerStatesRadiant { get { return new TowerState(TowerStatusRadiant); } }
2424

2525
public uint TowerStatusRadiant { get; set; }
2626

27-
public TowerStateModel TowerStatesDire { get { return new TowerStateModel(TowerStatusRadiant); } }
27+
public TowerState TowerStatesDire { get { return new TowerState(TowerStatusRadiant); } }
2828

2929
public uint TowerStatusDire { get; set; }
3030

31-
public BarracksStateModel BarracksStatesRadiant { get { return new BarracksStateModel(BarracksStatusRadiant); } }
31+
public BarracksState BarracksStatesRadiant { get { return new BarracksState(BarracksStatusRadiant); } }
3232

3333
public uint BarracksStatusRadiant { get; set; }
3434

35-
public BarracksStateModel BarracksStatesDire { get { return new BarracksStateModel(BarracksStatusDire); } }
35+
public BarracksState BarracksStatesDire { get { return new BarracksState(BarracksStatusDire); } }
3636

3737
public uint BarracksStatusDire { get; set; }
3838

‎src/SteamWebAPI2/AutoMapperConfiguration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static void Initialize()
4141
config = new MapperConfiguration(x =>
4242
{
4343
CreateSteamWebResponseMap<ServerStatusResultContainer, ServerStatusModel>(x);
44-
CreateSteamWebResponseMap<GameItemResultContainer, IReadOnlyCollection<GameItemModel>>(x);
44+
CreateSteamWebResponseMap<GameItemResultContainer, IReadOnlyCollection<Steam.Models.DOTA2.GameItem>>(x);
4545
CreateSteamWebResponseMap<HeroResultContainer, IReadOnlyCollection<Steam.Models.DOTA2.Hero>>(x);
4646
CreateSteamWebResponseMap<ItemIconPathResultContainer, string>(x);
4747
CreateSteamWebResponseMap<RarityResultContainer, IReadOnlyCollection<Steam.Models.DOTA2.Rarity>>(x);

0 commit comments

Comments
 (0)