WIP: 7渡し / 10捨て

src/components/createRoomButton.tsx

@@ -18,6 +18,8 @@ export default function CreateRoomButton(props: Props) {
   const [kakumei, setKakumei] = React.useState<boolean>(true);
   const [reverse, setReverse] = React.useState<boolean>(false);
   const [skip, setSkip] = React.useState<SkipConfig>(SkipConfig.OFF);
+  const [transfer, setTransfer] = React.useState<boolean>(false);
+  const [exile, setExile] = React.useState<boolean>(false);
 
   const handleCreateRoom = () => {
     setIsCreating(true);
@@ -27,6 +29,8 @@ export default function CreateRoomButton(props: Props) {
       kakumei: kakumei,
       reverse: reverse,
       skip: skip,
+      transfer: transfer,
+      exile: exile,
     };
     props.globalLogic.createGameRoom(rc, (success: boolean) => {
       setIsCreating(false);
@@ -66,11 +70,15 @@ export default function CreateRoomButton(props: Props) {
             kakumei={kakumei}
             reverse={reverse}
             skip={skip}
+            transfer={transfer}
+            exile={exile}
             onYagiriChange={setYagiri}
             onJBackChange={setJBack}
             onKakumeiChange={setKakumei}
             onReverseChange={setReverse}
             onSkipChange={setSkip}
+            onTransferChange={setTransfer}
+            onExileChange={setExile}
           />
         </Modal.Body>
         <Modal.Footer>

src/components/gameContainer.tsx

@@ -13,6 +13,7 @@ import {
   DiscardPairListMessage,
   encodeDiscardPairListMessage,
   WaitReason,
+  YourTurnContext,
 } from "dfg-messages";
 import LeaveRoomButton from "./leaveRoomButton";
 
@@ -28,7 +29,7 @@ export default function GameContainer(props: Props) {
     new GameStateDTO(new GameState())
   );
   const [ownerStatus, setOwnerStatus] = React.useState<boolean>(false);
-  const [isMyTurn, setIsMyTurn] = React.useState<boolean>(false);
+  const [isPassable, setIsPassable] = React.useState<boolean>(false);
   const [cardList, setCardList] = React.useState<CardListMessage>(
     encodeCardListMessage([])
   );
@@ -70,14 +71,15 @@ export default function GameContainer(props: Props) {
     updateLog(msg);
   };
 
-  const handleMyTurn = (myTurn: boolean) => {
+  const handleMyTurn = (context:YourTurnContext, passable:boolean) => {
+    const myTurn = context !== YourTurnContext.INACTIVE;
     if (myTurn) {
-      const msg = i18n.game_yourTurn();
+      const msg = i18n.game_yourTurn(context);
       props.globalLogic.updateAutoRead(msg);
       props.globalLogic.sound.enqueueEvent(SoundEvent.TURN);
-      setIsMyTurn(true);
+      setIsPassable(passable);
     } else {
-      setIsMyTurn(false);
+      setIsPassable(false);
     }
   };
 
@@ -182,7 +184,7 @@ export default function GameContainer(props: Props) {
         onCardSelectionChange={props.gameLogic.selectCard.bind(props.gameLogic)}
         onDiscard={props.gameLogic.discard.bind(props.gameLogic)}
         onPass={props.gameLogic.pass.bind(props.gameLogic)}
-        isPassable={isMyTurn}
+        isPassable={isPassable}
       />
       <PlayingInfoPanel
         globalLogic={props.globalLogic}

src/components/roomList.test.tsx

@@ -16,6 +16,8 @@ function createRuleConfig(): RuleConfig {
     kakumei: true,
     reverse: false,
     skip: SkipConfig.OFF,
+    transfer: false,
+    exile: false,
   };
 }
 

src/components/roomSettingsModal.test.tsx

@@ -11,11 +11,15 @@ test("renders settings with given parameters", () => {
   const kakumei = true;
   const reverse = false;
   const skip = SkipConfig.OFF;
+  const transfer = false;
+  const exile = false;
   const onYagiriChange = jest.fn((yagiri: boolean) => {});
   const onJBackChange = jest.fn((jBack: boolean) => {});
   const onKakumeiChange = jest.fn((kakumei: boolean) => {});
   const onReverseChange = jest.fn((reverse: boolean) => {});
   const onSkipChange = jest.fn((skip: SkipConfig) => {});
+  const onTransferChange = jest.fn((transfer: boolean) => {});
+  const onExileChange = jest.fn((exile: boolean) => {});
   render(
     <RoomSettingsModal
       globalLogic={gl}
@@ -24,11 +28,15 @@ test("renders settings with given parameters", () => {
       kakumei={kakumei}
       reverse={reverse}
       skip={skip}
+      transfer={transfer}
+      exile={exile}
       onYagiriChange={onYagiriChange}
       onJBackChange={onJBackChange}
       onKakumeiChange={onKakumeiChange}
       onReverseChange={onReverseChange}
       onSkipChange={onSkipChange}
+      onTransferChange={onTransferChange}
+      onExileChange={onExileChange}
     />
   );
   const yagiriCb = screen.getByLabelText(/8切り/);
@@ -45,6 +53,10 @@ test("renders settings with given parameters", () => {
   expect(skipOffRadio).toBeChecked();
   expect(skipSingleRadio).not.toBeChecked();
   expect(skipMultiRadio).not.toBeChecked();
+  const transferCb = screen.getByLabelText(/7渡し/);
+  expect(transferCb).not.toBeChecked();
+  const exileCb = screen.getByLabelText(/10捨て/);
+  expect(exileCb).not.toBeChecked();
 });
 
 test("can change settings", () => {
@@ -54,11 +66,15 @@ test("can change settings", () => {
   const kakumei = true;
   const reverse = false;
   const skip = SkipConfig.OFF;
+  const transfer = false;
+  const exile = false;
   const onYagiriChange = jest.fn((yagiri: boolean) => {});
   const onJBackChange = jest.fn((jBack: boolean) => {});
   const onKakumeiChange = jest.fn((kakumei: boolean) => {});
   const onReverseChange = jest.fn((reverse: boolean) => {});
   const onSkipChange = jest.fn((skip: SkipConfig) => {});
+  const onTransferChange = jest.fn((transfer: boolean) => {});
+  const onExileChange = jest.fn((exile: boolean) => {});
   render(
     <RoomSettingsModal
       globalLogic={gl}
@@ -67,11 +83,15 @@ test("can change settings", () => {
       kakumei={kakumei}
       reverse={reverse}
       skip={skip}
+      transfer={transfer}
+      exile={exile}
       onYagiriChange={onYagiriChange}
       onJBackChange={onJBackChange}
       onKakumeiChange={onKakumeiChange}
       onReverseChange={onReverseChange}
       onSkipChange={onSkipChange}
+      onTransferChange={onTransferChange}
+      onExileChange={onExileChange}
     />
   );
   const yagiriCb = screen.getByLabelText(/8切り/);
@@ -93,4 +113,10 @@ test("can change settings", () => {
   const skipMultiRadio = screen.getByLabelText(/マルチスキップ/);
   fireEvent(skipMultiRadio, createClickEvent());
   expect(onSkipChange).toHaveBeenCalledWith(SkipConfig.MULTI);
+  const transferCb = screen.getByLabelText(/7渡し/);
+  fireEvent(transferCb, createClickEvent());
+  expect(onTransferChange).toHaveBeenCalledWith(!transfer);
+  const exileCb = screen.getByLabelText(/10捨て/);
+  fireEvent(exileCb, createClickEvent());
+  expect(onExileChange).toHaveBeenCalledWith(!exile);
 });

src/components/roomSettingsModal.tsx

@@ -10,11 +10,15 @@ interface Props {
   kakumei: boolean;
   reverse: boolean;
   skip: SkipConfig;
+  transfer: boolean;
+  exile: boolean;
   onYagiriChange: (yagiri: boolean) => void;
   onJBackChange: (jBack: boolean) => void;
   onKakumeiChange: (kakumei: boolean) => void;
   onReverseChange: (reverse: boolean) => void;
   onSkipChange: (skip: SkipConfig) => void;
+  onTransferChange: (transfer: boolean) => void;
+  onExileChange: (exile: boolean) => void;
 }
 
 export default function RoomSettingsModal(props: Props) {
@@ -108,6 +112,26 @@ export default function RoomSettingsModal(props: Props) {
             />
           </div>
         </Form.Group>
+        <Form.Group className="mb-3" controlId="roomSettings_transfer">
+          <Form.Check
+            type="checkbox"
+            label={i18n.roomSettings_transfer()}
+            checked={props.transfer}
+            onChange={() => {
+              props.onTransferChange(!props.transfer);
+            }}
+          />
+        </Form.Group>
+        <Form.Group className="mb-3" controlId="roomSettings_exile">
+          <Form.Check
+            type="checkbox"
+            label={i18n.roomSettings_exile()}
+            checked={props.exile}
+            onChange={() => {
+              props.onExileChange(!props.exile);
+            }}
+          />
+        </Form.Group>
       </Form>
     </React.Fragment>
   );

src/i18n/interface.ts

@@ -7,6 +7,7 @@ import {
   RuleConfig,
   WebSocketErrorCode,
   WaitReason,
+  YourTurnContext,
 } from "dfg-messages";
 
 export interface Result {
@@ -49,6 +50,8 @@ export interface I18nService {
   roomSettings_skip_off: () => string;
   roomSettings_skip_single: () => string;
   roomSettings_skip_multiple: () => string;
+  roomSettings_transfer: () => string;
+  roomSettings_exile: () => string;
   roomList_creator: () => string;
   roomList_playerNameList: () => string;
   roomList_state: () => string;
@@ -90,7 +93,7 @@ export interface I18nService {
   game_passMessage: (playerName: string, remainingHandCount: number) => string;
   game_initialInfo: (playerCount: number, deckCount: number) => string;
   game_cardsProvided: (playerName: string, cardCount: number) => string;
-  game_yourTurn: () => string;
+  game_yourTurn: (context:YourTurnContext) => string;
   game_turn: (playerName: string) => string;
   game_discard: (
     playerName: string,
@@ -102,6 +105,8 @@ export interface I18nService {
   game_kakumei: () => string;
   game_reversed: () => string;
   game_skipped: (playerName: string) => string;
+  game_transferred: (fromPlayerName: string, toPlayerName: string, cardList: CardMessage[]) => string;
+  game_exiled: (playerName: string, cardList: CardMessage[]) => string;
   game_ranked: (playerName: string, rankType: RankType) => string;
   game_rankChanged: (
     playerName: string,