Update xiangfu piece letters

Author: gbtami

client/chess.ts

@@ -21,7 +21,7 @@ export type PromotionType = "regular" | "shogi";
 export type TimeControlType = "incremental" | "byoyomi";
 export type CountingType = "makruk" | "asean";
 export type MaterialPointType = "janggi" | "ataxx";
-export type BoardMarkType = "alice" | "campmate" | "racingkings" | "kingofthehill" | "shocking" | "melonvariant";
+export type BoardMarkType = "alice" | "campmate" | "racingkings" | "kingofthehill";
 export type PieceSoundType = "regular" | "atomic" | "shogi";
 
 const handicapKeywords = [ "HC", "Handicap", "Odds" ];

client/variants.ts

@@ -318,19 +318,19 @@ interface VariantConfig {
 export const VARIANTS: Record<string, Variant> = {
     xiangfu: variant({
         name: "xiangfu", tooltip: "xiangfu",
-        startFen: "2rbe4/2can4/2+g1+g4/9/9/9/4+G1+G2/4NAC2/4EBR2[] w - 0 1",
+        startFen: "2rbm4/2cwn4/2+g1+g4/9/9/9/4+G1+G2/4NWC2/4MBR2[] w - 0 1",
         icon: "👊",
         boardFamily: "xiangfu9x9", pieceFamily: "xiangfu",
-        pieceRow: ["+g", "g", "r", "b", "e", "c", "a", "n"],
+        pieceRow: ["+g", "g", "r", "b", "m", "c", "w", "n"],
         pocket: {
-            roles: ["g", "r", "b", "e", "c", "a", "n"],
+            roles: ["g", "r", "b", "m", "c", "w", "n"],
             captureToHand: true,
         },
         promotion: { type: "regular", roles: [] },
         kingRoles: ["+g"],
         alternateStart: {
             '': "",
-            'SwitchedRB': "2bre4/2can4/2+g1+g4/9/9/9/4+G1+G2/4NAC2/4ERB2[] w - 0 1",
+            'SwitchedRB': "2brm4/2cwn4/2+g1+g4/9/9/9/4+G1+G2/4NWC2/4MRB2[] w - 0 1",
         },
     }),
 

client/variantsIni.ts

@@ -319,43 +319,32 @@ startFen = rnsmksnr/8/pppppppp/8/8/PPPPPPPP/8/RNSKMSNR[] w - - 0 1
 capturesToHand = false
 twoBoards = true
 
-# MARTIAL ARTS XIANGQI
+# Martial arts Xiangqi
 [xiangfu]
-
-# Board Parameters
 maxFile = 9
 maxRank = 9
-
-# Pieces
-
+startFen = 2rbm4/2cwn4/2+g1+g4/9/9/9/4+G1+G2/4NWC2/4MBR2[] w - 0 1
 commoner = k
-customPiece3 = g:Q1
 bishop = b
 horse = n
 rook = r
-customPiece2 = e:nAnD
 cannon = c
-customPiece1 = a:mBcpB
-
-startFen = 2rbe4/2can4/2+g1+g4/9/9/9/4+G1+G2/4NAC2/4EBR2[] w - 0 1
-
-# Palace
+customPiece1 = w:mBcpB
+customPiece2 = m:nAnD
+customPiece3 = g:Q1
 mobilityRegionBlackCommoner = c3 c4 c5 c6 c7 d3 d4 d5 d6 d7 e3 e4 e5 e6 e7 f3 f4 f5 f6 f7 g3 g4 g5 g6 g7
 mobilityRegionWhiteCommoner = c3 c4 c5 c6 c7 d3 d4 d5 d6 d7 e3 e4 e5 e6 e7 f3 f4 f5 f6 f7 g3 g4 g5 g6 g7
-
-# Drop Rules
 pieceDrops = true
 capturesToHand = true
 whiteDropRegion = *1 *2
 blackDropRegion = *8 *9
-
-# Royal piece rules
 extinctionPieceTypes = k
 extinctionPseudoRoyal = true
 dupleCheck = true
 promotedPieceType = g:k
 promotionRegionWhite = -
 promotionRegionBlack = -
+
 # Jieqi https://www.clubxiangqi.com/uprules.php
 [jieqi:xiangqi]
 startFen = r~n~b~a~ka~b~n~r~/9/1c~5c~1/p~1p~1p~1p~1p~/9/9/P~1P~1P~1P~1P~/1C~5C~1/9/R~N~B~A~KA~B~N~R~ w - - 0 1

static/docs/xiangfu.md

@@ -5,30 +5,34 @@
 Xiangfu is a Xiangqi variant created by Eventlesstew for the Variant Design Contest.
 This essentially aims to be, or was initially going to be, a spiritual successor to Chennis. This variant combines the upfrontness of Marial Arts with the careful aggression of Xiangqi. This is achieved through the Kings always being in the centre and the use of ranging pieces, including the Bishop and the Crossbow.
 
-The rules to this variant are the same as Xiangqi, with the following differences:
-- Pieces you capture can be dropped within the first two ranks of the board. This is similar to Crazyhouse Xiangqi.
+## Rules
+
+- Pieces you capture can be dropped within the first two ranks of the board.
 - The palaces on the opposing ends of the board are now combined into a single, large ring, where the Kings are confined to.
-- Since each player has two Generals, check and checkmate rules now work like in Spartan Chess. This means that if you have two kings, they can be used on the offensive.
+- Since each player has two champions, check and checkmate rules now work like in Spartan Chess. This means that if you have two champions, they can be used on the offensive. You must capture one champion in order to checkmate the other champion, unless you can perform a Duple Checkmate!
+
+## Pieces
+
+### Champion/King (K)
+The champions move 1 space in any direction, like the king in Chess. They are the only pieces confined to the Ring.
+
+### Pupil/Commoner (G)
+The pupil moves 1 space in any direction, like the king in Chess. Pupil is the unpromoted, non royal version of the champion. When you take an opponent champion it will go to your hand as pupil.
 
-You must capture one general in order to checkmate the other General, unless you can perform a Duple Checkmate!
+### Horse (N)
+The same as the horse in Xiangqi.
 
-The pieces move as follows:
-RETURNING PIECES:
-The following pieces in this variant have the same movement as in Xiangqi.
-- Horse
-- Chariot
-- Cannon
+### Chariot
+The same as the chariot in Xiangqi.
 
-GENERALS
-The Generals move 1 space in any direction, like the King from Chess. They are the only pieces confined to the Ring.
-Unlike in regular Xiangqi, the opposing Kings can face eachother.
+### Cannon
+The same as the cannon in Xiangqi.
 
-ELEPHANT
-The Elephant moves two spaces diagonally, but can move freely since there is no river.
-...Yeah, that's the only difference the Elephant has in this variant.
+### Mahout/Elephant rider (M)
+The Mahout moves one or two spaces diagonally.
 
-BISHOP
-A diagonal variant of the Chariot, the Bishop moves any number of spaces diagonally. This is the same piece as the Bishop from Chess.
+### Bishop (B)
+The same as the bishop in Chess.
 
-Crossbow
-A diagonal variant of the Cannon, The Crossbow moves any number of steps diagonally, but must jump over a piece in order to capture. For those who know, this is essentially the Copper Cannon from Cannon Shogi.
+### Crossbow (W)
+A diagonal variant of the cannon, The crossbow moves any number of steps diagonally, but must jump over a piece in order to capture.