From: H.G.Muller Date: Sun, 31 Jan 2016 14:53:05 +0000 (+0100) Subject: Expand numer of new piece types to 2 x 11 X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=73a174a6d6ef63290bf90f2cb92708b0929dd04b Expand numer of new piece types to 2 x 11 The number of pieces added between basic and promoted series, and between the latter and King is increased to 11, and they are ordered differently. The image used for the Chu-Shogi White-Horse piece,which was a duplicat of the Knight, is now replaced by a winged Knight. --- diff --git a/Makefile.am b/Makefile.am index 87c9b65..09f9adf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,6 +156,16 @@ dist_svg_DATA = svg/icon_white.svg svg/icon_black.svg \ svg/BlackTower.svg svg/WhiteTower.svg \ svg/BlackDragon.svg svg/WhiteDragon.svg \ svg/BlackCub.svg svg/WhiteCub.svg \ + svg/BlackButterfly.svg svg/WhiteButterfly.svg \ + svg/BlackLeft.svg svg/WhiteLeft.svg \ + svg/BlackRight.svg svg/WhiteRight.svg \ + svg/BlackHat.svg svg/WhiteHat.svg \ + svg/BlackRShield.svg svg/WhiteRShield.svg \ + svg/BlackLShield.svg svg/WhiteLShield.svg \ + svg/BlackAxe.svg svg/WhiteAxe.svg \ + svg/BlackFlag.svg svg/WhiteFlag.svg \ + svg/BlackDuck.svg svg/WhiteDuck.svg \ + svg/BlackPegasus.svg svg/WhitePegasus.svg \ svg/eo_Analyzing.svg svg/eo_Black.svg \ svg/eo_Clear.svg svg/eo_Ponder.svg \ svg/eo_Thinking.svg svg/eo_Unknown.svg \ diff --git a/common.h b/common.h index 6ba5774..81f2553 100644 --- a/common.h +++ b/common.h @@ -294,23 +294,27 @@ typedef enum { WhiteFerz, WhiteAlfil, WhiteAngel, WhiteMarshall, WhiteWazir, WhiteMan, WhiteCannon, WhiteNightrider, WhiteCardinal, WhiteDragon, WhiteGrasshopper, WhiteSilver, WhiteFalcon, WhiteLance, WhiteCobra, WhiteUnicorn, WhiteLion, - WhiteWolf, WhiteCamel, WhiteZebra, WhiteWizard, WhiteAmazon, WhiteCub, + WhiteButterfly, WhiteZebra, WhiteCamel, WhiteTower, WhiteWolf, + WhiteFlying, WhiteDuck, WhiteAxe, WhiteHat, WhiteGnu, WhiteCub, WhiteTokin, WhiteClaw, WhitePCardinal, WhitePDragon, WhiteCat, WhitePSword, WhiteMonarch, WhiteMother, WhiteNothing, WhitePRook, WhitePDagger, WhiteDolphin, WhiteStag, WhiteHorned, WhiteEagle, WhiteSword, WhiteCrown, WhiteHCrown, WhiteHorse, WhiteDrunk, WhitePBishop, - WhiteGnu, WhiteViking, WhiteIron, WhiteCopper, WhiteTower, WhiteFlying, + WhiteWheel, WhitePKnight, WhiteWizard, WhiteCopper, WhiteIron, WhiteViking, + WhiteFlag, WhiteAmazon, WhiteWheer, WhiteShield, WhiteShierd, WhiteKing, BlackPawn, BlackKnight, BlackBishop, BlackRook, BlackQueen, BlackFerz, BlackAlfil, BlackAngel, BlackMarshall, BlackWazir, BlackMan, BlackCannon, BlackNightrider, BlackCardinal, BlackDragon, BlackGrasshopper, BlackSilver, BlackFalcon, BlackLance, BlackCobra, BlackUnicorn, BlackLion, - BlackWolf, BlackCamel, BlackZebra, BlackWizard, BlackAmazon, BlackCub, + BlackButterfly, BlackZebra, BlackCamel, BlackTower, BlackWolf, + BlackFlying, BlackDuck, BlackAxe, BlackHat, BlackGnu, BlackCub, BlackTokin, BlackClaw, BlackPCardinal, BlackPDragon, BlackCat, BlackPSword, BlackMonarch, BlackMother, BlackNothing, BlackPRook, BlackPDagger, BlackDolphin, BlackStag, BlackHorned, BlackEagle, BlackSword, BlackCrown, BlackHCrown, BlackHorse, BlackDrunk, BlackPBishop, - BlackGnu, BlackViking, BlackIron, BlackCopper, BlackTower, BlackFlying, + BlackWheel, BlackPKnight, BlackWizard, BlackCopper, BlackIron, BlackViking, + BlackFlag, BlackAmazon, BlackWheer, BlackShield, BlackShierd, BlackKing, EmptySquare, DarkSquare, NoRights, // [HGM] gamestate: for castling rights hidden in board[CASTLING] diff --git a/draw.c b/draw.c index b88d53d..2df683f 100644 --- a/draw.c +++ b/draw.c @@ -173,6 +173,8 @@ SelectPieces(VariantClass v) pngPieceBitmaps[i][(int)WhiteEagle] = pngPieceBitmaps2[i][(int)WhiteFalcon]; pngPieceBitmaps[i][(int)WhiteMan] = pngPieceBitmaps2[i][(int)WhiteCopper]; pngPieceBitmaps[i][(int)WhiteCopper] = pngPieceBitmaps2[i][(int)WhiteMan]; + pngPieceBitmaps[i][(int)WhiteAxe] = pngPieceBitmaps2[i][(int)WhiteCannon]; + pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteAxe]; } } } @@ -290,15 +292,15 @@ CreatePNGBoard (char *s, int kind) char *pngPieceNames[] = // must be in same order as internal piece encoding { "Pawn", "Knight", "Bishop", "Rook", "Queen", "Advisor", "Elephant", "Archbishop", "Marshall", "Gold", "Commoner", "Canon", "Nightrider", "CrownedBishop", "CrownedRook", "Crown", "Chancellor", "Hawk", "Lance", "Cobra", "Unicorn", "Lion", - "Wolf", "Camel", "Zebra", "Wizard", "Lance", "Cub", + "Butterfly", "Zebra", "Camel", "Tower", "Wolf", "Dragon", "Duck", "Axe", "Hat", "Gnu", "Cub", "GoldPawn", "Claw", "PromoHorse", "PromoDragon", "GoldLance", "PromoSword", "Prince", "Phoenix", "Kylin", "PromoRook", "PromoHSword", - "Dolphin", "Sword", "Leopard", "HSword", "GoldSilver", "Princess", "HCrown", "Knight", "Elephant", "PromoBishop", - "Gnu", "Viking", "Iron", "Copper", "Tower", "Dragon", "King", + "Dolphin", "Sword", "Leopard", "HSword", "GoldSilver", "Princess", "HCrown", "Pegasus", "Elephant", "PromoBishop", + "Left", "GoldKnight", "Wizard", "Copper", "Iron", "Viking", "Flag", "Lance", "Right", "LShield", "RShield", "King", "Claw", "GoldKnight", "GoldLance", "GoldSilver", NULL }; char *backupPiece[] = { "Princess", NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "King", "Queen", "Lion" }; // pieces that map on other when not kanji RsvgHandle * diff --git a/svg/BlackAxe.svg b/svg/BlackAxe.svg new file mode 100644 index 0000000..f0bdb80 --- /dev/null +++ b/svg/BlackAxe.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/svg/BlackButterfly.svg b/svg/BlackButterfly.svg new file mode 100644 index 0000000..8045abf --- /dev/null +++ b/svg/BlackButterfly.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/svg/BlackDuck.svg b/svg/BlackDuck.svg new file mode 100644 index 0000000..99e729b --- /dev/null +++ b/svg/BlackDuck.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/svg/BlackFlag.svg b/svg/BlackFlag.svg new file mode 100644 index 0000000..16953d0 --- /dev/null +++ b/svg/BlackFlag.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/svg/BlackHat.svg b/svg/BlackHat.svg new file mode 100644 index 0000000..b00a0af --- /dev/null +++ b/svg/BlackHat.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/svg/BlackLShield.svg b/svg/BlackLShield.svg new file mode 100644 index 0000000..630921f --- /dev/null +++ b/svg/BlackLShield.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/svg/BlackLeft.svg b/svg/BlackLeft.svg new file mode 100644 index 0000000..8e3a64a --- /dev/null +++ b/svg/BlackLeft.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/BlackPegasus.svg b/svg/BlackPegasus.svg new file mode 100644 index 0000000..1740e67 --- /dev/null +++ b/svg/BlackPegasus.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/svg/BlackRShield.svg b/svg/BlackRShield.svg new file mode 100644 index 0000000..eb95edb --- /dev/null +++ b/svg/BlackRShield.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/svg/BlackRight.svg b/svg/BlackRight.svg new file mode 100644 index 0000000..e33fa9b --- /dev/null +++ b/svg/BlackRight.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/WhiteAxe.svg b/svg/WhiteAxe.svg new file mode 100644 index 0000000..d0739a4 --- /dev/null +++ b/svg/WhiteAxe.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/svg/WhiteButterfly.svg b/svg/WhiteButterfly.svg new file mode 100644 index 0000000..83b686f --- /dev/null +++ b/svg/WhiteButterfly.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/svg/WhiteDuck.svg b/svg/WhiteDuck.svg new file mode 100644 index 0000000..f19e88a --- /dev/null +++ b/svg/WhiteDuck.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/svg/WhiteFlag.svg b/svg/WhiteFlag.svg new file mode 100644 index 0000000..bf734b1 --- /dev/null +++ b/svg/WhiteFlag.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/svg/WhiteHat.svg b/svg/WhiteHat.svg new file mode 100644 index 0000000..362c03b --- /dev/null +++ b/svg/WhiteHat.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/svg/WhiteLShield.svg b/svg/WhiteLShield.svg new file mode 100644 index 0000000..b37f88f --- /dev/null +++ b/svg/WhiteLShield.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/svg/WhiteLeft.svg b/svg/WhiteLeft.svg new file mode 100644 index 0000000..4c8e7df --- /dev/null +++ b/svg/WhiteLeft.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/WhitePegasus.svg b/svg/WhitePegasus.svg new file mode 100644 index 0000000..b0175ef --- /dev/null +++ b/svg/WhitePegasus.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/svg/WhiteRShield.svg b/svg/WhiteRShield.svg new file mode 100644 index 0000000..1dbf7d0 --- /dev/null +++ b/svg/WhiteRShield.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/svg/WhiteRight.svg b/svg/WhiteRight.svg new file mode 100644 index 0000000..a0e9e25 --- /dev/null +++ b/svg/WhiteRight.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + +