diff --git a/data/age.json b/data/age.json index 8de2001..0d7ee02 100644 --- a/data/age.json +++ b/data/age.json @@ -552,7 +552,7 @@ "10537", "10538", "10539", - "10576*0.01", + "10576*0.1", "10577", "10872", "10873", @@ -733,7 +733,7 @@ "10537", "10538", "10539", - "10576*0.01", + "10576*0.1", "10577", "10592", "10786", @@ -923,7 +923,7 @@ "10537", "10538", "10539", - "10576*0.01", + "10576*0.5", "10577*2", "10844*0.1", "10872", @@ -1104,14 +1104,14 @@ "10531", "10532", "10533", - "10534", + "10534*5", "10535", "10536", "10537", "10538", "10539", "10540*2", - "10576*0.01", + "10576*0.1", "10577*2", "10588*9999999999999999", "10592", @@ -1301,7 +1301,7 @@ "10538", "10539", "10540", - "10576*0.01", + "10576*0.1", "10577", "10592", "10786", @@ -1969,7 +1969,7 @@ "10258", 10309, 10410, - 10411, + "10411*0.3", 10412, "10468*3", "20054*2", @@ -2199,7 +2199,7 @@ 10227, "10258", 10410, - 10411, + "10411*0.3", 10412, "10259*999999", "10468*3", @@ -2438,7 +2438,7 @@ "10259*999999", 10309, 10410, - 10411, + "10411*0.3", 10412, "10468*3", "10469*2", @@ -2953,7 +2953,7 @@ 10270, 10271, 10410, - 10411, + "10411*0.3", 10412, 10463, "10469*2", @@ -3282,7 +3282,7 @@ 10275, 10276, 10410, - 10411, + "10411*0.3", 10430, 10431, 10432, @@ -3399,7 +3399,7 @@ 10275, 10276, 10410, - 10411, + "10411*0.3", 10430, 10431, 10432, @@ -3552,7 +3552,7 @@ 10285, 10288, 10410, - 10411, + "10411*0.3", 10430, 10431, 10432, @@ -3728,7 +3728,7 @@ 10284, 10285, 10410, - 10411, + "10411*0.3", 10413, 10414, 10415, @@ -3932,7 +3932,7 @@ 10284, 10285, 10410, - 10411, + "10411*0.3", 10413, 10414, 10415, @@ -4181,7 +4181,7 @@ 10281, "10282*0.001", 10410, - 10411, + "10411*0.3", 10413, 10414, 10415, @@ -4431,7 +4431,7 @@ 10285, 10288, 10410, - 10411, + "10411*0.3", 10413, 10414, 10415, @@ -4677,7 +4677,8 @@ "11467*33333333333333333", "11458*99999999999999999", "11459*99999999999999999", - "30001*0.1" + "30001*0.1", + "20567*0.1" ] }, "29": { @@ -4705,7 +4706,7 @@ 10284, 10285, 10410, - 10411, + "10411*0.3", 10413, 10414, 10415, @@ -4953,7 +4954,8 @@ "11467*33333333333333333", "11458*99999999999999999", "11459*99999999999999999", - "30001*0.1" + "30001*0.1", + "20567*0.1" ] }, "30": { @@ -4990,7 +4992,7 @@ 10305, 10306, 10410, - 10411, + "10411*0.3", 10413, 10414, 10415, @@ -5495,7 +5497,8 @@ "11458*99999999999999999", "11459*99999999999999999", "30001*0.1", - "11468*0.1" + "11468*0.1", + "20567*0.1" ] }, "32": { @@ -5751,7 +5754,8 @@ "11467*333333333333333333", "11458*99999999999999999", "11459*99999999999999999", - "30001*0.1" + "30001*0.1", + "20567*0.1" ] }, "33": { @@ -7445,7 +7449,8 @@ "11466*9333333333333333333", "11467*9333333333333333333", "11458*99999999999999999", - "11459*99999999999999999" + "11459*99999999999999999", + "11467*333333333333333333" ] }, "39": { @@ -7723,8 +7728,8 @@ "11448*0.01", "11449*0.01", "11450*0.01", - "11466*9333333333333333333", - "11467*9333333333333333333" + "11466*3333333333333333", + "11467*3333333333333333" ] }, "40": { @@ -7989,8 +7994,8 @@ "11397", "11398", "11399", - "11466*9333333333333333333", - "11467*9333333333333333333" + "11466*33333333333333333", + "11467*3333333333333333" ] }, "41": { @@ -8259,7 +8264,8 @@ "11447*0.01", "11448*0.01", "11449*0.01", - "11450*0.01" + "11450*0.01", + "11467*9999333333333333" ] }, "42": { @@ -8514,7 +8520,8 @@ "11447*0.05", "11448*0.05", "11449*0.05", - "11450*0.05" + "11450*0.05", + "20567*0.1" ] }, "43": { @@ -9470,7 +9477,8 @@ "11448*0.01", "11449*0.01", "11450*0.01", - "11468*0.1" + "11468*0.1", + "20567*0.1" ] }, "47": { @@ -9685,7 +9693,8 @@ "11447*0.01", "11448*0.01", "11449*0.01", - "11450*0.01" + "11450*0.01", + "20567*0.1" ] }, "48": { @@ -10321,7 +10330,8 @@ "11447*0.05", "11448*0.05", "11449*0.05", - "11450*0.05" + "11450*0.05", + "20567*0.1" ] }, "51": { @@ -10522,7 +10532,8 @@ "11447*0.05", "11448*0.05", "11449*0.05", - "11450*0.05" + "11450*0.05", + "20567*0.1" ] }, "52": { @@ -10923,7 +10934,8 @@ "11447*0.05", "11448*0.05", "11449*0.05", - "11450*0.05" + "11450*0.05", + "20567*0.1" ] }, "54": { @@ -11480,7 +11492,8 @@ "11346*0.1", "11347*0.01", "11348*0.01", - "11349" + "11349", + "20323*0.1" ] }, "57": { @@ -12169,7 +12182,8 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "20323*0.1" ] }, "61": { @@ -12369,7 +12383,8 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "20567*0.1" ] }, "62": { @@ -12977,7 +12992,8 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "20323*0.1" ] }, "65": { @@ -13570,7 +13586,8 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "20567*0.1" ] }, "68": { @@ -13764,7 +13781,9 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "20323*0.1", + "20567*0.1" ] }, "69": { @@ -14527,7 +14546,8 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "20323*0.1" ] }, "73": { @@ -14859,7 +14879,9 @@ "11346*0.1", "11347*0.01", "11348*0.01", - "11349" + "11349", + "20323*0.1", + "20567*0.1" ] }, "75": { @@ -15214,7 +15236,8 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "20323*0.1" ] }, "77": { @@ -15885,7 +15908,8 @@ "11347*0.01", "11348*0.01", "11349", - "11469" + "11469", + "20323*0.1" ] }, "81": { @@ -27546,7 +27570,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01" @@ -27564,7 +27588,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27609,7 +27633,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27654,7 +27678,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27699,7 +27723,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27744,7 +27768,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27789,7 +27813,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27834,7 +27858,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27879,7 +27903,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27924,7 +27948,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -27969,7 +27993,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28014,7 +28038,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28059,7 +28083,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28104,7 +28128,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28149,7 +28173,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28194,7 +28218,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28239,7 +28263,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28284,7 +28308,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28329,7 +28353,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28374,7 +28398,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28419,7 +28443,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28464,7 +28488,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28509,7 +28533,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28554,7 +28578,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28599,7 +28623,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28644,7 +28668,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28689,7 +28713,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28734,7 +28758,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28779,7 +28803,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28824,7 +28848,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28869,7 +28893,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28914,7 +28938,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -28959,7 +28983,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29004,7 +29028,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29049,7 +29073,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29094,7 +29118,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29139,7 +29163,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29184,7 +29208,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29229,7 +29253,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29274,7 +29298,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29319,7 +29343,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29364,7 +29388,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29409,7 +29433,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29454,7 +29478,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29499,7 +29523,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29544,7 +29568,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29589,7 +29613,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29634,7 +29658,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29679,7 +29703,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29724,7 +29748,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29769,7 +29793,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29799,7 +29823,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "351": { @@ -29814,7 +29839,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29844,7 +29869,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "352": { @@ -29859,7 +29885,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29889,7 +29915,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "353": { @@ -29904,7 +29931,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29934,7 +29961,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "354": { @@ -29949,7 +29977,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -29979,7 +30007,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "355": { @@ -29994,7 +30023,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30024,7 +30053,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "356": { @@ -30039,7 +30069,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30069,7 +30099,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "357": { @@ -30084,7 +30115,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30114,7 +30145,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "358": { @@ -30129,7 +30161,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30159,7 +30191,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "359": { @@ -30174,7 +30207,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30204,7 +30237,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "360": { @@ -30219,7 +30253,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30249,7 +30283,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "361": { @@ -30264,7 +30299,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30294,7 +30329,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "362": { @@ -30309,7 +30345,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30339,7 +30375,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "363": { @@ -30354,7 +30391,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30384,7 +30421,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "364": { @@ -30399,7 +30437,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30429,7 +30467,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "365": { @@ -30444,7 +30483,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30474,7 +30513,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "366": { @@ -30489,7 +30529,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30519,7 +30559,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "367": { @@ -30534,7 +30575,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30564,7 +30605,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "368": { @@ -30579,7 +30621,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30609,7 +30651,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "369": { @@ -30624,7 +30667,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30654,7 +30697,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "370": { @@ -30669,7 +30713,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30699,7 +30743,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "371": { @@ -30714,7 +30759,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30744,7 +30789,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "372": { @@ -30759,7 +30805,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30789,7 +30835,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "373": { @@ -30804,7 +30851,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30834,7 +30881,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "374": { @@ -30849,7 +30897,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30879,7 +30927,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "375": { @@ -30894,7 +30943,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30924,7 +30973,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "376": { @@ -30939,7 +30989,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -30969,7 +31019,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "377": { @@ -30984,7 +31035,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31014,7 +31065,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "378": { @@ -31029,7 +31081,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31059,7 +31111,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "379": { @@ -31074,7 +31127,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31104,7 +31157,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "380": { @@ -31119,7 +31173,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31149,7 +31203,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "381": { @@ -31164,7 +31219,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31194,7 +31249,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "382": { @@ -31209,7 +31265,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31239,7 +31295,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "383": { @@ -31254,7 +31311,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31284,7 +31341,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "384": { @@ -31299,7 +31357,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31329,7 +31387,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "385": { @@ -31344,7 +31403,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31374,7 +31433,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "386": { @@ -31389,7 +31449,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31419,7 +31479,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "387": { @@ -31434,7 +31495,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31464,7 +31525,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "388": { @@ -31479,7 +31541,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31509,7 +31571,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "389": { @@ -31524,7 +31587,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31554,7 +31617,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "390": { @@ -31569,7 +31633,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31599,7 +31663,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "391": { @@ -31614,7 +31679,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31644,7 +31709,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "392": { @@ -31659,7 +31725,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31689,7 +31755,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "393": { @@ -31704,7 +31771,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31734,7 +31801,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "394": { @@ -31749,7 +31817,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31779,7 +31847,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "395": { @@ -31794,7 +31863,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31824,7 +31893,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "396": { @@ -31839,7 +31909,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31869,7 +31939,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "397": { @@ -31884,7 +31955,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31914,7 +31985,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "398": { @@ -31929,7 +32001,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -31959,7 +32031,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "399": { @@ -31974,7 +32047,7 @@ 10356, 10357, 10358, - "10359*0.01", + "10359*0.005", "10363*0.01", "10364*0.1", "10366*0.01", @@ -32004,7 +32077,8 @@ "11345*0.1", "11346*0.1", "11347*0.01", - "11348*0.01" + "11348*0.01", + "20369*0.01" ] }, "400": { @@ -32032,7 +32106,13 @@ "10388*0.001", "10389*0.001", "10390*0.001", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "401": { @@ -32060,7 +32140,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "402": { @@ -32088,7 +32174,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "403": { @@ -32116,7 +32208,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "404": { @@ -32144,7 +32242,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "405": { @@ -32172,7 +32276,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "406": { @@ -32200,7 +32310,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "407": { @@ -32228,7 +32344,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "408": { @@ -32256,7 +32378,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "409": { @@ -32284,7 +32412,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "410": { @@ -32312,7 +32446,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "411": { @@ -32340,7 +32480,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "412": { @@ -32368,7 +32514,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "413": { @@ -32396,7 +32548,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "414": { @@ -32424,7 +32582,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "415": { @@ -32452,7 +32616,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "416": { @@ -32480,7 +32650,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "417": { @@ -32508,7 +32684,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "418": { @@ -32536,7 +32718,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "419": { @@ -32564,7 +32752,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "420": { @@ -32592,7 +32786,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "421": { @@ -32620,7 +32820,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "422": { @@ -32648,7 +32854,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "423": { @@ -32676,7 +32888,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "424": { @@ -32704,7 +32922,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "425": { @@ -32732,7 +32956,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "426": { @@ -32760,7 +32990,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "427": { @@ -32788,7 +33024,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "428": { @@ -32816,7 +33058,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "429": { @@ -32844,7 +33092,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "430": { @@ -32872,7 +33126,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "431": { @@ -32900,7 +33160,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "432": { @@ -32928,7 +33194,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "433": { @@ -32956,7 +33228,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "434": { @@ -32984,7 +33262,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "435": { @@ -33012,7 +33296,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "436": { @@ -33040,7 +33330,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "437": { @@ -33068,7 +33364,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "438": { @@ -33096,7 +33398,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "439": { @@ -33124,7 +33432,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "440": { @@ -33152,7 +33466,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "441": { @@ -33180,7 +33500,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "442": { @@ -33208,7 +33534,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "443": { @@ -33236,7 +33568,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "444": { @@ -33264,7 +33602,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "445": { @@ -33292,7 +33636,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "446": { @@ -33320,7 +33670,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "447": { @@ -33348,7 +33704,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "448": { @@ -33376,7 +33738,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "449": { @@ -33404,7 +33772,13 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20369*0.01", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "450": { @@ -33432,7 +33806,12 @@ "10389*0.001", "10390*0.001", "10819*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "451": { @@ -33460,7 +33839,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "452": { @@ -33488,7 +33872,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "453": { @@ -33516,7 +33905,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "454": { @@ -33544,7 +33938,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "455": { @@ -33572,7 +33971,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "456": { @@ -33600,7 +34004,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "457": { @@ -33628,7 +34037,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "458": { @@ -33656,7 +34070,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "459": { @@ -33684,7 +34103,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "460": { @@ -33712,7 +34136,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "461": { @@ -33740,7 +34169,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "462": { @@ -33768,7 +34202,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "463": { @@ -33796,7 +34235,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "464": { @@ -33824,7 +34268,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "465": { @@ -33852,7 +34301,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "466": { @@ -33880,7 +34334,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "467": { @@ -33908,7 +34367,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "468": { @@ -33936,7 +34400,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "469": { @@ -33964,7 +34433,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "470": { @@ -33992,7 +34466,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "471": { @@ -34020,7 +34499,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "472": { @@ -34048,7 +34532,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "473": { @@ -34076,7 +34565,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "474": { @@ -34104,7 +34598,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "475": { @@ -34132,7 +34631,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "476": { @@ -34160,7 +34664,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "477": { @@ -34188,7 +34697,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "478": { @@ -34216,7 +34730,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "479": { @@ -34244,7 +34763,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "480": { @@ -34272,7 +34796,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "481": { @@ -34300,7 +34829,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "482": { @@ -34328,7 +34862,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "483": { @@ -34356,7 +34895,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "484": { @@ -34384,7 +34928,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "485": { @@ -34412,7 +34961,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "486": { @@ -34440,7 +34994,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "487": { @@ -34468,7 +35027,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "488": { @@ -34496,7 +35060,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "489": { @@ -34524,7 +35093,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "490": { @@ -34552,7 +35126,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "491": { @@ -34580,7 +35159,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "492": { @@ -34608,7 +35192,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "493": { @@ -34636,7 +35225,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "494": { @@ -34664,7 +35258,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "495": { @@ -34692,7 +35291,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "496": { @@ -34720,7 +35324,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "497": { @@ -34748,7 +35357,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "498": { @@ -34776,7 +35390,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "499": { @@ -34804,7 +35423,12 @@ "10389*0.001", "10390*0.001", "10820*0.01", - "20367*0.0001" + "20367*0.1", + "20380*0.01", + "20381*0.01", + "20382*0.01", + "20383*0.01", + "20384*0.01" ] }, "500": { diff --git a/data/age.xlsx b/data/age.xlsx index d8a643d..bb0519d 100644 Binary files a/data/age.xlsx and b/data/age.xlsx differ diff --git a/data/events.json b/data/events.json index fc1a601..ff16793 100644 --- a/data/events.json +++ b/data/events.json @@ -1782,7 +1782,7 @@ "SPR": 1 }, "include": "(EVT?[10009])&((EVT?[10002,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10211,10198,10025,10156,10155])|(TLT?[1027])" + "exclude": "(EVT?[10211,10198,10025,10156,10155])|(TLT?[1027])|((EVT?[10002])&(TLT?[1026]))" }, "10212": { "id": 10212, @@ -1791,7 +1791,7 @@ "SPR": 1 }, "include": "(EVT?[10009])&((EVT?[10001,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10212,10198,10025,10156,10155])|(TLT?[1027])" + "exclude": "(EVT?[10212,10198,10025,10156,10155])|(TLT?[1027])|((EVT?[10001])&(TLT?[1026]))" }, "10213": { "id": 10213, @@ -2072,7 +2072,7 @@ "SPR": 1 }, "include": "(EVT?[10237,10238,10239])&((EVT?[10001,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10245])|(TLT?[1027])" + "exclude": "(EVT?[10245])|(TLT?[1027])|((EVT?[10001])&(TLT?[1026]))" }, "10246": { "id": 10246, @@ -2081,7 +2081,7 @@ "SPR": 1 }, "include": "(EVT?[10237,10238,10239])&((EVT?[10002,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10246])|(TLT?[1027])" + "exclude": "(EVT?[10246])|(TLT?[1027])|((EVT?[10002])&(TLT?[1026]))" }, "10247": { "id": 10247, @@ -2366,7 +2366,7 @@ "SPR": -1 }, "include": "EVT?[10279,10280]", - "exclude": "EVT?[10281,20076]" + "exclude": "EVT?[10281,20076,11295]" }, "10282": { "id": 10282, @@ -3327,8 +3327,8 @@ "id": 10388, "event": "你悟出了混沌大道。", "effect": { - "INT": 50, - "STR": 50 + "INT": 100, + "STR": 100 }, "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])", "exclude": "EVT?[10388]" @@ -3337,8 +3337,8 @@ "id": 10389, "event": "你悟出了生命大道。", "effect": { - "INT": 50, - "STR": 50 + "INT": 75, + "STR": 75 }, "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])", "exclude": "EVT?[10389]" @@ -3347,8 +3347,8 @@ "id": 10390, "event": "你悟出了毁灭大道。", "effect": { - "INT": 50, - "STR": 50 + "INT": 75, + "STR": 75 }, "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])", "exclude": "EVT?[10390]" @@ -3446,7 +3446,7 @@ "event": "第九重雷劫落下。", "NoRandom": 1, "branch": [ - "STR>2000:10401", + "(STR>2000)|(EVT?[20381]):10401", "(STR<2001)&(TLT?[1134]):20409", "STR<2001:10000" ] @@ -4634,7 +4634,7 @@ "SPR": 1 }, "include": "(EVT?[10011])&((EVT?[10001,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10561])|(TLT?[1027])" + "exclude": "(EVT?[10561])|(TLT?[1027])|((EVT?[10001])&(TLT?[1026]))" }, "10562": { "id": 10562, @@ -4643,7 +4643,7 @@ "SPR": 1 }, "include": "(EVT?[10011])&((EVT?[10002,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10562])|(TLT?[1027])" + "exclude": "(EVT?[10562])|(TLT?[1027])|((EVT?[10002])&(TLT?[1026]))" }, "10563": { "id": 10563, @@ -4745,7 +4745,7 @@ "include": "EVT?[10542]", "exclude": "EVT?[10575]", "branch": [ - "TLT?[1108]:20575" + "TLT?[1108]:20573" ] }, "10576": { @@ -4877,7 +4877,7 @@ "event": "你在舞会上结识了一个漂亮的女生。", "postEvent": "你们谈了一阵子恋爱后分手了。", "include": "(EVT?[10579,10580,10581,10582,10583,10584,10586,10587])&((EVT?[10001,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10595,10596])|(TLT?[1027])", + "exclude": "(EVT?[10595,10596])|(TLT?[1027])|((EVT?[10001])&(TLT?[1026]))", "branch": [ "CHR>7:20596" ] @@ -4887,7 +4887,7 @@ "event": "你在舞会上结识了一个帅气的男生。", "postEvent": "你们谈了一阵子恋爱后分手了。", "include": "(EVT?[10579,10580,10581,10582,10583,10584,10586,10587])&((EVT?[10002,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10596,10595])|(TLT?[1027])", + "exclude": "(EVT?[10596,10595])|(TLT?[1027])|((EVT?[10002])&(TLT?[1026]))", "branch": [ "CHR>7:20596" ] @@ -7439,7 +7439,7 @@ "SPR": 1 }, "include": "(EVT?[10945])&((EVT?[10001,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10974])|(TLT?[1027])" + "exclude": "(EVT?[10974])|(TLT?[1027])|((EVT?[10001])&(TLT?[1026]))" }, "10975": { "id": 10975, @@ -7448,7 +7448,7 @@ "SPR": 1 }, "include": "(EVT?[10945])&((EVT?[10002,10110,10111])|(TLT?[1026]))", - "exclude": "(EVT?[10975])|(TLT?[1027])" + "exclude": "(EVT?[10975])|(TLT?[1027])|((EVT?[10002])&(TLT?[1026]))" }, "10976": { "id": 10976, @@ -8330,7 +8330,7 @@ "effect": { "CHR": 1 }, - "include": "(EVT?[11077,11075,11076,11071,11072,11073,11074,11069.11070])&(TLT?[1028])", + "include": "(EVT?[11077,11075,11076,11071,11072,11073,11074,11069,11070])&(TLT?[1028])", "exclude": "(EVT?[11111,11112,11113])|(TLT?[1027])" }, "11112": { @@ -9545,7 +9545,7 @@ "id": 11295, "event": "你的爱人去世了。", "include": "EVT?[11171]", - "exclude": "EVT?[11295,11294]" + "exclude": "EVT?[11295,11294,10281]" }, "11296": { "id": 11296, @@ -9969,25 +9969,25 @@ "id": 11350, "event": "婚后你的丈夫没有之前对你那么好了。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11350,11357,11358,11359,11360,11361,11362,11363,11295]" + "exclude": "EVT?[10001,11294,11350,11357,11358,11359,11360,11361,11362,11363,11295]|((EVT?[10002])&(TLT?[1026]))" }, "11351": { "id": 11351, "event": "家务几乎全是你在干。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11351,11357,11358,11359,11360,11361,11362,11363,11295]" + "exclude": "EVT?[10001,11294,11351,11357,11358,11359,11360,11361,11362,11363,11295]|((EVT?[10002])&(TLT?[1026]))" }, "11352": { "id": 11352, "event": "丈夫和你见面的时间越来越少。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11352,11357,11358,11359,11360,11361,11362,11363,11295]" + "exclude": "EVT?[10001,11294,11352,11357,11358,11359,11360,11361,11362,11363,11295]|((EVT?[10002])&(TLT?[1026]))" }, "11353": { "id": 11353, "event": "结婚周年纪念日，丈夫给了你一个红包，没有准备礼物。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11353,11357,11358,11359,11360,11361,11362,11363,11295]" + "exclude": "EVT?[10001,11294,11353,11357,11358,11359,11360,11361,11362,11363,11295]|((EVT?[10002])&(TLT?[1026]))" }, "11354": { "id": 11354, @@ -9996,7 +9996,7 @@ "SPR": -1 }, "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11354,11357,11358,11359,11360,11361,11295,11362,11363]" + "exclude": "EVT?[10001,11294,11354,11357,11358,11359,11360,11361,11295,11362,11363]|((EVT?[10002])&(TLT?[1026]))" }, "11355": { "id": 11355, @@ -10005,19 +10005,19 @@ "SPR": -1 }, "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11355,11357,11358,11359,11360,11361,11295,11362,11363]" + "exclude": "EVT?[10001,11294,11355,11357,11358,11359,11360,11361,11295,11362,11363]|((EVT?[10002])&(TLT?[1026]))" }, "11356": { "id": 11356, "event": "你经常在一个群里和大家一起吐槽婚后生活。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11356,11357,11358,11359,11360,11295,11361,11362,11363]" + "exclude": "EVT?[10001,11294,11356,11357,11358,11359,11360,11295,11361,11362,11363]|((EVT?[10002])&(TLT?[1026]))" }, "11357": { "id": 11357, "event": "你的丈夫对你始终如一。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11357,11350,11351,11352,11353,11295,11354,11355,11356]" + "exclude": "EVT?[10001,11294,11357,11350,11351,11352,11353,11295,11354,11355,11356]|((EVT?[10002])&(TLT?[1026]))" }, "11358": { "id": 11358, @@ -10029,7 +10029,7 @@ "id": 11359, "event": "丈夫的父母通情达理，和你关系如同朋友。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11359,11350,11351,11352,11353,11295,11354,11355,11356]" + "exclude": "EVT?[10001,11294,11359,11350,11351,11352,11353,11295,11354,11355,11356]|((EVT?[10002])&(TLT?[1026]))" }, "11360": { "id": 11360, @@ -10044,13 +10044,13 @@ "SPR": 1 }, "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11361,11350,11351,11352,11353,11295,11354,11355,11356]" + "exclude": "EVT?[10001,11294,11361,11350,11351,11352,11353,11295,11354,11355,11356]|((EVT?[10002])&(TLT?[1026]))" }, "11362": { "id": 11362, "event": "丈夫特别尊重你的意见，大多数家事都请你做决定。", "include": "EVT?[11171]", - "exclude": "EVT?[10001,11294,11362,11350,11351,11352,11353,11295,11354,11355,11356]" + "exclude": "EVT?[10001,11294,11362,11350,11351,11352,11353,11295,11354,11355,11356]|((EVT?[10002])&(TLT?[1026]))" }, "11363": { "id": 11363, @@ -10071,13 +10071,13 @@ "id": 11365, "event": "你的妻子把行动不便的父母接到你们家里住。", "include": "EVT?[11171]", - "exclude": "EVT?[10002,11294,11295,11365]" + "exclude": "EVT?[10002,11294,11295,11365]|((EVT?[10001])&(TLT?[1026]))" }, "11366": { "id": 11366, "event": "你每月都上缴工资给妻子。", "include": "EVT?[11171]", - "exclude": "EVT?[10002,11294,11295,11366,11367]" + "exclude": "EVT?[10002,11294,11295,11366,11367]|((EVT?[10001])&(TLT?[1026]))" }, "11367": { "id": 11367, @@ -10095,19 +10095,19 @@ "id": 11369, "event": "你无微不至地照顾照顾妻子。", "include": "EVT?[11171]", - "exclude": "EVT?[10002,11294,11295,11369]" + "exclude": "EVT?[10002,11294,11295,11369]|((EVT?[10001])&(TLT?[1026]))" }, "11370": { "id": 11370, "event": "你和妻子之间更像是朋友。", "include": "EVT?[11171]", - "exclude": "EVT?[10002,11294,11370,11295]" + "exclude": "EVT?[10002,11294,11370,11295]|((EVT?[10001])&(TLT?[1026]))" }, "11371": { "id": 11371, "event": "妻子的一个亲戚沉迷赌博，骗了她娘家不少钱。", "include": "EVT?[11171]", - "exclude": "EVT?[10002,11294,11371,11295]" + "exclude": "EVT?[10002,11294,11371,11295]|((EVT?[10001])&(TLT?[1026]))" }, "11372": { "id": 11372, @@ -10116,13 +10116,13 @@ "MNY": 1 }, "include": "EVT?[11365]", - "exclude": "EVT?[10002,11294,11372,11295]" + "exclude": "EVT?[10002,11294,11372,11295]|((EVT?[10001])&(TLT?[1026]))" }, "11373": { "id": 11373, "event": "婚前的彩礼全部用于运营你们的小家。", "include": "EVT?[11171]", - "exclude": "EVT?[10002,11294,11373,11295]" + "exclude": "EVT?[10002,11294,11373,11295]|((EVT?[10001])&(TLT?[1026]))" }, "11374": { "id": 11374, @@ -10134,13 +10134,13 @@ "id": 11375, "event": "妻子经常和你一起看动画。", "include": "(EVT?[11171])&(EVT?[10007,10008])", - "exclude": "EVT?[10002,11294,11375,11295]" + "exclude": "EVT?[10002,11294,11375,11295]|((EVT?[10001])&(TLT?[1026]))" }, "11376": { "id": 11376, "event": "你经常和妻子一起看综艺和电视剧。", "include": "EVT?[11171]", - "exclude": "EVT?[10002,11294,11376,11295]" + "exclude": "EVT?[10002,11294,11376,11295]|((EVT?[10001])&(TLT?[1026]))" }, "11377": { "id": 11377, @@ -10902,6 +10902,16 @@ "event": "为了能和年轻人有共同语言，你开始了解潮流。", "NoRandom": 1 }, + "20323": { + "id": 20323, + "event": "祖传的小盒子中散出了奇怪的气体。", + "postEvent": "你感觉自己体质提升了。", + "effect": { + "STR": 10 + }, + "include": "TLT?[1048]", + "exclude": "EVT?[20323]" + }, "20332": { "id": 20332, "event": "你遭到了一个恶堕的魔法少女，并展开战斗。", @@ -11069,7 +11079,66 @@ "STR": 1000, "SPR": 10 }, - "include": "(EVT?[10365])&(INT>520)&(TLT?[1048])" + "include": "(EVT?[10365])&(TLT?[1048])&(TLT?[1033,1122])" + }, + "20369": { + "id": 20369, + "event": "你截杀一个金丹修士，不料被其越级反杀。", + "include": "(EVT?[10365])&(STR<1100)&(TLT?[1048])", + "branch": [ + "TLT?[1048]:10000" + ] + }, + "20380": { + "id": 20380, + "event": "你悟出了剑道。", + "postEvent": "体质提升。", + "effect": { + "STR": 50 + }, + "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])", + "exclude": "EVT?[20380]" + }, + "20381": { + "id": 20381, + "event": "你悟出了雷电大道。", + "postEvent": "可以抵消第九重雷劫。", + "effect": { + "INT": 20, + "STR": 20 + }, + "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])", + "exclude": "EVT?[20381]" + }, + "20382": { + "id": 20382, + "event": "你悟出了人道。", + "postEvent": "你悟透了伟大的马克思主义。", + "effect": { + "INT": 20, + "STR": 20, + "SPR": 2 + }, + "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])", + "exclude": "EVT?[20382]" + }, + "20383": { + "id": 20383, + "event": "你悟出了风之大道。", + "postEvent": "你可以使用风元素力飞行了。但你本来就可以飞。", + "effect": { + "INT": 20, + "STR": 20 + }, + "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])", + "exclude": "EVT?[20383]" + }, + "20384": { + "id": 20384, + "event": "你悟出了空手道。", + "postEvent": "好像没什么用。", + "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])", + "exclude": "EVT?[20384]" }, "20409": { "id": 20409, @@ -11281,6 +11350,15 @@ }, "NoRandom": 1 }, + "20567": { + "id": 20567, + "event": "你遭到了枪击。", + "include": "EVT?[10011]", + "exclude": "EVT?[10578,10682]", + "branch": [ + "EVT?[10011]:10000" + ] + }, "20568": { "id": 20568, "event": "你考得很差。", @@ -11299,6 +11377,11 @@ "event": "你父母忍痛给你买了一个。", "NoRandom": 1 }, + "20573": { + "id": 20573, + "event": "好奇心使你试探着寻找凶手，但一无所获。", + "NoRandom": 1 + }, "20574": { "id": 20574, "event": "你感觉非常难。", @@ -11306,7 +11389,7 @@ }, "20575": { "id": 20575, - "event": "好奇心使你试探着寻找凶手，但一无所获。", + "event": "虽然比平时做的难，但还是都做出来了。", "NoRandom": 1 }, "20576": { diff --git a/data/events.xlsx b/data/events.xlsx index 073cd9a..91891ff 100644 Binary files a/data/events.xlsx and b/data/events.xlsx differ diff --git a/data/talents.json b/data/talents.json index 92cff88..338a02c 100644 --- a/data/talents.json +++ b/data/talents.json @@ -1156,18 +1156,18 @@ "id": 1132, "name": "返老还童", "description": "可能会回到年轻的时候", - "grade": 2 + "grade": 1 }, "1133": { "id": 1133, "name": "时光倒流", "description": "或许时间会倒流", - "grade": 1 + "grade": 0 }, "1134": { "id": 1134, "name": "转世重修", "description": "渡劫失败重生", - "grade": 3 + "grade": 2 } } \ No newline at end of file diff --git a/data/talents.xlsx b/data/talents.xlsx index 1f89115..1174173 100644 Binary files a/data/talents.xlsx and b/data/talents.xlsx differ