Commit f09bb75e authored by mercury233's avatar mercury233

add Zarc card type

parent 2b0ef6c9
...@@ -199,24 +199,21 @@ namespace ImgGen ...@@ -199,24 +199,21 @@ namespace ImgGen
str = str + "幻龙族"; str = str + "幻龙族";
break; break;
} }
if ((dat.type & 0x8020c0) != 0) if ((dat.type & 0x40) != 0)
{ {
if ((dat.type & 0x800000) != 0) str = str + "/融合";
{ }
str = str + "/" + xyzString; if ((dat.type & 0x2000) != 0)
} {
else if ((dat.type & 0x2000) != 0) str = str + "/同调";
{ }
str = str + "/同调"; if ((dat.type & 0x800000) != 0)
} {
else if ((dat.type & 0x40) != 0) str = str + "/" + xyzString;
{ }
str = str + "/融合"; if ((dat.type & 0x80) != 0)
} {
else if ((dat.type & 0x80) != 0) str = str + "/仪式";
{
str = str + "/仪式";
}
} }
if ((dat.type & 0x1000000) != 0) if ((dat.type & 0x1000000) != 0)
{ {
...@@ -275,6 +272,7 @@ namespace ImgGen ...@@ -275,6 +272,7 @@ namespace ImgGen
bTemplates[11] = new Bitmap("./textures/card_pnormal.jpg"); bTemplates[11] = new Bitmap("./textures/card_pnormal.jpg");
bTemplates[12] = new Bitmap("./textures/card_psynchro.jpg"); bTemplates[12] = new Bitmap("./textures/card_psynchro.jpg");
bTemplates[13] = new Bitmap("./textures/card_pfusion.jpg"); bTemplates[13] = new Bitmap("./textures/card_pfusion.jpg");
bTemplates[14] = new Bitmap("./textures/card_zarc.jpg");
bAttributes[0] = new Bitmap("./textures/att_earth.png"); bAttributes[0] = new Bitmap("./textures/att_earth.png");
bAttributes[1] = new Bitmap("./textures/att_water.png"); bAttributes[1] = new Bitmap("./textures/att_water.png");
bAttributes[2] = new Bitmap("./textures/att_fire.png"); bAttributes[2] = new Bitmap("./textures/att_fire.png");
...@@ -359,7 +357,11 @@ namespace ImgGen ...@@ -359,7 +357,11 @@ namespace ImgGen
Bitmap bitmap; Bitmap bitmap;
SizeF ef; SizeF ef;
int num4; int num4;
if ((data.type & 2) != 0) if ((data.type & 0x1802040) == 0x1802040)
{
bitmap = new Bitmap(bTemplates[14]);
}
else if ((data.type & 2) != 0)
{ {
bitmap = new Bitmap(bTemplates[0]); bitmap = new Bitmap(bTemplates[0]);
} }
...@@ -435,7 +437,7 @@ namespace ImgGen ...@@ -435,7 +437,7 @@ namespace ImgGen
if ((data.type & 1) != 0) if ((data.type & 1) != 0)
{ {
int y = 15; int y = 15;
if ((data.type & 0x800000) == 0) if ((data.type & 0x800000) == 0 || (data.type & 0x1802040) == 0x1802040)
{ {
if ((data.type & 0x1000000) == 0) if ((data.type & 0x1000000) == 0)
{ {
...@@ -581,9 +583,18 @@ namespace ImgGen ...@@ -581,9 +583,18 @@ namespace ImgGen
} }
else//pendulum else//pendulum
{ {
graphics.DrawString(gettypestring(data), typeFont, typeBrush, (float)12f, (float)192f); string type_string = gettypestring(data);
string monster_effect = GetDesc(text.text, regex_monster); float width1 = graphics.MeasureString(type_string, typeFont).Width;
string pendulum_effect = GetDesc(text.text, regex_pendulum); float sx1 = 1f;
if (width1 > 150f)
{
sx1 *= 150f / width1;
}
graphics.ScaleTransform(sx1, 1f);
graphics.DrawString(type_string, typeFont, typeBrush, (float)12f, (float)192f);
graphics.ResetTransform();
string monster_effect = GetDesc(text.text, regex_monster);
string pendulum_effect = GetDesc(text.text, regex_pendulum);
int lscale = (data.level >> 0x18) & 0xff; int lscale = (data.level >> 0x18) & 0xff;
int rscale = (data.level >> 0x10) & 0xff; int rscale = (data.level >> 0x10) & 0xff;
if (lscale > 9) if (lscale > 9)
......
...@@ -124,6 +124,9 @@ ...@@ -124,6 +124,9 @@
<None Include="textures/card_xyz.jpg"> <None Include="textures/card_xyz.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="textures/card_zarc.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="textures/cover.jpg"> <None Include="textures/cover.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment