Added Combat Art Tab

three-houses-research-team · Nov 24, 2020 · 734cee9 · 734cee9
1 parent f1a7ebd
commit 734cee9
Show file tree

Hide file tree

Showing 24 changed files with 1,431 additions and 19 deletions.
diff --git a/.vs/Progenitor/v16/.suo b/.vs/Progenitor/v16/.suo
diff --git a/DataFiles/Data/Sections/CombatArtBlock.cs b/DataFiles/Data/Sections/CombatArtBlock.cs
@@ -11,56 +11,62 @@ class CombatArtBlock
     {
         public short RequiredWeapon { get; set; }
         public sbyte Avoid { get; set; }
+        public byte Might { get; set; }
         public sbyte Crit { get; set; }
         public sbyte Hit { get; set; }
         public sbyte Avoid2 { get; set; }
         public byte Effect { get; set; }
         public byte RequiredClass { get; set; }
+        public byte unk_0xA { get; set; }
         public byte DurabilityCost { get; set; }
         public byte MaxRange { get; set; }
         public byte MinRange { get; set; }
-        public byte unk_0xD { get; set; }
-        public byte unk_0xE { get; set; }
+        public byte WeapType { get; set; }
+        public byte unk_0xF { get; set; }
         public byte Effectiveness { get; set; }
         public byte Flags { get; set; }
-        public short unk_0x11 { get; set; }
+        public byte unk_0x11 { get; set; }
 
         public void Read(EndianBinaryReader fixed_data)
         {
             RequiredWeapon = fixed_data.ReadInt16();
             Avoid = fixed_data.ReadSByte();
+            Might = fixed_data.ReadByte();
             Crit = fixed_data.ReadSByte();
             Hit = fixed_data.ReadSByte();
             Avoid2 = fixed_data.ReadSByte();
             Effect = fixed_data.ReadByte();
             RequiredClass = fixed_data.ReadByte();
+            unk_0xA = fixed_data.ReadByte();
             DurabilityCost = fixed_data.ReadByte();
             MaxRange = fixed_data.ReadByte();
             MinRange = fixed_data.ReadByte();
-            unk_0xD = fixed_data.ReadByte();
-            unk_0xE = fixed_data.ReadByte();
+            WeapType = fixed_data.ReadByte();
+            unk_0xF = fixed_data.ReadByte();
             Effectiveness = fixed_data.ReadByte();
             Flags = fixed_data.ReadByte();
-            unk_0x11 = fixed_data.ReadInt16();
+            unk_0x11 = fixed_data.ReadByte();
         }
 
         public void Write(EndianBinaryWriter fixed_data)
         {
             fixed_data.WriteInt16(RequiredWeapon);
             fixed_data.WriteSByte(Avoid);
+            fixed_data.WriteByte(Might);
             fixed_data.WriteSByte(Crit);
             fixed_data.WriteSByte(Hit);
             fixed_data.WriteSByte(Avoid2);
             fixed_data.WriteByte(Effect);
             fixed_data.WriteByte(RequiredClass);
+            fixed_data.WriteByte(unk_0xA);
             fixed_data.WriteByte(DurabilityCost);
             fixed_data.WriteByte(MaxRange);
             fixed_data.WriteByte(MinRange);
-            fixed_data.WriteByte(unk_0xD);
-            fixed_data.WriteByte(unk_0xE);
+            fixed_data.WriteByte(WeapType);
+            fixed_data.WriteByte(unk_0xF);
             fixed_data.WriteByte(Effectiveness);
             fixed_data.WriteByte(Flags);
-            fixed_data.WriteInt16(unk_0x11);
+            fixed_data.WriteByte(unk_0x11);
         }
     }
 }
diff --git a/FixedDataMain.Designer.cs b/FixedDataMain.Designer.cs
diff --git a/FixedDataMain.cs b/FixedDataMain.cs
diff --git a/Images/Arts/Axe.png b/Images/Arts/Axe.png
diff --git a/Images/Arts/Bow.png b/Images/Arts/Bow.png
diff --git a/Images/Arts/Fist.png b/Images/Arts/Fist.png
diff --git a/Images/Arts/Lance.png b/Images/Arts/Lance.png
diff --git a/Images/Arts/Other.png b/Images/Arts/Other.png
diff --git a/Images/Arts/Sword.png b/Images/Arts/Sword.png
diff --git a/Progenitor.csproj b/Progenitor.csproj
@@ -328,6 +328,12 @@
     <EmbeddedResource Include="Images\Items\Seal.png" />
     <EmbeddedResource Include="Images\Items\Stat_Booster.png" />
     <EmbeddedResource Include="Images\Items\Torch.png" />
+    <EmbeddedResource Include="Images\Arts\Axe.png" />
+    <EmbeddedResource Include="Images\Arts\Bow.png" />
+    <EmbeddedResource Include="Images\Arts\Fist.png" />
+    <EmbeddedResource Include="Images\Arts\Lance.png" />
+    <EmbeddedResource Include="Images\Arts\Other.png" />
+    <EmbeddedResource Include="Images\Arts\Sword.png" />
     <Content Include="So_this.ico" />
   </ItemGroup>
   <ItemGroup />

diff --git a/bin/Debug/Progenitor.exe b/bin/Debug/Progenitor.exe
diff --git a/bin/Debug/Progenitor.pdb b/bin/Debug/Progenitor.pdb
diff --git a/bin/Release/Progenitor.exe b/bin/Release/Progenitor.exe
diff --git a/bin/Release/Progenitor.pdb b/bin/Release/Progenitor.pdb
diff --git a/obj/Debug/Progenitor.csproj.GenerateResource.cache b/obj/Debug/Progenitor.csproj.GenerateResource.cache
diff --git a/obj/Debug/Progenitor.csprojAssemblyReference.cache b/obj/Debug/Progenitor.csprojAssemblyReference.cache
diff --git a/obj/Debug/Progenitor.exe b/obj/Debug/Progenitor.exe
diff --git a/obj/Debug/Progenitor.pdb b/obj/Debug/Progenitor.pdb
diff --git a/obj/Release/DesignTimeResolveAssemblyReferences.cache b/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/obj/Release/Progenitor.csproj.GenerateResource.cache b/obj/Release/Progenitor.csproj.GenerateResource.cache
diff --git a/obj/Release/Progenitor.csprojAssemblyReference.cache b/obj/Release/Progenitor.csprojAssemblyReference.cache
diff --git a/obj/Release/Progenitor.exe b/obj/Release/Progenitor.exe
diff --git a/obj/Release/Progenitor.pdb b/obj/Release/Progenitor.pdb