Emulation/VisualNes
1
0
Fork 0
mirror of https://github.com/SourMesen/VisualNes.git synced 2024-05-31 18:38:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse source
This commit is contained in:
Sour 2022-05-12 19:21:15 -04:00
parent b0eb0d2584
commit 7bcbc412ab
2 changed files with 38 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Core/chipsim.cpp
View file

@ -36,7 +36,7 @@ vector<uint16_t> group;
bool hasGnd = false;
bool hasPwr = false;
ofstream logFile("test.txt");
//ofstream logFile("test.txt");
void recalcNodeList(shared_ptr<vector<uint16_t>> list) {
if(processedNodes.empty()) {
@ -50,7 +50,7 @@ void recalcNodeList(shared_ptr<vector<uint16_t>> list) {
for(int j = 0; j<1000; j++) { // loop limiter
if(j >= 99) {
logFile << "recalcNodeList iteration: " << j << " " << list->size() << " nodes: ";
/*logFile << "recalcNodeList iteration: " << j << " " << list->size() << " nodes: ";
for(int nodeNumber : *list) {
logFile << nodeNumber;
auto result = nodenamesById.find(nodeNumber);
@ -60,8 +60,8 @@ void recalcNodeList(shared_ptr<vector<uint16_t>> list) {
logFile << ", ";
}
logFile << std::endl;
//throw std::runtime_error("Maximum loop exceeded");
logFile << std::endl;*/
throw std::runtime_error("Maximum loop exceeded");
}
for(int nodeNumber : *list) {

99
Core/transdefs.txt
View file

@ -14,7 +14,6 @@ t6034,106,58,2,3316|3578|6076|6098,284|274|5|2|1395,false
t13863,106,58,2,5672|5677|2950|3004,54|54|5|1|270,false
t16461,106,58,2,5173|5214|881|886,41|41|5|1|205,false
t13013,106,58,2,3997|4076|3681|3699,87|97|5|2|460,false
#pclk1 enable
t2970,661,58,1,3127|3132|6881|7002,121|121|5|1|605,false
t2971,661,58,1,3147|3152|6881|7002,121|121|5|1|605,false
@ -32,7 +31,6 @@ t7081,58,106,2,6270|6371|5644|5649,101|101|5|1|505,false
t13029,58,106,2,4503|4583|3664|3669,80|80|5|1|400,false
t13137,58,106,2,5688|5693|3412|3472,60|60|5|1|300,false
t16453,58,106,2,5224|5264|896|901,40|40|5|1|200,false
#pclk0:
#V counter
t3324,106,4228,4310,2373|2380|6890|6897,7|7|7|1|49,false
@ -54,10 +52,8 @@ t1482,106,3413,3429,2105|2112|7424|7431,7|7|7|1|49,false
t1042,106,3242,3250,2105|2112|7531|7538,7|7|7|1|49,false
t664,106,3067,3087,2105|2112|7637|7644,7|7|7|1|49,false
t461,106,2938,2945,2105|2112|7744|7751,7|7|7|1|49,false
#hpos0 buffer
t5207,106,5151,5224,3417|3430|6310|6317,13|13|7|1|91,false
#Random logic
t6515,106,1000,5772,3103|3110|5936|5945,9|9|7|1|63,false
t6842,106,1002,5863,2822|2831|5751|5758,9|9|7|1|63,false
@ -91,7 +87,6 @@ t4890,106,752,872,1360|1369|6404|6411,9|9|7|1|63,false
t4525,106,573,811,1375|1384|6511|6518,9|9|7|1|63,false
t4524,106,644,810,1345|1354|6511|6518,9|9|7|1|63,false
t4523,106,559,812,1298|1307|6511|6518,9|9|7|1|63,false
#Palette RAM controller
t9085,106,6741,1275,3129|3136|4991|5000,9|9|7|1|63,false
t9494,106,1376,1,2827|2834|4862|4871,9|9|7|1|63,false
@ -118,7 +113,6 @@ t9489,106,1377,1,1365|1372|4862|4871,9|9|7|1|63,false
t9238,106,1287,1,1353|1360|4949|4956,7|7|7|1|49,false
t9325,106,6910,6956,1296|1303|4871|4919,48|48|7|1|336,false
t8980,106,6851,6916,1238|1245|5012|5021,9|9|7|1|63,false
#Palette RAM row drivers
t10585,106,7581,2,3155|3194|4538|4545,41|41|5|3|205,false
t10647,106,7583,2,3157|3186|4520|4525,29|29|5|1|145,false
@ -134,7 +128,6 @@ t12148,106,8335,2,3157|3186|4169|4174,29|29|5|1|145,false
t12212,106,8448,2,3155|3194|4149|4157,42|42|5|3|210,false
t12410,106,8450,2,3155|3194|4111|4118,41|41|5|3|205,false
t12537,106,8487,2,3157|3186|4093|4098,29|29|5|1|145,false
#Pixel Pipeline
t11326,106,10695,8020,3919|3928|4365|4372,9|9|7|1|63,false
t11327,106,10696,8021,4010|4019|4365|4372,9|9|7|1|63,false
@ -152,7 +145,6 @@ t12326,106,1551,1558,4962|4969|4138|4147,9|9|7|1|63,false
t12361,106,1556,1565,4962|4969|4118|4127,9|9|7|1|63,false
t12472,106,1559,1573,4962|4969|4098|4107,9|9|7|1|63,false
t12562,106,1570,1574,4962|4969|4078|4087,9|9|7|1|63,false
#Sprite buffers
t12944,106,1612,8706,4241|4248|3803|3812,9|9|7|1|63,false
t12947,106,8722,8705,3319|3326|3763|3772,9|9|7|1|63,false
@ -172,7 +164,6 @@ t14807,106,2432,2,1554|1593|2221|2226,39|39|5|1|195,false
t14794,106,10762,2,1669|1709|2232|2237,40|40|5|1|200,false
t14806,106,2431,2,1360|1399|2221|2226,39|39|5|1|195,false
t14793,106,10761,2,1244|1284|2232|2237,40|40|5|1|200,false
#Sprite evaluation
t7125,106,5868,1105,3941|3948|5626|5635,9|9|7|1|63,false
t7020,106,5876,2,4058|4063|5662|5680,18|18|5|1|90,false
@ -184,7 +175,6 @@ t7128,106,5921,5896,4835|4842|5626|5635,9|9|7|1|63,false
t7129,106,5923,5897,4931|4938|5626|5635,9|9|7|1|63,false
t7079,106,1107,2,5089|5094|5631|5650,19|19|5|1|95,false
t6993,106,1064,2,5119|5124|5631|5690,59|59|5|1|295,false
#Sprite data bus buffer
t5131,106,894,359,5561|5568|6321|6332,11|11|7|1|77,false
t4924,106,868,566,5556|5563|6387|6398,11|11|7|1|77,false
@ -194,12 +184,10 @@ t4706,106,820,870,5556|5563|6448|6459,11|11|7|1|77,false
t4629,106,816,864,5556|5563|6468|6479,11|11|7|1|77,false
t4592,106,814,856,5556|5563|6488|6499,11|11|7|1|77,false
t4522,106,4891,818,5556|5563|6509|6520,11|11|7|1|77,false
#$2004 I/O
t373,106,121,135,5752|5761|7856|7863,9|9|7|1|63,false
t362,106,2915,2921,5857|5866|7938|7945,9|9|7|1|63,false
t374,106,2918,163,5928|5937|7853|7860,9|9|7|1|63,false
#Sprite RAM controllers
t787,106,261,2,6102|6132|7613|7618,30|30|5|1|150,false
t1727,106,426,3591,6011|6061|7358|7365,50|50|7|1|350,false
@ -242,7 +230,6 @@ t11368,106,7953,7827,5996|6003|4351|4360,9|9|7|1|63,false
t10992,106,7830,818,5993|6000|4427|4435,8|8|7|1|56,false
t11847,106,1502,1,6060|6069|4246|4253,9|9|7|1|63,false
t11804,106,1505,1,5976|5983|4254|4265,11|11|7|1|77,false
#Sprite RAM row drivers
t7090,106,2961,2,6483|6500|5598|5639,59|49|5|7|288,false
t7133,106,5732,2,6470|6475|5609|5629,20|20|5|1|100,false
@ -308,7 +295,6 @@ t7163,106,5762,2,8299|8304|5609|5628,19|19|5|1|95,false
t7120,106,2991,2,8313|8329|5598|5639,58|48|5|7|283,false
t7121,106,2992,2,8365|8382|5598|5639,59|49|5|7|282,false
t7164,106,5763,2,8390|8395|5609|5628,19|19|5|1|95,false
#Sprite RAM precharge
t21000,106,243,1,8424|8431|7680|7689,9|9|7|1|63,false
t21001,106,274,1,8424|8431|7646|7655,9|9|7|1|63,false
@ -442,7 +428,6 @@ t21128,106,1576,1,8424|8431|4055|4064,9|9|7|1|63,false
t21129,106,1577,1,8424|8431|4019|4028,9|9|7|1|63,false
t21130,106,1578,1,8424|8431|4004|4013,9|9|7|1|63,false
t21131,106,1579,1,8424|8431|3968|3977,9|9|7|1|63,false
t13082,106,1003,8865,6098|6107|3488|3495,9|9|7|1|63,false
t13988,106,9403,9463,5801|5810|2918|2927,9|9|9|1|81,false
#CHR I/O
@ -462,7 +447,6 @@ t13803,106,9348,9232,7738|7745|3051|3060,9|9|7|1|63,false
t13804,106,9349,9233,7860|7867|3051|3060,9|9|7|1|63,false
t13805,106,9350,9234,7982|7989|3051|3060,9|9|7|1|63,false
t13806,106,9351,9235,8104|8111|3051|3060,9|9|7|1|63,false
t14477,106,2317,2,5921|5926|2503|2562,59|59|5|1|295,false
t14472,106,2313,2,5896|5901|2518|2577,59|59|5|1|295,false
t14640,106,2373,9782,5961|5970|2328|2335,9|9|7|1|63,false
@ -498,7 +482,6 @@ t14441,106,1565,9726,7997|8006|2600|2607,9|9|7|1|63,false
t14442,106,10757,9700,8025|8034|2600|2607,9|9|7|1|63,false
t14443,106,1558,9727,8119|8128|2600|2607,9|9|7|1|63,false
t14444,106,10758,9701,8147|8156|2600|2607,9|9|7|1|63,false
#Render pipeline
t15588,106,10087,10253,5843|5850|1679|1688,9|9|7|1|63,false
t15589,106,10088,10254,5930|5937|1679|1688,9|9|7|1|63,false
@ -513,7 +496,6 @@ t15374,106,2597,2,6475|6480|1746|1782,36|36|5|1|180,false
t15139,106,2533,2,6393|6398|1944|1983,39|39|5|1|195,false
t15138,106,2543,2,6363|6368|1944|1983,39|39|5|1|195,false
t15948,106,2722,2,6241|6246|1380|1440,60|60|5|1|300,false
#$2007 I/O
t16270,106,203,10553,5234|5243|1094|1101,9|9|7|1|63,false
t16464,106,10574,2811,4869|4878|871|878,9|9|7|1|63,false
@ -524,11 +506,9 @@ t16476,106,10579,10575,4454|4461|827|836,9|9|7|1|63,false
t16463,106,10571,2810,4290|4299|871|878,9|9|7|1|63,false
t16432,106,1275,2778,4388|4395|979|988,9|9|7|1|63,false
t16540,106,2824,10607,4290|4299|721|728,9|9|7|1|63,false
#pclk1:
t4164,58,4471,847,2898|2907|6644|6651,9|9|7|1|63,false
t4094,58,4625,790,2281|2288|6657|6666,9|9|7|1|63,false
#V counter
t3205,58,628,4226,2418|2425|6931|6938,7|7|7|1|49,false
t3320,58,632,4310,2418|2425|6898|6905,7|7|7|1|49,false
@ -548,7 +528,6 @@ t618,58,259,3088,2418|2425|7645|7652,7|7|7|1|49,false
t526,58,248,2995,2418|2425|7678|7685,7|7|7|1|49,false
t449,58,210,2946,2418|2425|7752|7759,7|7|7|1|49,false
t431,58,191,2937,2418|2425|7785|7792,7|7|7|1|49,false
#H counter
t3319,58,631,4309,2060|2067|6898|6905,7|7|7|1|49,false
t3204,58,627,4225,2060|2067|6931|6938,7|7|7|1|49,false
@ -568,7 +547,6 @@ t617,58,260,3087,2060|2067|7645|7652,7|7|7|1|49,false
t525,58,247,2994,2060|2067|7678|7685,7|7|7|1|49,false
t448,58,209,2945,2060|2067|7752|7759,7|7|7|1|49,false
t430,58,190,2936,2060|2067|7785|7792,7|7|7|1|49,false
#Sprite logic
t2318,58,508,455,3838|3847|7194|7201,9|9|7|1|63,false
t2636,58,558,2,3984|3991|7077|7105,30|30|5|3|150,false
@ -596,7 +574,6 @@ t3828,58,4402,4634,4970|4977|6749|6756,7|7|7|1|49,false
t3829,58,10649,4557,5092|5099|6749|6756,7|7|7|1|49,false
t3830,58,4403,4635,5113|5120|6749|6756,7|7|7|1|49,false
t3203,58,611,608,5244|5253|6935|6941,9|9|6|1|54,false
#Random logic
t6314,58,853,5728,3056|3065|6008|6015,9|9|7|1|63,false
t6313,58,852,5727,3015|3024|6008|6015,9|9|7|1|63,false
@ -643,13 +620,11 @@ t2519,58,490,3909,1172|1181|7130|7137,9|9|7|1|63,false
t2360,58,475,526,1187|1196|7181|7188,9|9|7|1|63,false
t2520,58,459,548,1203|1212|7130|7137,9|9|7|1|63,false
t2361,58,421,527,1217|1226|7181|7188,9|9|7|1|63,false
#EXP pins
t181,58,53,61,1877|1886|8388|8395,9|9|7|1|63,false
t180,58,52,60,1149|1158|8388|8395,9|9|7|1|63,false
t1446,58,373,88,606|613|7426|7435,9|9|7|1|63,false
t3990,58,714,80,605|612|6698|6707,9|9|7|1|63,false
#Palette
t9794,58,6568,7230,2698|2707|4769|4776,9|9|7|1|63,false
t9792,58,6564,7229,2393|2402|4769|4776,9|9|7|1|63,false
@ -667,7 +642,6 @@ t8377,58,6458,6567,2121|2130|5211|5218,9|9|7|1|63,false
t8374,58,6457,6566,1817|1826|5212|5219,9|9|7|1|63,false
t8376,58,6423,6565,1578|1587|5211|5218,9|9|7|1|63,false
t9231,58,1215,1282,1469|1478|4954|4961,9|9|7|1|63,false
#Pixel pipeline
t8824,58,283,1261,3988|3997|5058|5067,9|9|9|1|81,false
t9019,58,6738,1117,4295|4304|5015|5020,9|9|5|1|45,false
@ -683,7 +657,6 @@ t9575,58,1338,1336,4238|4245|4839|4848,9|9|7|1|63,false
t9451,58,1328,1330,4238|4245|4870|4879,9|9|7|1|63,false
t9399,58,1320,1321,4238|4245|4901|4910,9|9|7|1|63,false
t9287,58,1305,1310,4238|4245|4920|4929,9|9|7|1|63,false
#Sprite I/O
t366,58,2916,2920,5811|5818|7917|7926,9|9|7|1|63,false
t363,58,2913,2919,5910|5919|7938|7945,9|9|7|1|63,false
@ -697,7 +670,6 @@ t7316,58,5924,6049,6106|6115|5533|5540,9|9|7|1|63,false
t8746,58,6646,6809,6106|6115|5076|5083,9|9|7|1|63,false
t10181,58,7297,7435,6106|6115|4656|4663,9|9|7|1|63,false
t11330,58,7827,7987,6106|6115|4365|4372,9|9|7|1|63,false
#Sprite Rendering
t13188,58,10709,8874,4670|4677|3452|3459,7|7|7|1|49,false
t13329,58,10712,8962,4670|4677|3373|3380,7|7|7|1|49,false
@ -926,7 +898,6 @@ t14315,58,1822,2,1082|1115|2628|2644,39|49|5|2|220,false
t14448,58,2213,9702,1243|1252|2585|2592,9|9|7|1|63,false
t14653,58,2362,2,1084|1095|2318|2323,11|11|5|1|55,false
t14603,58,9764,9774,1269|1278|2349|2356,9|9|7|1|63,false
#VRAM Address
t13054,58,1870,2,6485|6490|3569|3629,60|60|5|1|300,false
t13040,58,8757,8740,6686|6693|3640|3649,9|9|7|1|63,false
@ -964,7 +935,6 @@ t14561,58,9731,9711,6037|6046|2445|2452,9|9|7|1|63,false
t14565,58,9712,2348,6098|6107|2434|2441,9|9|7|1|63,false
t15945,58,2705,2,8242|8247|1431|1449,18|18|5|1|90,false
t15533,58,2633,2,8217|8227|1679|1719,45|45|5|3|225,false
#$2007 I/O
t16454,58,10576,2,4997|5002|880|898,18|18|5|1|90,false
t16566,58,10600,10608,4868|4875|694|703,9|9|7|1|63,false
@ -973,13 +943,12 @@ t16582,58,10605,10606,4787|4794|674|683,9|9|7|1|63,false
t16469,58,2791,10573,4382|4389|853|862,9|9|7|1|63,false
t16581,58,10604,10602,4393|4400|674|683,9|9|7|1|63,false
t16565,58,10599,10607,4312|4319|695|704,9|9|7|1|63,false
t1,2,2,3,1014|1175|8815|8828,161|161|13|1|2093,false
t2,2,2,4,1742|1903|8815|8828,161|161|13|1|2093,false
t3,2,2,8,6182|6343|8815|8828,161|161|13|1|2093,false
t4,2,2,9,6910|7071|8815|8828,161|161|13|1|2093,false
t5,2,2,10,7638|7799|8815|8828,161|161|13|1|2093,false
t6,2,2,11,8366|8527|8815|8828,161|161|13|1|2093,false
t1,2,3,2,1014|1175|8815|8828,161|161|13|1|2093,false
t2,2,4,2,1742|1903|8815|8828,161|161|13|1|2093,false
t3,2,8,2,6182|6343|8815|8828,161|161|13|1|2093,false
t4,2,9,2,6910|7071|8815|8828,161|161|13|1|2093,false
t5,2,10,2,7638|7799|8815|8828,161|161|13|1|2093,false
t6,2,11,2,8366|8527|8815|8828,161|161|13|1|2093,false
t7,3,2842,2,1002|1103|8747|8760,101|101|13|1|1313,false
t8,4,2843,2,1730|1831|8747|8760,101|101|13|1|1313,false
t9,8,2844,2,6255|6357|8747|8760,102|102|13|1|1326,false
@ -998,10 +967,10 @@ t21,2852,20,2,6273|6303|8682|8687,30|30|5|1|150,false
t22,2853,21,2,7001|7031|8682|8687,30|30|5|1|150,false
t23,2854,19,2,7729|7759|8682|8687,30|30|5|1|150,false
t24,2855,22,2,8457|8487|8682|8687,30|30|5|1|150,false
t25,2,2,5,2718|2731|8510|8672,162|162|13|1|2106,false
t26,2,2,12,3327|3340|8510|8671,161|161|13|1|2093,false
t27,2,2,6,4004|4017|8510|8671,161|161|13|1|2093,false
t28,2,2,7,5235|5248|8510|8671,161|161|13|1|2093,false
t25,2,5,2,2718|2731|8510|8672,162|162|13|1|2106,false
t26,2,12,2,3327|3340|8510|8671,161|161|13|1|2093,false
t27,2,6,2,4004|4017|8510|8671,161|161|13|1|2093,false
t28,2,7,2,5235|5248|8510|8671,161|161|13|1|2093,false
t43,13,2858,2,6273|6303|8624|8629,30|30|5|1|150,false
t29,13,20,2,6273|6303|8665|8670,30|30|5|1|150,false
t44,13,2859,2,7001|7031|8624|8629,30|30|5|1|150,false
@ -1988,10 +1957,10 @@ t951,3201,3239,2,8314|8324|7553|7574,29|20|5|4|127,false
t952,3202,3240,2,8370|8381|7553|7574,30|21|5|4|132,false
t953,306,255,2,3071|3120|7565|7570,49|49|5|1|245,false
t954,306,250,2,3132|3146|7565|7570,14|14|5|1|70,false
t955,2,2,86,173|186|7408|7569,161|161|13|1|2093,false
t955,2,86,2,173|186|7408|7569,161|161|13|1|2093,false
t956,277,303,310,2009|2018|7564|7569,9|9|5|1|45,false
t957,278,304,311,2467|2476|7564|7569,9|9|5|1|45,false
t958,2,2,87,9398|9411|7408|7569,161|161|13|1|2093,false
t958,2,87,2,9398|9411|7408|7569,161|161|13|1|2093,false
t1133,308,3376,2,9227|9232|7499|7529,30|30|5|1|150,false
t959,308,95,2,9159|9192|7499|7567,91|101|5|2|480,false
t1213,309,3321,2,439|453|7478|7505,31|41|5|2|180,false
@ -4372,7 +4341,7 @@ t3482,73,516,663,6325|6330|6832|6847,15|15|5|1|75,false
t3522,4392,4390,2,5870|5883|6833|6838,13|13|5|1|65,false
t3484,4392,516,1,5971|5978|6812|6842,30|30|7|1|210,false
t3483,4392,500,2,6068|6075|6816|6845,29|29|7|1|203,false
t3485,2,2,430,172|185|6680|6841,161|161|13|1|2093,false
t3485,2,430,2,172|185|6680|6841,161|161|13|1|2093,false
t3486,2961,4358,663,6505|6510|6833|6840,7|7|5|1|35,false
t3487,2962,4359,663,6526|6531|6833|6840,7|7|5|1|35,false
t3488,2963,4360,663,6627|6632|6833|6840,7|7|5|1|35,false
@ -4405,7 +4374,7 @@ t3514,2989,4386,663,8212|8217|6833|6840,7|7|5|1|35,false
t3515,2990,4387,663,8233|8238|6833|6840,7|7|5|1|35,false
t3516,2991,4388,663,8334|8339|6833|6840,7|7|5|1|35,false
t3517,2992,4389,663,8355|8360|6833|6840,7|7|5|1|35,false
t3518,2,2,431,9399|9412|6679|6840,161|161|13|1|2093,false
t3518,2,431,2,9399|9412|6679|6840,161|161|13|1|2093,false
t3519,334,4390,2,5913|5926|6834|6839,13|13|5|1|65,false
t3647,665,4547,2,9228|9233|6770|6800,30|30|5|1|150,false
t3520,665,97,2,9159|9193|6770|6839,93|103|5|2|490,false
@ -4713,11 +4682,11 @@ t3833,656,4474,2,1497|1576|6746|6751,79|79|5|1|395,false
t3834,4509,172,2,2239|2277|6742|6747,38|38|5|1|190,false
t3835,74,706,711,6249|6254|6731|6746,15|15|5|1|75,false
t3837,4474,732,2,1284|1372|6736|6741,88|88|5|1|440,false
t3839,2,2,4399,4571|4584|6736|6741,13|13|5|1|65,false
t3840,2,2,4400,4714|4727|6736|6741,13|13|5|1|65,false
t3841,2,2,4401,4857|4870|6736|6741,13|13|5|1|65,false
t3842,2,2,4402,4998|5011|6736|6741,13|13|5|1|65,false
t3843,2,2,4403,5141|5154|6736|6741,13|13|5|1|65,false
t3839,2,4399,2,4571|4584|6736|6741,13|13|5|1|65,false
t3840,2,4400,2,4714|4727|6736|6741,13|13|5|1|65,false
t3841,2,4401,2,4857|4870|6736|6741,13|13|5|1|65,false
t3842,2,4402,2,4998|5011|6736|6741,13|13|5|1|65,false
t3843,2,4403,2,5141|5154|6736|6741,13|13|5|1|65,false
t3844,4546,85,1,382|389|6732|6740,7|7|8|1|56,false
t3845,2961,4513,711,6505|6510|6732|6739,7|7|5|1|35,false
t3846,2962,4514,711,6526|6531|6732|6739,7|7|5|1|35,false
@ -6231,7 +6200,7 @@ t5493,946,5372,2,4728|4738|6211|6249,39|39|5|6|207,false
t5359,946,933,2,4550|4555|6212|6270,58|58|5|1|290,false
t5492,903,5372,2,4713|4718|6211|6249,38|38|5|1|190,false
t5360,903,933,2,4571|4576|6212|6270,58|58|5|1|290,false
t5361,2,2,935,4895|4900|6212|6270,58|58|5|1|290,false
t5361,2,935,2,4895|4900|6212|6270,58|58|5|1|290,false
t5494,910,5373,2,5058|5063|6211|6249,38|38|5|1|190,false
t5362,910,935,2,4916|4921|6212|6270,58|58|5|1|290,false
t7077,915,547,2,2413|2418|5632|5650,18|18|5|1|90,false
@ -6581,7 +6550,7 @@ t5729,260,842,2,2345|2354|6168|6173,9|9|5|1|45,false
t5730,260,844,2,2386|2395|6168|6173,9|9|5|1|45,false
t5731,260,116,2,2406|2415|6168|6173,9|9|5|1|45,false
t5732,260,5383,2,2446|2475|6168|6173,29|29|5|1|145,false
t5742,2,2,772,330|492|6155|6168,162|162|13|1|2106,false
t5742,2,772,2,330|492|6155|6168,162|162|13|1|2106,false
t5745,2961,5389,942,6505|6510|6160|6167,7|7|5|1|35,false
t5746,2962,942,5390,6526|6531|6160|6167,7|7|5|1|35,false
t5747,2963,5391,942,6627|6632|6160|6167,7|7|5|1|35,false
@ -6797,7 +6766,7 @@ t5961,5464,848,2,2934|2943|6107|6112,9|9|5|1|45,false
t5962,5464,849,2,2954|2963|6107|6112,9|9|5|1|45,false
t5963,5464,852,2,3015|3024|6107|6112,9|9|5|1|45,false
t5964,5464,853,2,3056|3065|6107|6112,9|9|5|1|45,false
t5965,2,2,765,9398|9411|5951|6112,161|161|13|1|2093,false
t5965,2,765,2,9398|9411|5951|6112,161|161|13|1|2093,false
t6078,951,5627,2,9227|9232|6042|6072,30|30|5|1|150,false
t5966,951,100,2,9159|9192|6042|6111,92|102|5|2|485,false
t5967,953,5532,2,5926|5946|6087|6107,30|40|5|2|175,false
@ -8546,7 +8515,7 @@ t7861,2989,6297,1154,8212|8217|5377|5384,7|7|5|1|35,false
t7862,2990,1154,6298,8233|8238|5377|5384,7|7|5|1|35,false
t7863,2991,6299,1154,8334|8339|5377|5384,7|7|5|1|35,false
t7864,2992,1154,6300,8355|8360|5377|5384,7|7|5|1|35,false
t7865,2,2,1013,9398|9411|5223|5384,161|161|13|1|2093,false
t7865,2,1013,2,9398|9411|5223|5384,161|161|13|1|2093,false
t7995,1156,6420,2,9227|9232|5314|5344,30|30|5|1|150,false
t7866,1156,105,2,9159|9192|5314|5383,92|102|5|2|485,false
t7867,1174,1153,2,4035|4044|5376|5381,9|9|5|1|45,false
@ -10634,7 +10603,7 @@ t10001,7362,7329,2,8248|8259|4693|4716,32|23|5|4|142,false
t10002,7363,7330,2,8314|8324|4693|4716,31|22|5|4|137,false
t10003,7364,7331,2,8370|8381|4693|4716,32|23|5|4|142,false
t10004,7299,7298,2,5901|5922|4709|4714,21|21|5|1|105,false
t10005,2,2,1224,9094|9255|4699|4712,161|161|13|1|2093,false
t10005,2,1224,2,9094|9255|4699|4712,161|161|13|1|2093,false
t10006,7300,7333,2,6466|6477|4689|4709,29|20|5|4|127,false
t10007,7301,7334,2,6560|6570|4689|4709,28|18|3|4|122,false
t10008,7302,7335,2,6588|6599|4689|4709,29|20|5|4|127,false
@ -11036,10 +11005,10 @@ t10408,2989,7502,1405,8212|8217|4577|4584,7|7|5|1|35,false
t10409,2990,7503,1405,8233|8238|4577|4584,7|7|5|1|35,false
t10410,2991,7504,1405,8334|8339|4577|4584,7|7|5|1|35,false
t10411,2992,7505,1405,8355|8360|4577|4584,7|7|5|1|35,false
t10413,1407,1394,7578,4051|4060|4576|4581,9|9|5|1|45,false
t10414,1407,1391,7579,4142|4151|4576|4581,9|9|5|1|45,false
t10412,1407,1398,7577,3960|3969|4576|4581,9|9|5|1|45,false
t10415,1407,1388,7580,4234|4243|4576|4581,9|9|5|1|45,false
t10413,1407,7578,1394,4051|4060|4576|4581,9|9|5|1|45,false
t10414,1407,7579,1391,4142|4151|4576|4581,9|9|5|1|45,false
t10412,1407,7577,1398,3960|3969|4576|4581,9|9|5|1|45,false
t10415,1407,7580,1388,4234|4243|4576|4581,9|9|5|1|45,false
t10421,1388,1459,2,4515|4520|4560|4579,19|19|5|1|95,false
t10422,1391,1459,2,4535|4540|4560|4579,19|19|5|1|95,false
t10423,1514,1406,2,4561|4566|4560|4579,19|19|5|1|95,false
@ -11809,15 +11778,15 @@ t11143,7870,1419,7930,1202|1210|4405|4410,8|8|5|1|40,false
t11142,7870,1410,7905,1183|1191|4405|4410,8|8|5|1|40,false
t11141,7870,1418,7929,1126|1134|4405|4410,8|8|5|1|40,false
t11189,2,724,2,221|230|4289|4406,117|117|9|1|1053,false
t11190,2,2,724,262|271|4289|4406,117|117|9|1|1053,false
t11190,2,724,2,262|271|4289|4406,117|117|9|1|1053,false
t11191,2,724,2,289|298|4289|4406,117|117|9|1|1053,false
t11192,2,2,724,329|338|4289|4406,117|117|9|1|1053,false
t11192,2,724,2,329|338|4289|4406,117|117|9|1|1053,false
t11193,2,724,2,357|366|4289|4406,117|117|9|1|1053,false
t11194,2,2,724,397|406|4289|4406,117|117|9|1|1053,false
t11194,2,724,2,397|406|4289|4406,117|117|9|1|1053,false
t11195,2,724,2,425|434|4289|4406,117|117|9|1|1053,false
t11196,2,2,724,465|474|4289|4406,117|117|9|1|1053,false
t11196,2,724,2,465|474|4289|4406,117|117|9|1|1053,false
t11197,2,724,2,492|501|4289|4406,117|117|9|1|1053,false
t11198,2,2,724,533|542|4289|4406,117|117|9|1|1053,false
t11198,2,724,2,533|542|4289|4406,117|117|9|1|1053,false
t11203,7838,7871,2,6466|6477|4384|4405,30|21|5|4|132,false
t11204,7839,7872,2,6560|6570|4384|4405,29|20|5|4|127,false
t11205,7840,7873,2,6588|6599|4384|4405,30|21|5|4|132,false
@ -13615,7 +13584,7 @@ t13049,1716,1707,2,512|517|3602|3642,40|40|5|1|200,false
t13050,1707,1716,2,545|550|3602|3642,40|40|5|1|200,false
t13303,604,10714,2,5972|5977|3351|3390,39|39|5|1|195,false
t13051,604,1716,2,565|570|3602|3642,40|40|5|1|200,false
t13052,2,2,1934,175|186|3480|3641,161|161|11|1|1771,false
t13052,2,1934,2,175|186|3480|3641,161|161|11|1|1771,false
t13053,8714,1611,2,8814|8947|3625|3634,133|133|9|1|1197,false
t13055,1934,1712,2,258|273|3403|3605,202|202|15|1|3030,false
t13056,1934,1712,8778,294|309|3403|3605,202|202|15|1|3030,false