Skip to content

Commit

Permalink
.NET 8 migrated to latest ACE libraries (#67)
Browse files Browse the repository at this point in the history
* Initial .NET 8 support

Still some more work to do

* Remove unnecessary packages, maybe fix appveyor?

* Form1 fix alignment of controls

* CommandLine fix

* Create appveyor.yml

* Update appveyor.yml

* Exception fix

* Fix a bunch of build warnings

* Migrate to latest ACE libraries

* Add linux notes for player exporter import

* PlayerExporter add missing continue

* Latest ACE release libs

---------

Co-authored-by: Ty Conner <[email protected]>
  • Loading branch information
Mag-nus and LtRipley36706 authored Dec 22, 2023
1 parent 23c78c7 commit 0777b47
Show file tree
Hide file tree
Showing 14 changed files with 540 additions and 582 deletions.
604 changes: 284 additions & 320 deletions aclogview/ACE Helpers/ACEBiotaCreator.cs

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions aclogview/ACE Helpers/ACECharacterCreator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using System;

using ACE.Database.Models.Shard;

namespace aclogview.ACE_Helpers
{
static class ACECharacterCreator
{
/// <summary>
/// Do not call this twice for the same Character
/// This should be the first message you parse when constructiong a player
/// </summary>
public static void Update(CM_Login.PlayerDescription message, Character character)
{
character.CharacterOptions1 = (int)message.PlayerModule.options_;

if (message.PlayerModule.shortcuts_ != null)
{
foreach (var value in message.PlayerModule.shortcuts_.shortCuts_)
character.CharacterPropertiesShortcutBar.Add(new CharacterPropertiesShortcutBar { ShortcutBarIndex = (uint)value.index_, ShortcutObjectId = value.objectID_ });
}

for (uint i = 0; i < message.PlayerModule.favorite_spells_.Length; i++)
{
if (message.PlayerModule.favorite_spells_[i] != null)
{
for (uint j = 0; j < message.PlayerModule.favorite_spells_[i].list.Count; j++)
character.CharacterPropertiesSpellBar.Add(new CharacterPropertiesSpellBar { SpellBarNumber = i, SpellBarIndex = j, SpellId = (uint)message.PlayerModule.favorite_spells_[i].list[(int)j] });
}
}

foreach (var value in message.PlayerModule.desired_comps_.hashTable)
character.CharacterPropertiesFillCompBook.Add(new CharacterPropertiesFillCompBook { SpellComponentId = (int)value.Key, QuantityToRebuy = value.Value });

character.SpellbookFilters = message.PlayerModule.spell_filters_;

character.CharacterOptions2 = (int)message.PlayerModule.options2;

// This is just window placement. For now, we don't bother exporting it
// TODO: message.PlayerModule.m_colGameplayOptions -> player.Character.GameplayOptions
}
}
}
21 changes: 20 additions & 1 deletion aclogview/Tools/Scrapers/CombatDamageGiven.cs
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,20 @@ protected string GetMagicDamageType(string magicVerb)

}

/// <summary>
/// These are player IDs that simultaneously exist for two players that existed on different servers.
/// </summary>
private static readonly HashSet<uint> DuplicatePlayerIDs = new HashSet<uint>
{
1342401215,
1342620788,
1342866589,
1343132953,
1343143799,
1343179227,
1343221089,
};

private void GetCharList()
{
uint charID = 0;
Expand All @@ -392,7 +406,12 @@ private void GetCharList()
{
string[] listValues = line.Split(',');

charNames.Add(ConvertToUinteger(listValues[0]), listValues[1]);
var id = ConvertToUinteger(listValues[0]);

if (DuplicatePlayerIDs.Contains(id))
continue;

charNames.Add(id, listValues[1]);
}

}
Expand Down
201 changes: 102 additions & 99 deletions aclogview/Tools/Scrapers/PlayerExporter.cs

Large diffs are not rendered by default.

252 changes: 90 additions & 162 deletions aclogview/Tools/Scrapers/PlayerWeaponExporter.cs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions aclogview/aclogview.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<ItemGroup>
Expand Down
Binary file modified aclogview/lib/ACE.Adapter.dll
Binary file not shown.
Binary file modified aclogview/lib/ACE.Adapter.pdb
Binary file not shown.
Binary file modified aclogview/lib/ACE.Common.dll
Binary file not shown.
Binary file modified aclogview/lib/ACE.Common.pdb
Binary file not shown.
Binary file modified aclogview/lib/ACE.Database.dll
Binary file not shown.
Binary file modified aclogview/lib/ACE.Database.pdb
Binary file not shown.
Binary file modified aclogview/lib/ACE.Entity.dll
Binary file not shown.
Binary file modified aclogview/lib/ACE.Entity.pdb
Binary file not shown.

0 comments on commit 0777b47

Please sign in to comment.