diff --git a/ArkSavegameToolkitNet.Domain/ArkLocation.cs b/ArkSavegameToolkitNet.Domain/ArkLocation.cs index 312f256..a54f468 100644 --- a/ArkSavegameToolkitNet.Domain/ArkLocation.cs +++ b/ArkSavegameToolkitNet.Domain/ArkLocation.cs @@ -26,8 +26,8 @@ public class ArkLocation { "TheVolcano", Tuple.Create(50.0f, 9181.0f, 50.0f, 9181.0f) }, { "PGARK", Tuple.Create(0.0f, 6080.0f, 0.0f, 6080.0f) }, { "CrystalIsles" , Tuple.Create(50.0f, 13718.0f, 50.0f, 13718.0f) }, - { "Valguero_P" , Tuple.Create(50.0f, 8161.0f, 50.0f, 8161.0f) } - + { "Valguero_P" , Tuple.Create(50.0f, 8161.0f, 50.0f, 8161.0f) }, + { "Genesis", Tuple.Create(50.0f, 10500.0f, 50.0f, 10500.0f)} }; //width, height, latitude-top, longitude-left, longitude-right, latitude-bottom @@ -36,7 +36,7 @@ public class ArkLocation static ArkLocation() { - System.Drawing.Bitmap island = null, center = null, scorched = null, ragnarok = null, aberration = null, extinction = null, crystal = null, shigo = null, volcano = null, valguero = null; + System.Drawing.Bitmap island = null, center = null, scorched = null, ragnarok = null, aberration = null, extinction = null, crystal = null, shigo = null, volcano = null, valguero = null, genesis = null; try { island = MapResources.topo_map_TheIsland; @@ -49,6 +49,8 @@ static ArkLocation() shigo = MapResources.topo_map_ShigoIslands; volcano = MapResources.topo_map_TheVolcano; valguero = MapResources.topo_map_Valguero_P; + genesis = MapResources.topo_map_Genesis; + //painted-maps are divided into a 10x10 grid, lacking precise offsets and should instead align with the grid (0.0f, 0.0f, 100.0f, 100.0f) //topo-maps offsets are calculated using two easily identifiable points on the map and reversing the formula for TopoMapX/TopoMapY val-2.95f, 0.0f, 86.3f, 89.0f @@ -63,7 +65,9 @@ static ArkLocation() { "CrystalIsles", Tuple.Create(crystal.Width, crystal.Height, -1.7f, -1.5f, 99.3f, 101.0f) }, { "ShigoIslands", Tuple.Create(shigo.Width, shigo.Height, -2.0f, -1.6f, 99.8f, 101.0f) }, { "TheVolcano", Tuple.Create(volcano.Width, volcano.Height, -1.95f, -1.3f, 99.5f, 100.7f) }, - { "Valguero_P", Tuple.Create(valguero.Width, valguero.Height, -10.0f, -10.0f, 110.0f, 110.0f) } + { "Valguero_P", Tuple.Create(valguero.Width, valguero.Height, -10.0f, -10.0f, 110.0f, 110.0f) }, + { "Genesis", Tuple.Create(genesis.Width, genesis.Height, 0.0f, 0.0f, 100.0f, 100.0f) } + }; } finally @@ -78,6 +82,7 @@ static ArkLocation() shigo?.Dispose(); volcano?.Dispose(); valguero?.Dispose(); + genesis?.Dispose(); } } diff --git a/ArkSavegameToolkitNet.Domain/ArkPlayer.cs b/ArkSavegameToolkitNet.Domain/ArkPlayer.cs index 345d5ea..9515e26 100644 --- a/ArkSavegameToolkitNet.Domain/ArkPlayer.cs +++ b/ArkSavegameToolkitNet.Domain/ArkPlayer.cs @@ -20,6 +20,7 @@ public class ArkPlayer : ArkGameDataContainerBase private static readonly ArkName _playerDataID = ArkName.Create("PlayerDataID"); private static readonly ArkName _uniqueID = ArkName.Create("UniqueID"); private static readonly ArkName _tribeID = ArkName.Create("TribeID"); + private static readonly ArkName _tribeId = ArkName.Create("TribeId"); private static readonly ArkName _playerName = ArkName.Create("PlayerName"); private static readonly ArkName _savedNetworkAddress = ArkName.Create("SavedNetworkAddress"); private static readonly ArkName _bIsFemale = ArkName.Create("bIsFemale"); @@ -163,6 +164,10 @@ public ArkPlayer(IGameObject profile, IGameObject player, DateTime profileSaveTi Id = (int)mydata.GetPropertyValue(_playerDataID); SteamId = mydata.GetPropertyValue(_uniqueID)?.NetId; TribeId = mydata.GetPropertyValue(_tribeID); + if (TribeId == null) + { + TribeId = mydata.GetPropertyValue(_tribeId); //genesis + } Name = mydata.GetPropertyValue(_playerName); SavedNetworkAddress = mydata.GetPropertyValue(_savedNetworkAddress); CharacterName = myPlayerCharacterConfig.GetPropertyValue(_playerCharacterName); diff --git a/ArkSavegameToolkitNet.Domain/ArkSavegameToolkitNet.Domain.csproj b/ArkSavegameToolkitNet.Domain/ArkSavegameToolkitNet.Domain.csproj index fe3e5f8..a63cfdb 100644 --- a/ArkSavegameToolkitNet.Domain/ArkSavegameToolkitNet.Domain.csproj +++ b/ArkSavegameToolkitNet.Domain/ArkSavegameToolkitNet.Domain.csproj @@ -128,6 +128,9 @@ + + +