Version: 2.57.0 DataVer: 693

2022-12-30 11:41:29 +00:00
parent 19fb259d01
commit 84427dd00e
712 changed files with 1065690 additions and 128007 deletions
--- a/master/mstRestriction.json
+++ b/master/mstRestriction.json
@@ -278,6 +278,62 @@
    "targetVals": [5],
    "rangeType": 4,
    "targetVals2": []
+}, {
+    "id": 3001101,
+    "name": "编制存在限制",
+    "type": 10,
+    "targetVals": [2, 4],
+    "rangeType": 5,
+    "targetVals2": []
+}, {
+    "id": 3001102,
+    "name": "编制存在限制",
+    "type": 10,
+    "targetVals": [3],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 3001103,
+    "name": "编制存在限制",
+    "type": 10,
+    "targetVals": [2],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 3001104,
+    "name": "编制存在限制",
+    "type": 10,
+    "targetVals": [4],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 3001105,
+    "name": "2骑NPC固定出击",
+    "type": 10,
+    "targetVals": [6],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 3001106,
+    "name": "4骑NPC固定出击",
+    "type": 10,
+    "targetVals": [6],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 3001107,
+    "name": "编制存在限制",
+    "type": 11,
+    "targetVals": [2],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 3001108,
+    "name": "编制存在限制",
+    "type": 10,
+    "targetVals": [2, 3],
+    "rangeType": 5,
+    "targetVals2": []
 }, {
    "id": 91000001,
    "name": "2骑NPC固定出击",
@@ -761,6 +817,426 @@
    "targetVals": [2500200],
    "rangeType": 0,
    "targetVals2": []
+}, {
+    "id": 91000071,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [503500],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000072,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [503600],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000073,
+    "name": "编制存在限制",
+    "type": 14,
+    "targetVals": [1100600],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000074,
+    "name": "仅限1骑出击",
+    "type": 10,
+    "targetVals": [1],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000075,
+    "name": "编制存在限制",
+    "type": 14,
+    "targetVals": [503900],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000076,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [303300],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000077,
+    "name": "编制存在限制",
+    "type": 14,
+    "targetVals": [203100],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000078,
+    "name": "编制存在限制",
+    "type": 14,
+    "targetVals": [103300],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000079,
+    "name": "仅特定成员出击",
+    "type": 9,
+    "targetVals": [304700],
+    "rangeType": 0,
+    "targetVals2": []
+}, {
+    "id": 91000080,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [900500],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000081,
+    "name": "编制存在限制",
+    "type": 14,
+    "targetVals": [900500],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000082,
+    "name": "编制存在限制",
+    "type": 14,
+    "targetVals": [303600],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000083,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [103600],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000084,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [900600],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000085,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [1100600],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000086,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [203100],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000087,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [103300],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000088,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [900500],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000089,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [303600],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000090,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [403100],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000091,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [503900],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000092,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [503000],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000093,
+    "name": "2骑NPC固定出击",
+    "type": 10,
+    "targetVals": [3],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000094,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [503000],
+    "rangeType": 1,
+    "targetVals2": [3]
+}, {
+    "id": 91000095,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [103200],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000096,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [102900],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000097,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [201100],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000098,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [202100],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000099,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [601800],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000100,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [403200],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000101,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [603700],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000102,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [900800],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000103,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [203500],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000104,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [104200],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000105,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [304200],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000106,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [403900],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000107,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [102700],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000108,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [104600],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000109,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [1000700],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000110,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [303900],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000111,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [203300],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000112,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [103900],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000113,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [304600],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000114,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [204000],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000115,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [703900],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000116,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [2500200],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000117,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [304700],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000118,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [202000],
+    "rangeType": 1,
+    "targetVals2": [3]
+}, {
+    "id": 91000119,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [303000],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000120,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [103700],
+    "rangeType": 1,
+    "targetVals2": [1]
+}, {
+    "id": 91000121,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [2500400],
+    "rangeType": 1,
+    "targetVals2": [2]
+}, {
+    "id": 91000122,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [204000],
+    "rangeType": 1,
+    "targetVals2": [2]
+}, {
+    "id": 91000123,
+    "name": "2骑NPC固定出击",
+    "type": 10,
+    "targetVals": [3],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000124,
+    "name": "1骑NPC固定出击",
+    "type": 10,
+    "targetVals": [2],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000125,
+    "name": "3骑NPC固定出击",
+    "type": 10,
+    "targetVals": [4],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 91000126,
+    "name": "1骑NPC出击",
+    "type": 10,
+    "targetVals": [2],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000127,
+    "name": "1骑NPC出击",
+    "type": 10,
+    "targetVals": [2],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000128,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [603800],
+    "rangeType": 1,
+    "targetVals2": [3]
+}, {
+    "id": 91000129,
+    "name": "可2骑出击",
+    "type": 11,
+    "targetVals": [2],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 91000130,
+    "name": "编制存在限制",
+    "type": 12,
+    "targetVals": [702500],
+    "rangeType": 1,
+    "targetVals2": [1]
 }, {
    "id": 94007701,
    "name": "女性限定",
@@ -1269,7 +1745,7 @@
    "id": 94052687,
    "name": "仅限额外职阶可出击",
    "type": 1,
-    "targetVals": [107, 108, 110, 117, 115, 109],
+    "targetVals": [107, 108, 110, 117, 115, 109, 120],
    "rangeType": 1,
    "targetVals2": []
 }, {
@@ -1601,4 +2077,109 @@
    "targetVals": [1, 2, 3],
    "rangeType": 1,
    "targetVals2": []
+}, {
+    "id": 94067001,
+    "name": "可最多选择4骑",
+    "type": 11,
+    "targetVals": [4],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94067002,
+    "name": "2骑NPC固定出击",
+    "type": 10,
+    "targetVals": [4],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94067003,
+    "name": "可最多选择2骑",
+    "type": 11,
+    "targetVals": [2],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94067004,
+    "name": "3骑NPC固定出击",
+    "type": 10,
+    "targetVals": [5],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94067005,
+    "name": "4骑NPC固定出击",
+    "type": 10,
+    "targetVals": [6],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94067006,
+    "name": "2骑NPC固定出击",
+    "type": 10,
+    "targetVals": [6],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94067600,
+    "name": "不可选择已出击从者",
+    "type": 13,
+    "targetVals": [80363, 1],
+    "rangeType": 0,
+    "targetVals2": []
+}, {
+    "id": 94067601,
+    "name": "不可选择已出击从者",
+    "type": 13,
+    "targetVals": [80363, 2],
+    "rangeType": 0,
+    "targetVals2": []
+}, {
+    "id": 94067602,
+    "name": "有编成条件",
+    "type": 7,
+    "targetVals": [1, 2, 3],
+    "rangeType": 1,
+    "targetVals2": []
+}, {
+    "id": 94069401,
+    "name": "不可选择同一从者",
+    "type": 6,
+    "targetVals": [],
+    "rangeType": 0,
+    "targetVals2": []
+}, {
+    "id": 94069601,
+    "name": "3骑NPC固定出击",
+    "type": 10,
+    "targetVals": [6],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94069602,
+    "name": "可最多选择3骑",
+    "type": 11,
+    "targetVals": [3],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94071701,
+    "name": "编制存在限制",
+    "type": 11,
+    "targetVals": [4],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94071702,
+    "name": "2骑NPC固定出击",
+    "type": 10,
+    "targetVals": [6],
+    "rangeType": 4,
+    "targetVals2": []
+}, {
+    "id": 94071901,
+    "name": "可仅3骑出击",
+    "type": 10,
+    "targetVals": [3],
+    "rangeType": 1,
+    "targetVals2": []
 }]