Merge branch 'develop'

App.config

@@ -139,8 +139,8 @@
       <setting name="ColField15" serializeAs="String">
         <value>Turquoise</value>
       </setting>
-      <setting name="Setting" serializeAs="String">
-        <value />
+      <setting name="ShowStringHexData" serializeAs="String">
+        <value>False</value>
       </setting>
     </PacketViewerLogViewer.Properties.Settings>
   </userSettings>

DataLookupDefs.cs

@@ -79,6 +79,7 @@ static public class DataLookups
         public static string LU_RoE = "roe";
         public static string LU_CraftRanks = "craftranks";
         public static string LU_Buffs = "buffs";
+        public static string LU_ActionCategory0x028 = "actioncategory0x028";
         public static string LU_ActionCategory = "actioncategory";
         public static string LU_ActionReaction = "actionreaction";
 
@@ -398,7 +399,7 @@ public static void RegisterCustomLookup(string customListName, UInt64 customID,
                 {
                     var listv = li.Value;
                     // Special case, don't update if this is a "null string" parsed
-                    if (customValue != "null ()")
+                    if ((customValue != "NULL") && (listv.Val != customValue))
                         listv.Val = customValue;
                     listv.Extra = string.Empty;
                     return;

PVLV.csproj

@@ -292,6 +292,8 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Res\usgaiji-10.png" />
+    <None Include="Res\usgaiji-9.png" />
     <None Include="Res\mini_video_icon.png" />
     <None Include="Res\mini_unk_ticon1.png" />
     <None Include="Res\mini_unk_ticon.png" />
@@ -309,6 +311,9 @@
     <Content Include="lookup\abilityrecast.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="lookup\actioncategory0x028.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="lookup\actionreaction.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -747,9 +752,33 @@
     <Content Include="parse\in-0x119.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="parse\out-0x011.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="parse\out-0x00F.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="parse\out-0x00D.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="parse\out-0x00A.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="parse\out-0x00C.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="parse\out-0x017.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="parse\out-0x016.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="parse\out-0x015.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="parse\out-0x01E.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="parse\out-0x01A.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

PacketDefs.cs

@@ -1148,15 +1148,15 @@ public bool LoadFromStringList(List<string> FileData,PacketLogFileFormats logFil
                                )
                             {
                                 AskForPacketType = false;
+                                hasData = true;
                                 // Ask for type
                                 var askDlgRes = DialogResult.Cancel;
                                 using (PacketTypeSelectForm askDlg = new PacketTypeSelectForm())
                                 {
                                     askDlg.lHeaderData.Text = s;
                                     askDlgRes = askDlg.ShowDialog();
-                                    //var askDlgStr = "Unable to indentify the packet type.\r\nDo you want to assign a default type ?\r\n\r\nPress YES for Incomming\r\n\r\nPress NO for outgoing\r\n\r\nPress Cancel to keep it undefined\r\n\r\nLineData:\r\n\r\n" + s.Substring(0, Math.Min(s.Length, 100)) + " ...";
-                                    //MessageBox.Show(askDlgStr, "Packet Type ?", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
                                 }
+
                                 if (askDlgRes == DialogResult.Yes)
                                 {
                                     preferedType = PacketLogTypes.Incoming ;

PacketParsers.cs

@@ -392,7 +392,7 @@ void AddField(ref byte AddDataFieldIndex, int BitSize,string name, string data,
             MarkParsed(0x09, 1, DataFieldIndex);
 
             AddDataFieldEx(0x0A, 1, ref DataFieldIndex);
-            AddParseLineToView(DataFieldIndex, "0x0A:2-4", GetDataColor(DataFieldIndex), "Action Category", pActionCategory.ToString() + " => " + DataLookups.NLU(DataLookups.LU_ActionCategory).GetValue((UInt64)pActionCategory),(UInt64)pActionCategory);
+            AddParseLineToView(DataFieldIndex, "0x0A:2-4", GetDataColor(DataFieldIndex), "Action Category", pActionCategory.ToString() + " => " + DataLookups.NLU(DataLookups.LU_ActionCategory0x028).GetValue((UInt64)pActionCategory),(UInt64)pActionCategory);
             MarkParsed(0x0A, 1, DataFieldIndex);
 
             AddDataFieldEx(0x0B, 1, ref DataFieldIndex);
@@ -947,17 +947,29 @@ void AddDataField(int StartPos, int FieldByteSize)
                     }
                     var d = PD.GetStringAtPos(Offset, size);
                     string dHex = "";
-                    foreach(char c in d)
+                    if (d == string.Empty)
                     {
-                        if (dHex != string.Empty)
-                            dHex += " ";
-                        dHex += ((byte)c).ToString("X2");
+                        d = "NULL";
+                        dHex = string.Empty;
+                    }
+                    else
+                    if (Properties.Settings.Default.ShowStringHexData)
+                    {
+                        foreach (char c in d)
+                        {
+                            if (dHex != string.Empty)
+                                dHex += " ";
+                            dHex += ((byte)c).ToString("X2");
+                        }
+                        dHex = " (" + dHex + ")";
+                    }
+                    else
+                    {
+                        dHex = string.Empty;
                     }
-                    if (d == string.Empty)
-                        d = "null";
 
                     AddDataField(Offset,size);
-                    AddParseLineToView(DataFieldIndex, posField, GetDataColor(DataFieldIndex), nameField, d + " ("+dHex+")");
+                    AddParseLineToView(DataFieldIndex, posField, GetDataColor(DataFieldIndex), nameField, d + dHex);
                     if (size > 1)
                     {
                         MarkParsed(Offset, size, DataFieldIndex);

Properties/AssemblyInfo.cs

@@ -32,5 +32,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("0.5.3.0")]
-[assembly: AssemblyFileVersion("0.5.3.0")]
+[assembly: AssemblyVersion("0.5.4.0")]
+[assembly: AssemblyFileVersion("0.5.4.0")]

Properties/Resources.resx

@@ -199,4 +199,10 @@
   <data name="mini_video_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Res\mini_video_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="usgaiji_10" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Res\usgaiji-10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="usgaiji_9" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Res\usgaiji-9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Properties/Settings.settings

@@ -119,8 +119,8 @@
     <Setting Name="ColField15" Type="System.Drawing.Color" Scope="User">
       <Value Profile="(Default)">Turquoise</Value>
     </Setting>
-    <Setting Name="Setting" Type="System.Drawing.Color" Scope="User">
-      <Value Profile="(Default)" />
+    <Setting Name="ShowStringHexData" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
     </Setting>
   </Settings>
 </SettingsFile>

lookup/actioncategory.txt

@@ -1,24 +1,17 @@
-rem;packet-in-0x028 action category names
-0;None
-1;Melee Attack
-2;Ranged Attack Finish
-3;Weapon Skill Finish
-4;Magic Finish
-5;Item Finish
-6;Job Ability Finish
-7;Weapon Skill Start
-8;Magic Start
-9;Item Start
-10;Job Ability Start
-11;NPC Ability Finish
-12;Ranged Attack Start
-13;Pet Mob Ability Finish
-14;Job Ability DNC
-15;Job Ability RUN
-rem;DSP stuff (not actually used as max value would be 15 with just 4 bits)
-29;ACTION_ITEM_INTERRUPT';
-31;ACTION_MAGIC_INTERRUPT';
-32;ACTION_RANGED_INTERRUPT';
-33;ACTION_MOBABILITY_START';
-35;ACTION_MOBABILITY_INTERRUPT';
-37;ACTION_RAISE_MENU_SELECTION';
+rem;action category names
+0x00;NPC Interaction
+0x02;Engage monster
+0x03;Magic cast
+0x04;Disengage
+0x05;Call for Help
+0x07;Weaponskill usage
+0x09;Job ability usage
+0x0C;Assist
+0x0D;Reraise dialogue
+0x0E;Cast Fishing Rod
+0x0F;Switch target
+0x10;Ranged attack
+0x12;Dismount Chocobo
+0x14;Show/Zone In
+0x19;Monsterskill
+0x1A;Mount

lookup/actioncategory0x028.txt

@@ -0,0 +1,24 @@
+rem;packet-in-0x028 action category names
+0;None
+1;Melee Attack
+2;Ranged Attack Finish
+3;Weapon Skill Finish
+4;Magic Finish
+5;Item Finish
+6;Job Ability Finish
+7;Weapon Skill Start
+8;Magic Start
+9;Item Start
+10;Job Ability Start
+11;NPC Ability Finish
+12;Ranged Attack Start
+13;Pet Mob Ability Finish
+14;Job Ability DNC
+15;Job Ability RUN
+rem;DSP stuff (not actually used as max value would be 15 with just 4 bits)
+29;ACTION_ITEM_INTERRUPT';
+31;ACTION_MAGIC_INTERRUPT';
+32;ACTION_RANGED_INTERRUPT';
+33;ACTION_MOBABILITY_START';
+35;ACTION_MOBABILITY_INTERRUPT';
+37;ACTION_RAISE_MENU_SELECTION';

parse/in-0x00a.txt

@@ -98,3 +98,4 @@ uint32;$EC;Max MP
 data20;$F0;_unknown16
 
 save;@actors;Player ID;Player Name
+save;@players;Player ID;Player Name

parse/in-0x00d.txt

@@ -87,4 +87,5 @@ uint16:itemmodels:-0x8000;$58;Ranged Weapon Model;
 
 string;$5A;Character Name
 
-save;@actors;Player ID;Character Name
+save;@actors;Player ID;Character Name
+save;@players;Player ID;Character Name

parse/in-0x0DD.txt

@@ -20,4 +20,5 @@ byte:jobs;$24;Sub Job
 byte;$25;Sub Job Level
 string;$26;Name
 
-save;@actors;Player ID;Name
+save;@actors;Player ID;Name
+save;@players;Player ID;Name

parse/out-0x00A.txt

@@ -0,0 +1,2 @@
+file;out-0x00A;Client Connect
+

parse/out-0x00C.txt

@@ -0,0 +1,2 @@
+file;out-0x00C;Zone In 1
+

parse/out-0x00D.txt

@@ -0,0 +1,2 @@
+file;out-0x00D;Client Leave
+

parse/out-0x00F.txt

@@ -0,0 +1,2 @@
+file;out-0x00F;Zone In 2
+

parse/out-0x011.txt

@@ -0,0 +1,2 @@
+file;out-0x011;Zone In 3
+

parse/out-0x016.txt

@@ -0,0 +1,3 @@
+file;out-0x016;Update Request
+
+uint16;0x04;Target Index

parse/out-0x017.txt

@@ -0,0 +1,8 @@
+file;out-0x017;NPC Race Error;Packet sent in response to impossible incoming NPC packets (like trying to put equipment on a race 0 monster).
+
+uint16;0x04;NPC Index
+uint16;0x06;_unknown1
+uint32:@actors;0x08;NPC ID
+data6:0x0C;_unknown2
+byte:0x12;Reported NPC type
+byte:0x13;_unknown3

parse/out-0x01A.txt

@@ -1,4 +1,8 @@
-file;in-0x01A;Action;Newly created parser.
+file;out-0x01A;Action;Newly created parser.
 
-rem;Add your parser lines here
-uint32;$04;Target ID
+uint32:@actors;0x04;Target ID
+uint16;0x08;Target Index
+uint16:actioncategory;0x0A;Category
+uint16;0x0C;Param
+uint16;0x0E;_unknown1
+pos;0x10;Offset Position;non-zero values only observed for geo spells cast using a repositioned subtarget

parse/out-0x01E.txt

@@ -0,0 +1,3 @@
+file;out-0x01A;Volunteer;Sent in response to a /volunteer command.
+
+string;0x04;Target Name

parse/out-0x05B.txt

@@ -1,4 +1,4 @@
-file;in-0x05B;Dialog Choice;Selecting a dialog option
+file;out-0x05B;Dialog Choice;Selecting a dialog option
 
 uint32;$04;Target ID
 uint16;$06;Option Index