Skip to content

Commit

Permalink
Patch 7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
GiR_Zippo committed Nov 12, 2024
1 parent 4425a00 commit 08dfc3e
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 109 deletions.
17 changes: 7 additions & 10 deletions BardMusicPlayer.Seer/Reader/Backend/Machina/MachinaReaderBackend.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,34 +60,31 @@ public async Task Loop(CancellationToken token)
switch (message.Length)
{
case 48:
_packet.Size48(timeStamp, otherActorId, myActorId, message); //[7.00]Handles Ensemble Stop
_packet.Size48(timeStamp, otherActorId, myActorId, message); //[7.1]Handles Ensemble Clear
break;
case 56:
_packet.Size56(timeStamp, otherActorId, myActorId, message); //[7.00]Handles Ensemble Request, Ensemble Reject, and Instrument Equip/De-Equip.
_packet.Size56(timeStamp, otherActorId, myActorId, message); //[7.1]Handles Ensemble Request, Ensemble Reject, and Instrument Equip/De-Equip.
break;
case 88:
_packet.Size88(timeStamp, otherActorId, myActorId, message); //[7.00]Handles EnsembleStart --DALAMUD
_packet.Size88(timeStamp, otherActorId, myActorId, message); //[7.1]Handles EnsembleStart --DALAMUD
break;
case 104:
_packet.Size104(timeStamp, otherActorId, myActorId, message); //[7.00]Handles Party Invite
break;
case 656:
_packet.Size656(timeStamp, otherActorId, myActorId, message); //Handles old Homeworld and Playername --DALAMUD
_packet.Size104(timeStamp, otherActorId, myActorId, message); //[7.1]Handles Party Invite
break;
case 664:
_packet.Size664(timeStamp, otherActorId, myActorId, message); //[6.50]Handles Homeworld and Playername --DALAMUD
break;
case 688:
_packet.Size688(timeStamp, otherActorId, myActorId, message); //[7.00]Handles Homeworld and Playername --DALAMUD
_packet.Size688(timeStamp, otherActorId, myActorId, message); //[7.1]Handles Homeworld and Playername --DALAMUD
break;
case 1064:
_packet.Size1064(timeStamp, otherActorId, myActorId, message); //[7.00]Handles Ensemble play data
_packet.Size1064(timeStamp, otherActorId, myActorId, message); //[7.1]Handles Ensemble play data
break;
case 3576:
_packet.Size3576(timeStamp, otherActorId, myActorId, message);
break;
case 3704:
_packet.Size3704(timeStamp, otherActorId, myActorId, message); //[7.00]Handles group data
_packet.Size3704(timeStamp, otherActorId, myActorId, message); //[7.1]Handles group data
break;
default:
ReaderHandler.Game.PublishEvent(new BackendExceptionEvent(EventSource.Machina,
Expand Down
7 changes: 5 additions & 2 deletions BardMusicPlayer.Seer/Reader/Backend/Machina/Packet.48.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ internal void Size48(long timeStamp, uint otherActorId, uint myActorId, byte[] m
{
if (otherActorId != myActorId) return;

var partyLeader = BitConverter.ToUInt32(message, 40);
if (!ActorIdTools.RangeOkay(partyLeader) || BitConverter.ToUInt32(message, 44) != 0)
if (BitConverter.ToUInt32(message, 28) != 0 ||
BitConverter.ToUInt32(message, 32) != 0 ||
BitConverter.ToUInt32(message, 36) != 0 ||
BitConverter.ToUInt32(message, 40) != 0 ||
BitConverter.ToUInt32(message, 44) != 0)
return;

_machinaReader.Game.PublishEvent(new EnsembleStopped(EventSource.Machina));
Expand Down
45 changes: 0 additions & 45 deletions BardMusicPlayer.Seer/Reader/Backend/Machina/Packet.656.cs
View file

This file was deleted.

64 changes: 28 additions & 36 deletions BardMusicPlayer.Seer/Reader/Backend/Sharlayan/Files/Signatures/China.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,42 @@
// Upstream
{
"Key": "CHATLOG",
"Value": "488941104488492C4C8949244C89491C4584C07412488B4210488905********48890D",
"Value": "488941104488492C4C8949244C89491C4584C07412488B4218488905********48890D",
"ASMSignature": true,
"PointerPath": [
0,
0,
64,
908
]
"PointerPath": [ 0, 0, 64, 908 ]
},
{
"ASMSignature": true,
"Key": "CHARMAP",
"Value": "488b420848c1e8033da701000077**8bc0488d0d",
"PointerPath": [
0,
0
]
"Value": "48c1ea0381fa????0000****8bc2488d0d",
"ASMSignature": true,
"PointerPath": [ 0, 0 ]
},
{
"ASMSignature": true,
"Key": "PARTYMAP",
"PointerPath": [
0,
384
],
"Value": "488D7C242066660F1F840000000000488B17488D0D"
"Value": "5EC348895C2430488d0d",
"ASMSignature": true,
"PointerPath": [ 0, 784 ]
},
{
"ASMSignature": true,
"Key": "PARTYCOUNT",
"Value": "5EC348895C2430488d0d",
"ASMSignature": true,
"PointerPath": [
0,
-26920
],
"Value": "488D7C242066660F1F840000000000488B17488D0D"
26044
]
},
{
"Key": "PARTYLEAD",
"Value": "5EC348895C2430488d0d",
"ASMSignature": true,
"PointerPath": [ 0, 26040 ]
},
{
"Key": "PLAYERINFO",
"PointerPath": [
0,
0
],
"Value": "83f9ff7412448b048e8bd3488d0d"
"Value": "83f9ff7412448b048e8bd3488d0d",
"ASMSignature": true,
"PointerPath": [ 0, 0 ]
},
// End Upstream

Expand All @@ -57,16 +49,16 @@
0,
0
],
"Value": "84C00F84????????488BD3488D0D"
"Value": "897B60488B5C2430488B7424384883C4205FC385C0783133D2488D0D"
},
{
"ASMSignature": true,
"Key": "CHARID", // Known as ConfigId in Seer. Used for DatReader.
"Key": "CHARID",
"PointerPath": [
0,
0
],
"Value": "4C8BCF4C8D05????????BA04010000488D0D"
"Value": "41807D00000F85????????4889B424????????488D0D"
},
{
"ASMSignature": true,
Expand All @@ -76,17 +68,17 @@
0,
56
],
"Value": "e8********85c0740e488b0d********33D2E8********488b0d"
"Value": "33D2E8????????488b0d"
},
{
//Fallback
"ASMSignature": true,
"Key": "WORLD",
"PointerPath": [
-13,
0,
-78
5499988
],
"Value": "40534883EC40488B05********488BD98B401485C00F"
"Value": "FFC08983????????83F8020F84????????4C8D35"
}
// END BMP
]
]
3 changes: 1 addition & 2 deletions BardMusicPlayer.Seer/Reader/Backend/Sharlayan/Files/Signatures/Global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
0,
0
],
"Value": "41807D00000F85????????4889B424????????488D0D"
"Value": "0F85????????4C89642450488D0D"
},
{
"ASMSignature": true,
Expand All @@ -79,7 +79,6 @@
5499988
],
"Value": "FFC08983????????83F8020F84????????4C8D35"
//40534883EC40488B05********488BD98B401485C00F
}
// END BMP
]
20 changes: 10 additions & 10 deletions BardMusicPlayer.Seer/Reader/Backend/Sharlayan/Files/Structures/China.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@
"LogEnd": 92
},
"CurrentPlayer": {
"SourceSize": 650,
"JobID": 106,
"SourceSize": 250,
"JobID": 126,
// BMP
"ID": 84,
"ID": 100,
"Name": 1
// END BMP
},
"PartyMember": {
"SourceSize": 912,
"ID": 24,
"Name": 52
"SourceSize": 928,
"ID": 32,
"Name": 60
},
// BMP
"PerformanceInfo": {
"SourceSize": 20,
"Status": 8,
"Instrument": 9
"SourceSize": 28,
"Status": 19,
"Instrument": 20
},
"World": {
"SourceSize": 16,
"SourceSize": 255,
"Offset": 0
},
"CharacterId": { // Known as ConfigId in Seer. Used for DatReader.
Expand Down
2 changes: 1 addition & 1 deletion BardMusicPlayer.Seer/Utilities/MachinaManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private MachinaManager()
}
}

