Merge branch 'ver2.3'

MihailJP · Nov 8, 2020 · fb99dee · fb99dee
2 parents 076da5f + 5bcf82a
commit fb99dee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/mjcore/data/confitem.csv b/mjcore/data/confitem.csv
@@ -110,7 +110,7 @@
 126,16,0,,,,,,red_four,赤四,赤ドラ(４の牌)の有無を設定します,no,circle_suit,>>>,>>>,character_suit,character_circle_suit,,,,,,,,,,,,,,
 127,9,0,,,,,,red_five,赤五,赤ドラの有無を設定します,3tiles,4tiles,6tiles,2_circle_tiles,>>>,>>>,>>>,>>>,no,circle_suit,bamboo_suit,circle_bamboo_suit,character_suit,character_circle_suit,character_bamboo_suit,,,,,
 127,6,0,,,,,,red_five,赤五,赤ドラの有無を設定します,2tiles,>>>,4tiles,2_circle_tiles,>>>,>>>,>>>,>>>,no,circle_suit,bamboo_suit,,,,,,,,,
-127,16,0,,,,,,red_five,赤五,赤ドラの有無を設定します,2tiles,>>>,4tiles,2_circle_tiles,>>>,>>>,>>>,>>>,no,circle_suit,bamboo_suit,,,,,,,,,
+127,16,0,,,,,,red_five,赤五,赤ドラの有無を設定します,2tiles,>>>,4tiles,2_circle_tiles,>>>,>>>,>>>,>>>,no,circle_suit,>>>,>>>,character_suit,,,,,,,
 128,9,0,,,,,,red_six,赤六,赤ドラ(６の牌)の有無を設定します,no,circle_suit,bamboo_suit,circle_bamboo_suit,character_suit,character_circle_suit,character_bamboo_suit,all_three_suits,,,,,,,,,,,,
 128,6,0,,,,,,red_six,赤六,赤ドラ(６の牌)の有無を設定します,no,circle_suit,bamboo_suit,circle_bamboo_suit,,,,,,,,,,,,,,,,
 128,16,0,,,,,,red_six,赤六,赤ドラ(６の牌)の有無を設定します,no,circle_suit,>>>,>>>,character_suit,character_circle_suit,,,,,,,,,,,,,,

diff --git a/mjcore/prepare.cpp b/mjcore/prepare.cpp
@@ -92,7 +92,20 @@ inline void redtiles(GameTable* const gameStat, UInt8ByTile& tilepos) { // 赤
 		}
 	}
 	// 5のドラは特殊
-	if (gameStat->chkGameType(GameTypeID::sanmaX)) { // 三麻
+	if (gameStat->chkGameType(GameTypeID::sanmaSeto)) { // 瀬戸内三麻
+		if (RuleData::chkRule("red_five", "2tiles")) {
+			gameStat->Deck[tilepos[TileCode::circleFive]].red = DoraCol::akaDora;
+			gameStat->Deck[tilepos[TileCode::characterFive]].red = DoraCol::akaDora;
+		} else if (RuleData::chkRule("red_five", "4tiles")) {
+			gameStat->Deck[tilepos[TileCode::circleFive]].red = DoraCol::akaDora;
+			gameStat->Deck[tilepos[TileCode::circleFive] + 1].red = DoraCol::akaDora;
+			gameStat->Deck[tilepos[TileCode::characterFive]].red = DoraCol::akaDora;
+			gameStat->Deck[tilepos[TileCode::characterFive] + 1].red = DoraCol::akaDora;
+		} else if (RuleData::chkRule("red_five", "2_circle_tiles")) {
+			gameStat->Deck[tilepos[TileCode::circleFive]].red = DoraCol::akaDora;
+			gameStat->Deck[tilepos[TileCode::circleFive] + 1].red = DoraCol::akaDora;
+		}
+	} else if (gameStat->chkGameType(GameTypeID::sanmaX)) { // 三麻
 		if (RuleData::chkRule("red_five", "2tiles")) {
 			gameStat->Deck[tilepos[TileCode::circleFive]].red = DoraCol::akaDora;
 			gameStat->Deck[tilepos[TileCode::bambooFive]].red = DoraCol::akaDora;