Skip to content

Commit

Permalink
Tweaks
Browse files Browse the repository at this point in the history
- Updated ragnarok map.
- Display address configuration setting (per server).
- Savegame extraction max degree of parallelism compatibility setting.
- UI change for server details table in web app.
  • Loading branch information
tsebring committed Oct 10, 2017
1 parent b1851de commit 87ecf5e
Show file tree
Hide file tree
Showing 19 changed files with 87 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ArkBot/Ark/ArkServerContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public TimeSpan? ApproxTimeUntilNextUpdate
}
}

public ArkServerContext(ServerConfigSection config, ArkClusterContext clusterContext, ISavedState savedState, ILifetimeScope scope) : base(config?.SaveFilePath, clusterContext)
public ArkServerContext(IConfig fullconfig, ServerConfigSection config, ArkClusterContext clusterContext, ISavedState savedState, ILifetimeScope scope) : base(config?.SaveFilePath, clusterContext, fullconfig.SavegameExtractionMaxDegreeOfParallelism)
{
Config = config;
_clusterContext = clusterContext;
Expand Down
8 changes: 8 additions & 0 deletions ArkBot/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ public Config()
[Description("Configure Web App and WebAPI to use SSL with a free certificate from Lets Encrypt")]
public SslConfigSection Ssl { get; set; }

[JsonProperty(PropertyName = "savegameExtractionMaxDegreeOfParallelism")]
[Description("Max degree of parallelism to use for savegame extraction. Change only if experiencing out of memory exceptions.")]
public int? SavegameExtractionMaxDegreeOfParallelism { get; set; }

[JsonProperty(PropertyName = "servers")]
[Description("Server instance configurations.")]
public ServerConfigSection[] Servers { get; set; }
Expand Down Expand Up @@ -232,6 +236,10 @@ public ServerConfigSection()
[Description("Absolute file path of the .ark save file to monitor/extract data from.")]
public string SaveFilePath { get; set; }

[JsonProperty(PropertyName = "displayAddress")]
[Description("Public server address visible to players.")]
public string DisplayAddress { get; set; }

[JsonProperty(PropertyName = "ip")]
[Description("The IP address used to connect to this server instance.")]
public string Ip { get; set; }
Expand Down
1 change: 1 addition & 0 deletions ArkBot/IConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public interface IConfig
string PowershellFilePath { get; set; }
bool UseCompatibilityChangeWatcher { get; set; }
SslConfigSection Ssl { get; set; }
int? SavegameExtractionMaxDegreeOfParallelism { get; set; }

ServerConfigSection[] Servers { get; set; }
ClusterConfigSection[] Clusters { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions ArkBot/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.68.*")]
[assembly: AssemblyFileVersion("1.68.0.0")]
[assembly: AssemblyVersion("1.69.*")]
[assembly: AssemblyFileVersion("1.69.0.0")]
2 changes: 1 addition & 1 deletion ArkBot/WebApi/Controllers/ServersController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public async Task<ServerStatusAllViewModel> Get()
{
Key = context.Config.Key,
Name = name,
Address = info.Address,
Address = context.Config.DisplayAddress ?? info.Address,
Version = version.ToString(),
OnlinePlayerCount = info.Players,
OnlinePlayerMax = info.MaxPlayers,
Expand Down
2 changes: 1 addition & 1 deletion ArkBot/WebApp/dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
<h3 class="w3-text-grey">Loading...</h3>
</div>
</section>
<script type="text/javascript" src="inline.74145aa1c20526b1076b.bundle.js"></script><script type="text/javascript" src="polyfills.6fd0ea22f809f9a8e008.bundle.js"></script><script type="text/javascript" src="scripts.38ac096be18638d631af.bundle.js"></script><script type="text/javascript" src="vendor.2482fd314c69b93cb185.bundle.js"></script><script type="text/javascript" src="main.42b9c3f649df6178e9d3.bundle.js"></script></body>
<script type="text/javascript" src="inline.15f9b23399410a66a629.bundle.js"></script><script type="text/javascript" src="polyfills.6fd0ea22f809f9a8e008.bundle.js"></script><script type="text/javascript" src="scripts.38ac096be18638d631af.bundle.js"></script><script type="text/javascript" src="vendor.2482fd314c69b93cb185.bundle.js"></script><script type="text/javascript" src="main.c165d2b3e5a64cc3d8f5.bundle.js"></script></body>
</html>
1 change: 1 addition & 0 deletions ArkBot/WebApp/dist/inline.15f9b23399410a66a629.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion ArkBot/WebApp/dist/inline.74145aa1c20526b1076b.bundle.js

This file was deleted.

Large diffs are not rendered by default.

70 changes: 68 additions & 2 deletions ArkBot/WebApp/src/app/server-list/server-list.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,73 @@ <h3 class="theme-text-d1">Online <span class="w3-tag w3-large theme-d1">{{online
</section>
<ng-container *ngFor="let server of dataService.Servers?.Servers">
<section *ngIf="isMenuActive(server.Key) &amp;&amp; dataService.Servers != undefined &amp;&amp; dataService.hasFeatureAccess('home', 'serverdetails')" class="w3-container">
<h3 class="theme-text-d1"><a *ngIf="dataService.hasFeatureAccess('pages', 'server'); else serverdetails_no_link" [routerLink]="'/server/' + server.Key" style="text-decoration: none;">{{server.Name}}</a><ng-template #serverdetails_no_link>{{server.Name}}</ng-template></h3>
<div class="w3-card-4 w3-responsive w3-margin-bottom">
<header class="w3-container theme-d1">
<h3><a *ngIf="dataService.hasFeatureAccess('pages', 'server'); else serverdetails_no_link" [routerLink]="'/server/' + server.Key" style="text-decoration: none;">{{server.Name}}</a><ng-template #serverdetails_no_link>{{server.Name}}</ng-template></h3>
</header>
<div class="w3-container theme-l1">
<table class="w3-table w3-bordered w3-small border-theme serverdetails">
<tr>
<th class="theme-text-d1">Address</th>
<td style="width: max-content;">{{server.Address}}</td>
</tr>
<tr>
<th class="theme-text-d1">Version</th>
<td>{{server.Version}}</td>
</tr>
<tr>
<th class="theme-text-d1">Player Slots</th>
<td>{{server.OnlinePlayerMax}}</td>
</tr>
<tr>
<th class="theme-text-d1">Map</th>
<td>{{server.MapName}}</td>
</tr>
<tr>
<th class="theme-text-d1">In-Game Day</th>
<td>{{server.InGameTime}}</td>
</tr>
<tr>
<th class="theme-text-d1">Tamed Creatures</th>
<td>{{server.TamedCreatureCount | number}}</td>
</tr>
<tr>
<th class="theme-text-d1">Cloud Creatures</th>
<td>{{server.CloudCreatureCount | number}}</td>
</tr>
<tr>
<th class="theme-text-d1">Wild Creatures</th>
<td>{{server.WildCreatureCount | number}}</td>
</tr>
<tr>
<th class="theme-text-d1">Structures</th>
<td>{{server.StructureCount | number}}</td>
</tr>
<tr>
<th class="theme-text-d1">Players</th>
<td>{{server.PlayerCount | number}}</td>
</tr>
<tr>
<th class="theme-text-d1">Tribes</th>
<td>{{server.TribeCount | number}}</td>
</tr>
<tr>
<th class="theme-text-d1">Last Update</th>
<td>{{server.LastUpdate}}</td>
</tr>
<tr>
<th class="theme-text-d1">Next Update</th>
<td>{{server.NextUpdate}}</td>
</tr>
<tr style="border-bottom: none;">
<th class="theme-text-d1">Uptime</th>
<td>{{server.ServerStarted ? toRelativeDate(server.ServerStarted) : '-'}}</td>
</tr>
</table>
</div>
</div>

<!--<h3 class="theme-text-d1"><a *ngIf="dataService.hasFeatureAccess('pages', 'server'); else serverdetails_no_link" [routerLink]="'/server/' + server.Key" style="text-decoration: none;">{{server.Name}}</a><ng-template #serverdetails_no_link>{{server.Name}}</ng-template></h3>
<div class="w3-responsive w3-margin-bottom">
<table class="w3-table w3-bordered w3-small border-theme serverdetails">
<tr>
Expand Down Expand Up @@ -116,7 +182,7 @@ <h3 class="theme-text-d1"><a *ngIf="dataService.hasFeatureAccess('pages', 'serve
<td>{{server.ServerStarted ? toRelativeDate(server.ServerStarted) : '-'}}</td>
</tr>
</table>
</div>
</div>-->
<ng-container *ngIf="dataService.hasFeatureAccess('home', 'online')">
<h3 class="theme-text-d1">Online <span class="w3-tag w3-large theme-d1">{{server.OnlinePlayerCount}}</span></h3>
<div *ngIf="server.OnlinePlayerCount == 0; else server_online_players_list">There are no players online...</div>
Expand Down
3 changes: 3 additions & 0 deletions ArkBot/defaultconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,13 @@
"babyMatureSpeedMultiplier": 1.0,
"cuddleIntervalMultiplier": 1.0
},
"savegameExtractionMaxDegreeOfParallelism": null,
"servers": [
{
"key": "server1",
"cluster": "cluster1",
"saveFilePath": "C:\\ARK Servers\\server1\\ShooterGame\\Saved\\SavedArks\\TheIsland.ark",
"displayAddress": "myarkserver.domain.com:27015",
"ip": "127.0.0.1",
"port": 27015,
"rconPort": 27020,
Expand All @@ -104,6 +106,7 @@
"key": "server2",
"cluster" : "cluster1",
"saveFilePath": "C:\\ARK Servers\\server2\\ShooterGame\\Saved\\SavedArks\\TheIsland.ark",
"displayAddress": "myarkserver.domain.com:27016",
"ip": "127.0.0.1",
"port": 27016,
"rconPort": 27021,
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified external/ArkSavegameToolkitNet/Debug/ArkSavegameToolkitNet.dll
Binary file not shown.
Binary file modified external/ArkSavegameToolkitNet/Debug/ArkSavegameToolkitNet.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified external/ArkSavegameToolkitNet/Release/ArkSavegameToolkitNet.dll
Binary file not shown.
Binary file modified external/ArkSavegameToolkitNet/Release/ArkSavegameToolkitNet.pdb
Binary file not shown.

0 comments on commit 87ecf5e

Please sign in to comment.