private static readonly List<int> Lengths = new() { 48, 56, 88, 104, 656, 664, 688, 1064, 3576, 3704 };
private static readonly List<int> Lengths = new() { 48, 56, 88, 104, 664, 688, 1064, 3576, 3704 };
private readonly FFXIVNetworkMonitor _monitor;
private readonly object _lock;
private bool _monitorRunning;
Expand Down
2 changes: 1 addition & 1 deletion BardMusicPlayer.Ui/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public partial class MainWindow : Window
public MainWindow()
{
InitializeComponent();
this.Title = "LightAmp Ver:" + Assembly.GetExecutingAssembly().GetName().Version + " - Mia Grand";
this.Title = "LightAmp Ver:" + Assembly.GetExecutingAssembly().GetName().Version + " - Ouka Makuzawa";
if (BmpPigeonhole.Instance.ClassicUi)
SwitchClassicStyle();
else
Expand Down
4 changes: 2 additions & 2 deletions BardMusicPlayer.Ui/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.7.0")]
[assembly: AssemblyFileVersion("1.0.7.0")]
[assembly: AssemblyVersion("1.0.7.1")]
[assembly: AssemblyFileVersion("1.0.7.1")]
Binary file added BardMusicPlayer.Ui/Resources/Images/raw/Ouka Makuzawa.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BardMusicPlayer.Ui/Resources/Images/raw/Ouka Makuzawa.xcf
View file
Binary file not shown.
Binary file modified BardMusicPlayer.Ui/Resources/Images/splash.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 08dfc3e

Please sign in to comment.