Merge branch 'patch-ot' into 'v3'

update & fix room.options.rule

See merge request mycard/mycard!16

app/ygopro.component.html

@@ -86,7 +86,12 @@
                             <span i18n *ngIf="room.options.mode === 2">TAG</span>
                         </td>
                         <td class="extra">
-                            <span *ngIf="room.options.rule != default_options.rule">{{{'0': 'OCG', '1': 'TCG', '2': 'O/T', '3': '专有卡禁止'}[room.options.rule]}}</span>
+                            <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 0" title="允许OCG独有卡，不允许TCG独有卡">OCG</span>
+                            <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 1" title="允许TCG独有卡，不允许OCG独有卡">TCG</span>
+                            <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 2" title="只允许简体中文版已经发售的卡">简中</span>
+                            <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 3" title="只允许自制卡">自制卡</span>
+                            <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 4" title="不允许OCG或TCG独有卡">专有卡禁止</span>
+                            <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 5" title="可以任意使用OCG或TCG卡">所有卡片</span>
                             <span i18n *ngIf="room.options.start_lp != default_options.start_lp">{{room.options.start_lp}}LP</span>
                             <span i18n i18n-title *ngIf="room.options.start_hand != default_options.start_hand" title="初始起手数量">{{room.options.start_hand}}初始</span>
                             <span i18n i18n-title *ngIf="room.options.draw_count != default_options.draw_count" title="每回合抽卡数量">{{room.options.draw_count}}抽卡</span>
@@ -132,13 +137,14 @@
                     <select class="form-control form-control-sm" id="game-create-rule" name="rule" [(ngModel)]="room.options.rule">
                         <option i18n value="0">OCG</option>
                         <option i18n value="1">TCG</option>
-                        <option i18n value="2">OCG & TCG</option>
-                        <option i18n value="3">专有卡禁止</option>
-                        <option i18n value="4">简体中文</option>
+                        <option i18n value="2">简体中文</option>
+                        <option i18n value="3">自制卡</option>
+                        <option i18n value="4">专有卡禁止</option>
+                        <option i18n value="5">所有卡片</option>
                     </select>
                 </div>
                 <div class="form-group">
-                    <label i18n for="game-create-rule">决斗模式</label>
+                    <label i18n for="game-create-mode">决斗模式</label>
                     <select class="form-control form-control-sm" id="game-create-mode" name="mode" (change)="room.options.start_lp = room.options.mode == 2 ? default_options.start_lp_tag : default_options.start_lp" [(ngModel)]="room.options.mode">
                         <option i18n value="0">单局模式</option>
                         <option i18n value="1">比赛模式</option>
@@ -146,8 +152,8 @@
                     </select>
                 </div>
                 <div class="form-group">
-                    <label i18n for="game-create-rule">决斗规则</label>
-                    <select class="form-control form-control-sm" id="game-create-duelrule" name="rule" [(ngModel)]="room.options.duel_rule">
+                    <label i18n for="game-create-duelrule">决斗规则</label>
+                    <select class="form-control form-control-sm" id="game-create-duelrule" name="duel_rule" [(ngModel)]="room.options.duel_rule">
                         <option i18n value="1">大师规则1</option>
                         <option i18n value="2">大师规则2</option>
                         <option i18n value="3">大师规则3</option>
@@ -308,7 +314,12 @@
                                 </td>
                                 <td class="extra">
                                     <div *ngIf="!(room.arena || room.id.startsWith('AI#'))">
-                                        <span *ngIf="room.options.rule != default_options.rule">{{{'0': 'OCG', '1': 'TCG', '2': 'O/T', '3': '专有卡禁止'}[room.options.rule]}}</span>
+                                        <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 0" title="允许OCG独有卡，不允许TCG独有卡">OCG</span>
+                                        <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 1" title="允许TCG独有卡，不允许OCG独有卡">TCG</span>
+                                        <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 2" title="只允许简体中文版已经发售的卡">简中</span>
+                                        <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 3" title="只允许自制卡">自制卡</span>
+                                        <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 4" title="不允许OCG或TCG独有卡">专有卡禁止</span>
+                                        <span i18n i18n-title *ngIf="room.options.rule != default_options.rule && room.options.rule == 5" title="可以任意使用OCG或TCG卡">所有卡片</span>
                                         <span i18n *ngIf="room.options.start_lp != default_options.start_lp && room.options.mode != 2">{{room.options.start_lp}}LP</span>
                                         <span i18n *ngIf="room.options.start_lp != default_options.start_lp_tag && room.options.mode == 2">{{room.options.start_lp}}LP</span>
                                         <span i18n i18n-title *ngIf="room.options.start_hand != default_options.start_hand" title="初始起手数量">{{room.options.start_hand}}初始</span>