1
   2
   3
   4
   5
   6
   7
   8
   9
  10
  11
  12
  13
  14
  15
  16
  17
  18
  19
  20
  21
  22
  23
  24
  25
  26
  27
  28
  29
  30
  31
  32
  33
  34
  35
  36
  37
  38
  39
  40
  41
  42
  43
  44
  45
  46
  47
  48
  49
  50
  51
  52
  53
  54
  55
  56
  57
  58
  59
  60
  61
  62
  63
  64
  65
  66
  67
  68
  69
  70
  71
  72
  73
  74
  75
  76
  77
  78
  79
  80
  81
  82
  83
  84
  85
  86
  87
  88
  89
  90
  91
  92
  93
  94
  95
  96
  97
  98
  99
 100
 101
 102
 103
 104
 105
 106
 107
 108
 109
 110
 111
 112
 113
 114
 115
 116
 117
 118
 119
 120
 121
 122
 123
 124
 125
 126
 127
 128
 129
 130
 131
 132
 133
 134
 135
 136
 137
 138
 139
 140
 141
 142
 143
 144
 145
 146
 147
 148
 149
 150
 151
 152
 153
 154
 155
 156
 157
 158
 159
 160
 161
 162
 163
 164
 165
 166
 167
 168
 169
 170
 171
 172
 173
 174
 175
 176
 177
 178
 179
 180
 181
 182
 183
 184
 185
 186
 187
 188
 189
 190
 191
 192
 193
 194
 195
 196
 197
 198
 199
 200
 201
 202
 203
 204
 205
 206
 207
 208
 209
 210
 211
 212
 213
 214
 215
 216
 217
 218
 219
 220
 221
 222
 223
 224
 225
 226
 227
 228
 229
 230
 231
 232
 233
 234
 235
 236
 237
 238
 239
 240
 241
 242
 243
 244
 245
 246
 247
 248
 249
 250
 251
 252
 253
 254
 255
 256
 257
 258
 259
 260
 261
 262
 263
 264
 265
 266
 267
 268
 269
 270
 271
 272
 273
 274
 275
 276
 277
 278
 279
 280
 281
 282
 283
 284
 285
 286
 287
 288
 289
 290
 291
 292
 293
 294
 295
 296
 297
 298
 299
 300
 301
 302
 303
 304
 305
 306
 307
 308
 309
 310
 311
 312
 313
 314
 315
 316
 317
 318
 319
 320
 321
 322
 323
 324
 325
 326
 327
 328
 329
 330
 331
 332
 333
 334
 335
 336
 337
 338
 339
 340
 341
 342
 343
 344
 345
 346
 347
 348
 349
 350
 351
 352
 353
 354
 355
 356
 357
 358
 359
 360
 361
 362
 363
 364
 365
 366
 367
 368
 369
 370
 371
 372
 373
 374
 375
 376
 377
 378
 379
 380
 381
 382
 383
 384
 385
 386
 387
 388
 389
 390
 391
 392
 393
 394
 395
 396
 397
 398
 399
 400
 401
 402
 403
 404
 405
 406
 407
 408
 409
 410
 411
 412
 413
 414
 415
 416
 417
 418
 419
 420
 421
 422
 423
 424
 425
 426
 427
 428
 429
 430
 431
 432
 433
 434
 435
 436
 437
 438
 439
 440
 441
 442
 443
 444
 445
 446
 447
 448
 449
 450
 451
 452
 453
 454
 455
 456
 457
 458
 459
 460
 461
 462
 463
 464
 465
 466
 467
 468
 469
 470
 471
 472
 473
 474
 475
 476
 477
 478
 479
 480
 481
 482
 483
 484
 485
 486
 487
 488
 489
 490
 491
 492
 493
 494
 495
 496
 497
 498
 499
 500
 501
 502
 503
 504
 505
 506
 507
 508
 509
 510
 511
 512
 513
 514
 515
 516
 517
 518
 519
 520
 521
 522
 523
 524
 525
 526
 527
 528
 529
 530
 531
 532
 533
 534
 535
 536
 537
 538
 539
 540
 541
 542
 543
 544
 545
 546
 547
 548
 549
 550
 551
 552
 553
 554
 555
 556
 557
 558
 559
 560
 561
 562
 563
 564
 565
 566
 567
 568
 569
 570
 571
 572
 573
 574
 575
 576
 577
 578
 579
 580
 581
 582
 583
 584
 585
 586
 587
 588
 589
 590
 591
 592
 593
 594
 595
 596
 597
 598
 599
 600
 601
 602
 603
 604
 605
 606
 607
 608
 609
 610
 611
 612
 613
 614
 615
 616
 617
 618
 619
 620
 621
 622
 623
 624
 625
 626
 627
 628
 629
 630
 631
 632
 633
 634
 635
 636
 637
 638
 639
 640
 641
 642
 643
 644
 645
 646
 647
 648
 649
 650
 651
 652
 653
 654
 655
 656
 657
 658
 659
 660
 661
 662
 663
 664
 665
 666
 667
 668
 669
 670
 671
 672
 673
 674
 675
 676
 677
 678
 679
 680
 681
 682
 683
 684
 685
 686
 687
 688
 689
 690
 691
 692
 693
 694
 695
 696
 697
 698
 699
 700
 701
 702
 703
 704
 705
 706
 707
 708
 709
 710
 711
 712
 713
 714
 715
 716
 717
 718
 719
 720
 721
 722
 723
 724
 725
 726
 727
 728
 729
 730
 731
 732
 733
 734
 735
 736
 737
 738
 739
 740
 741
 742
 743
 744
 745
 746
 747
 748
 749
 750
 751
 752
 753
 754
 755
 756
 757
 758
 759
 760
 761
 762
 763
 764
 765
 766
 767
 768
 769
 770
 771
 772
 773
 774
 775
 776
 777
 778
 779
 780
 781
 782
 783
 784
 785
 786
 787
 788
 789
 790
 791
 792
 793
 794
 795
 796
 797
 798
 799
 800
 801
 802
 803
 804
 805
 806
 807
 808
 809
 810
 811
 812
 813
 814
 815
 816
 817
 818
 819
 820
 821
 822
 823
 824
 825
 826
 827
 828
 829
 830
 831
 832
 833
 834
 835
 836
 837
 838
 839
 840
 841
 842
 843
 844
 845
 846
 847
 848
 849
 850
 851
 852
 853
 854
 855
 856
 857
 858
 859
 860
 861
 862
 863
 864
 865
 866
 867
 868
 869
 870
 871
 872
 873
 874
 875
 876
 877
 878
 879
 880
 881
 882
 883
 884
 885
 886
 887
 888
 889
 890
 891
 892
 893
 894
 895
 896
 897
 898
 899
 900
 901
 902
 903
 904
 905
 906
 907
 908
 909
 910
 911
 912
 913
 914
 915
 916
 917
 918
 919
 920
 921
 922
 923
 924
 925
 926
 927
 928
 929
 930
 931
 932
 933
 934
 935
 936
 937
 938
 939
 940
 941
 942
 943
 944
 945
 946
 947
 948
 949
 950
 951
 952
 953
 954
 955
 956
 957
 958
 959
 960
 961
 962
 963
 964
 965
 966
 967
 968
 969
 970
 971
 972
 973
 974
 975
 976
 977
 978
 979
 980
 981
 982
 983
 984
 985
 986
 987
 988
 989
 990
 991
 992
 993
 994
 995
 996
 997
 998
 999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
 182 files changed, 3882 insertions(+), 819 deletions(-)

diff --git config_180523_1200/Items/cloud/damageboost_blast_0.txt config_180529_2118/Items/cloud/damageboost_blast_0.txt
index 3b8dcf2..1b56eb0 100644
--- config_180523_1200/Items/cloud/damageboost_blast_0.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_0.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast0
-icon: ItemLootCloud_Damage_0
+icon: ItemLootBlast_DamageBoost_0
 id: damageboost_blast_0
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '0'
diff --git config_180523_1200/Items/cloud/damageboost_blast_1.txt config_180529_2118/Items/cloud/damageboost_blast_1.txt
index 660710e..f52f1d0 100644
--- config_180523_1200/Items/cloud/damageboost_blast_1.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_1.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast1
-icon: ItemLootCloud_Damage_1
+icon: ItemLootBlast_DamageBoost_1
 id: damageboost_blast_1
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '1'
diff --git config_180523_1200/Items/cloud/damageboost_blast_10.txt config_180529_2118/Items/cloud/damageboost_blast_10.txt
index 44e8608..3f05b1e 100644
--- config_180523_1200/Items/cloud/damageboost_blast_10.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_10.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast10
-icon: ItemLootCloud_Damage_10
+icon: ItemLootBlast_DamageBoost_10
 id: damageboost_blast_10
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '10'
diff --git config_180523_1200/Items/cloud/damageboost_blast_2.txt config_180529_2118/Items/cloud/damageboost_blast_2.txt
index f9ee8ec..90f3a8a 100644
--- config_180523_1200/Items/cloud/damageboost_blast_2.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_2.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast2
-icon: ItemLootCloud_Damage_2
+icon: ItemLootBlast_DamageBoost_2
 id: damageboost_blast_2
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '2'
diff --git config_180523_1200/Items/cloud/damageboost_blast_3.txt config_180529_2118/Items/cloud/damageboost_blast_3.txt
index 0cbc990..4aa1d9f 100644
--- config_180523_1200/Items/cloud/damageboost_blast_3.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_3.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast3
-icon: ItemLootCloud_Damage_3
+icon: ItemLootBlast_DamageBoost_3
 id: damageboost_blast_3
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '3'
diff --git config_180523_1200/Items/cloud/damageboost_blast_4.txt config_180529_2118/Items/cloud/damageboost_blast_4.txt
index c6cafd4..5300236 100644
--- config_180523_1200/Items/cloud/damageboost_blast_4.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_4.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast4
-icon: ItemLootCloud_Damage_4
+icon: ItemLootBlast_DamageBoost_4
 id: damageboost_blast_4
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '4'
diff --git config_180523_1200/Items/cloud/damageboost_blast_5.txt config_180529_2118/Items/cloud/damageboost_blast_5.txt
index c20fc2f..402f236 100644
--- config_180523_1200/Items/cloud/damageboost_blast_5.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_5.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast5
-icon: ItemLootCloud_Damage_5
+icon: ItemLootBlast_DamageBoost_5
 id: damageboost_blast_5
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '5'
diff --git config_180523_1200/Items/cloud/damageboost_blast_6.txt config_180529_2118/Items/cloud/damageboost_blast_6.txt
index 9ef4336..d54e7ca 100644
--- config_180523_1200/Items/cloud/damageboost_blast_6.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_6.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast6
-icon: ItemLootCloud_Damage_6
+icon: ItemLootBlast_DamageBoost_6
 id: damageboost_blast_6
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '6'
diff --git config_180523_1200/Items/cloud/damageboost_blast_7.txt config_180529_2118/Items/cloud/damageboost_blast_7.txt
index c506336..cf28e48 100644
--- config_180523_1200/Items/cloud/damageboost_blast_7.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_7.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast7
-icon: ItemLootCloud_Damage_7
+icon: ItemLootBlast_DamageBoost_7
 id: damageboost_blast_7
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '7'
diff --git config_180523_1200/Items/cloud/damageboost_blast_8.txt config_180529_2118/Items/cloud/damageboost_blast_8.txt
index c5e93f2..032a079 100644
--- config_180523_1200/Items/cloud/damageboost_blast_8.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_8.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast8
-icon: ItemLootCloud_Damage_8
+icon: ItemLootBlast_DamageBoost_8
 id: damageboost_blast_8
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '8'
diff --git config_180523_1200/Items/cloud/damageboost_blast_9.txt config_180529_2118/Items/cloud/damageboost_blast_9.txt
index 6d281b5..a796790 100644
--- config_180523_1200/Items/cloud/damageboost_blast_9.txt
+++ config_180529_2118/Items/cloud/damageboost_blast_9.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: damageboostblast9
-icon: ItemLootCloud_Damage_9
+icon: ItemLootBlast_DamageBoost_9
 id: damageboost_blast_9
 slot: SecondaryAttack
 tag: damageboost_blast
 tier: '9'
diff --git config_180523_1200/Items/cloud/healaura_0.txt config_180529_2118/Items/cloud/healaura_0.txt
index ac36140..dcb6b03 100644
--- config_180523_1200/Items/cloud/healaura_0.txt
+++ config_180529_2118/Items/cloud/healaura_0.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_0
 id: healaura_0
 slot: SecondaryAttack
 tag: healaura
 tier: '0'
diff --git config_180523_1200/Items/cloud/healaura_1.txt config_180529_2118/Items/cloud/healaura_1.txt
index 7fa7823..584d923 100644
--- config_180523_1200/Items/cloud/healaura_1.txt
+++ config_180529_2118/Items/cloud/healaura_1.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_1
 id: healaura_1
 slot: SecondaryAttack
 tag: healaura
 tier: '1'
diff --git config_180523_1200/Items/cloud/healaura_10.txt config_180529_2118/Items/cloud/healaura_10.txt
index 7b4222b..aa6c00a 100644
--- config_180523_1200/Items/cloud/healaura_10.txt
+++ config_180529_2118/Items/cloud/healaura_10.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_10
 id: healaura_10
 slot: SecondaryAttack
 tag: healaura
 tier: '10'
diff --git config_180523_1200/Items/cloud/healaura_2.txt config_180529_2118/Items/cloud/healaura_2.txt
index 9643a86..8e5cc34 100644
--- config_180523_1200/Items/cloud/healaura_2.txt
+++ config_180529_2118/Items/cloud/healaura_2.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_2
 id: healaura_2
 slot: SecondaryAttack
 tag: healaura
 tier: '2'
diff --git config_180523_1200/Items/cloud/healaura_3.txt config_180529_2118/Items/cloud/healaura_3.txt
index 12fdaa4..d3c675f 100644
--- config_180523_1200/Items/cloud/healaura_3.txt
+++ config_180529_2118/Items/cloud/healaura_3.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_3
 id: healaura_3
 slot: SecondaryAttack
 tag: healaura
 tier: '3'
diff --git config_180523_1200/Items/cloud/healaura_4.txt config_180529_2118/Items/cloud/healaura_4.txt
index a16364c..955969c 100644
--- config_180523_1200/Items/cloud/healaura_4.txt
+++ config_180529_2118/Items/cloud/healaura_4.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_4
 id: healaura_4
 slot: SecondaryAttack
 tag: healaura
 tier: '4'
diff --git config_180523_1200/Items/cloud/healaura_5.txt config_180529_2118/Items/cloud/healaura_5.txt
index 922f5a7..18e9b36 100644
--- config_180523_1200/Items/cloud/healaura_5.txt
+++ config_180529_2118/Items/cloud/healaura_5.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_5
 id: healaura_5
 slot: SecondaryAttack
 tag: healaura
 tier: '5'
diff --git config_180523_1200/Items/cloud/healaura_6.txt config_180529_2118/Items/cloud/healaura_6.txt
index ca1938f..8399034 100644
--- config_180523_1200/Items/cloud/healaura_6.txt
+++ config_180529_2118/Items/cloud/healaura_6.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_6
 id: healaura_6
 slot: SecondaryAttack
 tag: healaura
 tier: '6'
diff --git config_180523_1200/Items/cloud/healaura_7.txt config_180529_2118/Items/cloud/healaura_7.txt
index 1be9213..7d621b2 100644
--- config_180523_1200/Items/cloud/healaura_7.txt
+++ config_180529_2118/Items/cloud/healaura_7.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_7
 id: healaura_7
 slot: SecondaryAttack
 tag: healaura
 tier: '7'
diff --git config_180523_1200/Items/cloud/healaura_8.txt config_180529_2118/Items/cloud/healaura_8.txt
index 83eb8e7..021cce2 100644
--- config_180523_1200/Items/cloud/healaura_8.txt
+++ config_180529_2118/Items/cloud/healaura_8.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_8
 id: healaura_8
 slot: SecondaryAttack
 tag: healaura
 tier: '8'
diff --git config_180523_1200/Items/cloud/healaura_9.txt config_180529_2118/Items/cloud/healaura_9.txt
index b06f015..052ae23 100644
--- config_180523_1200/Items/cloud/healaura_9.txt
+++ config_180529_2118/Items/cloud/healaura_9.txt
@@ -1,7 +1,7 @@
 actions:
 - cloud: healaura0
-icon: ItemLootBlast_ResistAura_0
+icon: ItemLootBlast_HealAura_9
 id: healaura_9
 slot: SecondaryAttack
 tag: healaura
 tier: '9'
diff --git config_180523_1200/Items/cloud/vortex_0.txt config_180529_2118/Items/cloud/vortex_0.txt
index 1964299..4599f75 100644
--- config_180523_1200/Items/cloud/vortex_0.txt
+++ config_180529_2118/Items/cloud/vortex_0.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '28.55750604'
     name: shortShield
     scale: '3'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_0
+icon: ItemLootVortex_0
 id: vortex_0
 slot: SecondaryAttack
 statMods:
 - amount: '1'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_1.txt config_180529_2118/Items/cloud/vortex_1.txt
index a8d4234..cbba368 100644
--- config_180523_1200/Items/cloud/vortex_1.txt
+++ config_180529_2118/Items/cloud/vortex_1.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '31.04076743'
     name: shortShield
     scale: '3.157894737'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_1
+icon: ItemLootVortex_1
 id: vortex_1
 slot: SecondaryAttack
 statMods:
 - amount: '1.03'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_10.txt config_180529_2118/Items/cloud/vortex_10.txt
index a362a23..604affb 100644
--- config_180523_1200/Items/cloud/vortex_10.txt
+++ config_180529_2118/Items/cloud/vortex_10.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '45'
     name: shortShield
     scale: '7'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_10
+icon: ItemLootVortex_10
 id: vortex_10
 slot: SecondaryAttack
 statMods:
 - amount: '1.33'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_2.txt config_180529_2118/Items/cloud/vortex_2.txt
index 836f3a3..3bad636 100644
--- config_180523_1200/Items/cloud/vortex_2.txt
+++ config_180529_2118/Items/cloud/vortex_2.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '33.7399646'
     name: shortShield
     scale: '3.333333333'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_2
+icon: ItemLootVortex_2
 id: vortex_2
 slot: SecondaryAttack
 statMods:
 - amount: '1.06'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_3.txt config_180529_2118/Items/cloud/vortex_3.txt
index 7c8eee6..b71db27 100644
--- config_180523_1200/Items/cloud/vortex_3.txt
+++ config_180529_2118/Items/cloud/vortex_3.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '36.67387457'
     name: shortShield
     scale: '3.529411765'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_3
+icon: ItemLootVortex_3
 id: vortex_3
 slot: SecondaryAttack
 statMods:
 - amount: '1.1'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_4.txt config_180529_2118/Items/cloud/vortex_4.txt
index 0afc1a9..776db69 100644
--- config_180523_1200/Items/cloud/vortex_4.txt
+++ config_180529_2118/Items/cloud/vortex_4.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '39.86290714'
     name: shortShield
     scale: '4.0625'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_4
+icon: ItemLootVortex_4
 id: vortex_4
 slot: SecondaryAttack
 statMods:
 - amount: '1.13'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_5.txt config_180529_2118/Items/cloud/vortex_5.txt
index bb27d4e..5f58118 100644
--- config_180523_1200/Items/cloud/vortex_5.txt
+++ config_180529_2118/Items/cloud/vortex_5.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '40.67643586'
     name: shortShield
     scale: '4.333333333'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_5
+icon: ItemLootVortex_5
 id: vortex_5
 slot: SecondaryAttack
 statMods:
 - amount: '1.16'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_6.txt config_180529_2118/Items/cloud/vortex_6.txt
index 99c1bd6..d226464 100644
--- config_180523_1200/Items/cloud/vortex_6.txt
+++ config_180529_2118/Items/cloud/vortex_6.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '41.5065672'
     name: shortShield
     scale: '4.642857143'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_6
+icon: ItemLootVortex_6
 id: vortex_6
 slot: SecondaryAttack
 statMods:
 - amount: '1.2'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_7.txt config_180529_2118/Items/cloud/vortex_7.txt
index bc61e7e..d46e644 100644
--- config_180523_1200/Items/cloud/vortex_7.txt
+++ config_180529_2118/Items/cloud/vortex_7.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '42.35364'
     name: shortShield
     scale: '5'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_7
+icon: ItemLootVortex_7
 id: vortex_7
 slot: SecondaryAttack
 statMods:
 - amount: '1.23'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_8.txt config_180529_2118/Items/cloud/vortex_8.txt
index 53fd3a8..0934886 100644
--- config_180523_1200/Items/cloud/vortex_8.txt
+++ config_180529_2118/Items/cloud/vortex_8.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '43.218'
     name: shortShield
     scale: '5.833333333'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_8
+icon: ItemLootVortex_8
 id: vortex_8
 slot: SecondaryAttack
 statMods:
 - amount: '1.26'
   math: add
diff --git config_180523_1200/Items/cloud/vortex_9.txt config_180529_2118/Items/cloud/vortex_9.txt
index d511437..128bf0d 100644
--- config_180523_1200/Items/cloud/vortex_9.txt
+++ config_180529_2118/Items/cloud/vortex_9.txt
@@ -3,11 +3,11 @@ actions:
     cooldown: '0.2'
     energy: '44.1'
     name: shortShield
     scale: '6.363636364'
     secondsToVelocity1: '0.2'
-icon: ItemLootCloud_Acid_9
+icon: ItemLootVortex_9
 id: vortex_9
 slot: SecondaryAttack
 statMods:
 - amount: '1.3'
   math: add
diff --git config_180529_2118/Items/consumable/consumable_steam.txt config_180529_2118/Items/consumable/consumable_steam.txt
new file mode 100644
index 0000000..0a1de61
--- /dev/null
+++ config_180529_2118/Items/consumable/consumable_steam.txt
@@ -0,0 +1,8 @@
+actions:
+- healthenergy:
+    energy: '50'
+    health: '0'
+icon: ItemUnknown
+id: consumable_steam
+slot: ConsumableAction
+uses: '5'
diff --git config_180529_2118/Items/consumable/consumable_xpboost.txt config_180529_2118/Items/consumable/consumable_xpboost.txt
new file mode 100644
index 0000000..94064bc
--- /dev/null
+++ config_180529_2118/Items/consumable/consumable_xpboost.txt
@@ -0,0 +1,8 @@
+actions:
+- planexpboost:
+    additionalPercentage: '100'
+    duration: '1800'
+icon: ItemUnknown
+id: consumable_xpboost
+slot: ConsumableAction
+uses: '1'
diff --git config_180523_1200/Items/consumable/health_boost.txt config_180529_2118/Items/consumable/health_boost.txt
index b8e9307..33577ab 100644
--- config_180523_1200/Items/consumable/health_boost.txt
+++ config_180529_2118/Items/consumable/health_boost.txt
@@ -1,8 +1,8 @@
 actions:
 - healthenergy:
     energy: '0'
-    health: '100'
+    health: '50'
 icon: ItemUnknown
 id: health_boost
 slot: ConsumableAction
 uses: '5'
diff --git config_180523_1200/Items/engine/engine_0.txt config_180529_2118/Items/engine/engine_0.txt
index b4a822c..19c26b1 100644
--- config_180523_1200/Items/engine/engine_0.txt
+++ config_180529_2118/Items/engine/engine_0.txt
@@ -1,5 +1,5 @@
-icon: ItemLootEngineSpeed_0
+icon: ItemLootEngineStock_0
 id: engine_0
 slot: Engine
 statMods: []
 tier: '0'
diff --git config_180523_1200/Items/laser/laser_0.txt config_180529_2118/Items/laser/laser_0.txt
index d773e81..c6a4e54 100644
--- config_180523_1200/Items/laser/laser_0.txt
+++ config_180529_2118/Items/laser/laser_0.txt
@@ -17,10 +17,10 @@ gunMounts:
     speed: '56.0'
     spread: '0'
   mountName: mount1
   sfx:
     sound: laser
-icon: ItemLootLaserBig_0
+icon: ItemLootLaserGun_0
 id: laser_0
 slot: MainGun
 tag: laser
 tier: '0'
diff --git config_180523_1200/Items/laser/laser_1.txt config_180529_2118/Items/laser/laser_1.txt
index 04ca0b6..650dd5d 100644
--- config_180523_1200/Items/laser/laser_1.txt
+++ config_180529_2118/Items/laser/laser_1.txt
@@ -39,10 +39,10 @@ gunMounts:
     spread: '0'
   mountName: lasermount_2
   sfx:
     pitch: '1'
     sound: laser
-icon: ItemLootLaserBig_01
+icon: ItemLootLaserGun_1
 id: laser_1
 slot: MainGun
 tag: laser
 tier: '1'
diff --git config_180523_1200/Items/laser/laser_10.txt config_180529_2118/Items/laser/laser_10.txt
index 05b7892..af075c7 100644
--- config_180523_1200/Items/laser/laser_10.txt
+++ config_180529_2118/Items/laser/laser_10.txt
@@ -51,10 +51,10 @@ gunMounts:
   mountName: laserbigmount2
   sfx:
     pitch: '0.5'
     sound: laser
     volume: '1'
-icon: ItemLootLaserBig_10
+icon: ItemLootLaserGun_10
 id: laser_10
 slot: MainGun
 tag: laser
 tier: '10'
diff --git config_180523_1200/Items/laser/laser_2.txt config_180529_2118/Items/laser/laser_2.txt
index 8ddf713..8277277 100644
--- config_180523_1200/Items/laser/laser_2.txt
+++ config_180529_2118/Items/laser/laser_2.txt
@@ -19,10 +19,10 @@ gunMounts:
     speed: '56.0'
     spread: '0'
   mountName: laser2_mount
   sfx:
     sound: laser
-icon: ItemLootLaserBig_02
+icon: ItemLootLaserGun_2
 id: laser_2
 slot: MainGun
 tag: laser
 tier: '2'
diff --git config_180523_1200/Items/laser/laser_3.txt config_180529_2118/Items/laser/laser_3.txt
index 2b14648..82a3328 100644
--- config_180523_1200/Items/laser/laser_3.txt
+++ config_180529_2118/Items/laser/laser_3.txt
@@ -45,10 +45,10 @@ gunMounts:
   - '0'
   - '0'
   sfx:
     pitch: '0.75'
     sound: laser
-icon: ItemLootLaserBig_03
+icon: ItemLootLaserGun_3
 id: laser_3
 slot: MainGun
 tag: laser
 tier: '3'
diff --git config_180523_1200/Items/laser/laser_4.txt config_180529_2118/Items/laser/laser_4.txt
index 6201757..a5809d2 100644
--- config_180523_1200/Items/laser/laser_4.txt
+++ config_180529_2118/Items/laser/laser_4.txt
@@ -22,10 +22,10 @@ gunMounts:
   offset:
   - '0'
   - '0'
   sfx:
     sound: laser
-icon: ItemLootLaserBig_04
+icon: ItemLootLaserGun_4
 id: laser_4
 slot: MainGun
 tag: laser
 tier: '4'
diff --git config_180523_1200/Items/laser/laser_5.txt config_180529_2118/Items/laser/laser_5.txt
index b4ac5a8..2395a39 100644
--- config_180523_1200/Items/laser/laser_5.txt
+++ config_180529_2118/Items/laser/laser_5.txt
@@ -22,10 +22,10 @@ gunMounts:
   offset:
   - '0'
   - '0'
   sfx:
     sound: laser
-icon: ItemLootLaserBig_05
+icon: ItemLootLaserGun_5
 id: laser_5
 slot: MainGun
 tag: laser
 tier: '5'
diff --git config_180523_1200/Items/laser/laser_6.txt config_180529_2118/Items/laser/laser_6.txt
index 3d1403c..b50556c 100644
--- config_180523_1200/Items/laser/laser_6.txt
+++ config_180529_2118/Items/laser/laser_6.txt
@@ -42,10 +42,10 @@ gunMounts:
   - '0'
   - '0'
   sfx:
     pitch: '1.5'
     sound: laser
-icon: ItemLootLaserBig_06
+icon: ItemLootLaserGun_6
 id: laser_6
 slot: MainGun
 tag: laser
 tier: '6'
diff --git config_180523_1200/Items/laser/laser_7.txt config_180529_2118/Items/laser/laser_7.txt
index 63d11ec..f4b633a 100644
--- config_180523_1200/Items/laser/laser_7.txt
+++ config_180529_2118/Items/laser/laser_7.txt
@@ -43,10 +43,10 @@ gunMounts:
   - '0'
   sfx:
     pitch: '2'
     sound: laser
     volume: '0.5'
-icon: ItemLootLaserBig_07
+icon: ItemLootLaserGun_7
 id: laser_7
 slot: MainGun
 tag: laser
 tier: '7'
diff --git config_180523_1200/Items/laser/laser_8.txt config_180529_2118/Items/laser/laser_8.txt
index b9f5388..a3b8c46 100644
--- config_180523_1200/Items/laser/laser_8.txt
+++ config_180529_2118/Items/laser/laser_8.txt
@@ -46,10 +46,10 @@ gunMounts:
   sfx:
     sound: laser
     volume: '0.5'
   syncOffset: '0.0'
   syncTo: laser8_mount
-icon: ItemLootLaserBig_08
+icon: ItemLootLaserGun_8
 id: laser_8
 slot: MainGun
 tag: laser
 tier: '8'
diff --git config_180523_1200/Items/laser/laser_9.txt config_180529_2118/Items/laser/laser_9.txt
index f3438cd..f87240f 100644
--- config_180523_1200/Items/laser/laser_9.txt
+++ config_180529_2118/Items/laser/laser_9.txt
@@ -25,10 +25,10 @@ gunMounts:
   mountName: laser9_mount
   sfx:
     pitch: '0.8'
     sound: laser
     volume: '0.8'
-icon: ItemLootLaserBig_09
+icon: ItemLootLaserGun_9
 id: laser_9
 slot: MainGun
 tag: laser
 tier: '9'
diff --git config_180523_1200/Items/mine/mine_0.txt config_180529_2118/Items/mine/mine_0.txt
index 6b43dcb..b57b450 100644
--- config_180523_1200/Items/mine/mine_0.txt
+++ config_180529_2118/Items/mine/mine_0.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine
-icon: ItemLoot_Turret_0
+icon: ItemLootMine_0
 id: mine_0
 slot: SecondaryAttack
 tag: mine
 tier: '0'
diff --git config_180523_1200/Items/mine/mine_1.txt config_180529_2118/Items/mine/mine_1.txt
index e850fc3..c594d78 100644
--- config_180523_1200/Items/mine/mine_1.txt
+++ config_180529_2118/Items/mine/mine_1.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine1
-icon: ItemLoot_Turret_1
+icon: ItemLootMine_1
 id: mine_1
 slot: SecondaryAttack
 tag: mine
 tier: '1'
diff --git config_180523_1200/Items/mine/mine_2.txt config_180529_2118/Items/mine/mine_2.txt
index 6446779..93d627e 100644
--- config_180523_1200/Items/mine/mine_2.txt
+++ config_180529_2118/Items/mine/mine_2.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine2
-icon: ItemLoot_Turret_2
+icon: ItemLootMine_2
 id: mine_2
 slot: SecondaryAttack
 tag: mine
 tier: '2'
diff --git config_180523_1200/Items/mine/mine_3.txt config_180529_2118/Items/mine/mine_3.txt
index 82fe798..50773a3 100644
--- config_180523_1200/Items/mine/mine_3.txt
+++ config_180529_2118/Items/mine/mine_3.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine3
-icon: ItemLoot_Turret_3
+icon: ItemLootMine_3
 id: mine_3
 slot: SecondaryAttack
 tag: mine
 tier: '3'
diff --git config_180523_1200/Items/mine/mine_4.txt config_180529_2118/Items/mine/mine_4.txt
index 3d03a86..a2dcf34 100644
--- config_180523_1200/Items/mine/mine_4.txt
+++ config_180529_2118/Items/mine/mine_4.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine4
-icon: ItemLoot_Turret_4
+icon: ItemLootMine_4
 id: mine_4
 slot: SecondaryAttack
 tag: mine
 tier: '4'
diff --git config_180523_1200/Items/mine/mine_5.txt config_180529_2118/Items/mine/mine_5.txt
index 83926b6..2dae33d 100644
--- config_180523_1200/Items/mine/mine_5.txt
+++ config_180529_2118/Items/mine/mine_5.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine5
-icon: ItemLoot_Turret_5
+icon: ItemLootMine_5
 id: mine_5
 slot: SecondaryAttack
 tag: mine
 tier: '5'
diff --git config_180523_1200/Items/mine/mine_6.txt config_180529_2118/Items/mine/mine_6.txt
index 3ec6caf..3a52169 100644
--- config_180523_1200/Items/mine/mine_6.txt
+++ config_180529_2118/Items/mine/mine_6.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine6
-icon: ItemLoot_Turret_6
+icon: ItemLootMine_6
 id: mine_6
 slot: SecondaryAttack
 tag: mine
 tier: '6'
diff --git config_180523_1200/Items/mine/mine_7.txt config_180529_2118/Items/mine/mine_7.txt
index 387a441..37418e4 100644
--- config_180523_1200/Items/mine/mine_7.txt
+++ config_180529_2118/Items/mine/mine_7.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine7
-icon: ItemLoot_Turret_7
+icon: ItemLootMine_7
 id: mine_7
 slot: SecondaryAttack
 tag: mine
 tier: '7'
diff --git config_180523_1200/Items/mine/mine_8.txt config_180529_2118/Items/mine/mine_8.txt
index 41ff7f3..d82c8c9 100644
--- config_180523_1200/Items/mine/mine_8.txt
+++ config_180529_2118/Items/mine/mine_8.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine8
-icon: ItemLoot_Turret_8
+icon: ItemLootMine_8
 id: mine_8
 slot: SecondaryAttack
 tag: mine
 tier: '8'
diff --git config_180523_1200/Items/mine/mine_9.txt config_180529_2118/Items/mine/mine_9.txt
index 36719b1..db0c2d1 100644
--- config_180523_1200/Items/mine/mine_9.txt
+++ config_180529_2118/Items/mine/mine_9.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allymine9
-icon: ItemLoot_Turret_9
+icon: ItemLootMine_9
 id: mine_9
 slot: SecondaryAttack
 tag: mine
 tier: '9'
diff --git config_180523_1200/Items/mine/mine_lava.txt config_180529_2118/Items/mine/mine_lava.txt
index b9c1295..5b59a76 100644
--- config_180523_1200/Items/mine/mine_lava.txt
+++ config_180529_2118/Items/mine/mine_lava.txt
@@ -7,10 +7,10 @@ actions:
     offset:
       angle: '0'
       distance: '0.0'
       isRelative: 'true'
     unit: allyminelava
-icon: ItemLoot_Turret_10
+icon: ItemLootMine_10
 id: mine_lava
 slot: SecondaryAttack
 tag: mine
 tier: '100'
diff --git config_180523_1200/Items/stunner/stunner_0.txt config_180529_2118/Items/stunner/stunner_0.txt
index 65a97c8..06f9e5e 100644
--- config_180523_1200/Items/stunner/stunner_0.txt
+++ config_180529_2118/Items/stunner/stunner_0.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_0
     sfx:
       sound: laser
-icon: ItemLootLaserBig_0
+icon: ItemLootStunner_0
 id: stunner_0
 slot: SecondaryAttack
 tag: stunner
 tier: '0'
diff --git config_180523_1200/Items/stunner/stunner_1.txt config_180529_2118/Items/stunner/stunner_1.txt
index 41ca949..5570461 100644
--- config_180523_1200/Items/stunner/stunner_1.txt
+++ config_180529_2118/Items/stunner/stunner_1.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_1
     sfx:
       sound: laser
-icon: ItemLootLaserBig_01
+icon: ItemLootStunner_1
 id: stunner_1
 slot: SecondaryAttack
 tag: stunner
 tier: '1'
diff --git config_180523_1200/Items/stunner/stunner_10.txt config_180529_2118/Items/stunner/stunner_10.txt
index 2ee33b5..bd999ed 100644
--- config_180523_1200/Items/stunner/stunner_10.txt
+++ config_180529_2118/Items/stunner/stunner_10.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_10
     sfx:
       sound: laser
-icon: ItemLootLaserBig_10
+icon: ItemLootStunner_10
 id: stunner_10
 slot: SecondaryAttack
 tag: stunner
 tier: '10'
diff --git config_180523_1200/Items/stunner/stunner_2.txt config_180529_2118/Items/stunner/stunner_2.txt
index 4f94279..a0edd25 100644
--- config_180523_1200/Items/stunner/stunner_2.txt
+++ config_180529_2118/Items/stunner/stunner_2.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_2
     sfx:
       sound: laser
-icon: ItemLootLaserBig_02
+icon: ItemLootStunner_2
 id: stunner_2
 slot: SecondaryAttack
 tag: stunner
 tier: '2'
diff --git config_180523_1200/Items/stunner/stunner_3.txt config_180529_2118/Items/stunner/stunner_3.txt
index 5b27ed8..adc1050 100644
--- config_180523_1200/Items/stunner/stunner_3.txt
+++ config_180529_2118/Items/stunner/stunner_3.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_3
     sfx:
       sound: laser
-icon: ItemLootLaserBig_03
+icon: ItemLootStunner_3
 id: stunner_3
 slot: SecondaryAttack
 tag: stunner
 tier: '3'
diff --git config_180523_1200/Items/stunner/stunner_4.txt config_180529_2118/Items/stunner/stunner_4.txt
index 2a4bfd8..c8d9761 100644
--- config_180523_1200/Items/stunner/stunner_4.txt
+++ config_180529_2118/Items/stunner/stunner_4.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_4
     sfx:
       sound: laser
-icon: ItemLootLaserBig_04
+icon: ItemLootStunner_4
 id: stunner_4
 slot: SecondaryAttack
 tag: stunner
 tier: '4'
diff --git config_180523_1200/Items/stunner/stunner_5.txt config_180529_2118/Items/stunner/stunner_5.txt
index 15bc5c4..a373fd8 100644
--- config_180523_1200/Items/stunner/stunner_5.txt
+++ config_180529_2118/Items/stunner/stunner_5.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_5
     sfx:
       sound: laser
-icon: ItemLootLaserBig_05
+icon: ItemLootStunner_5
 id: stunner_5
 slot: SecondaryAttack
 tag: stunner
 tier: '5'
diff --git config_180523_1200/Items/stunner/stunner_6.txt config_180529_2118/Items/stunner/stunner_6.txt
index 61d7184..054d070 100644
--- config_180523_1200/Items/stunner/stunner_6.txt
+++ config_180529_2118/Items/stunner/stunner_6.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_6
     sfx:
       sound: laser
-icon: ItemLootLaserBig_06
+icon: ItemLootStunner_6
 id: stunner_6
 slot: SecondaryAttack
 tag: stunner
 tier: '6'
diff --git config_180523_1200/Items/stunner/stunner_7.txt config_180529_2118/Items/stunner/stunner_7.txt
index cb2819c..eca84bf 100644
--- config_180523_1200/Items/stunner/stunner_7.txt
+++ config_180529_2118/Items/stunner/stunner_7.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_7
     sfx:
       sound: laser
-icon: ItemLootLaserBig_07
+icon: ItemLootStunner_7
 id: stunner_7
 slot: SecondaryAttack
 tag: stunner
 tier: '7'
diff --git config_180523_1200/Items/stunner/stunner_8.txt config_180529_2118/Items/stunner/stunner_8.txt
index 52fc1cc..a220e36 100644
--- config_180523_1200/Items/stunner/stunner_8.txt
+++ config_180529_2118/Items/stunner/stunner_8.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_8
     sfx:
       sound: laser
-icon: ItemLootLaserBig_08
+icon: ItemLootStunner_8
 id: stunner_8
 slot: SecondaryAttack
 tag: stunner
 tier: '8'
diff --git config_180523_1200/Items/stunner/stunner_9.txt config_180529_2118/Items/stunner/stunner_9.txt
index 78a40c6..99b09d5 100644
--- config_180523_1200/Items/stunner/stunner_9.txt
+++ config_180529_2118/Items/stunner/stunner_9.txt
@@ -30,10 +30,10 @@ actions:
       speed: '3.0'
       spread: '0'
     mountName: stunner_9
     sfx:
       sound: laser
-icon: ItemLootLaserBig_09
+icon: ItemLootStunner_9
 id: stunner_9
 slot: SecondaryAttack
 tag: stunner
 tier: '9'
diff --git config_180523_1200/Items/sword/sword_0.txt config_180529_2118/Items/sword/sword_0.txt
index 51b77c1..3d223f4 100644
--- config_180523_1200/Items/sword/sword_0.txt
+++ config_180529_2118/Items/sword/sword_0.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword0_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_0
 id: sword_0
 slot: MainGun
 tag: sword
 tier: '0'
diff --git config_180523_1200/Items/sword/sword_1.txt config_180529_2118/Items/sword/sword_1.txt
index 474e77a..d15080e 100644
--- config_180523_1200/Items/sword/sword_1.txt
+++ config_180529_2118/Items/sword/sword_1.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword1_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_01
 id: sword_1
 slot: MainGun
 tag: sword
 tier: '1'
diff --git config_180523_1200/Items/sword/sword_10.txt config_180529_2118/Items/sword/sword_10.txt
index b7cb17d..6db7cd1 100644
--- config_180523_1200/Items/sword/sword_10.txt
+++ config_180529_2118/Items/sword/sword_10.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword10_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_10
 id: sword_10
 slot: MainGun
 tag: sword
 tier: '10'
diff --git config_180523_1200/Items/sword/sword_2.txt config_180529_2118/Items/sword/sword_2.txt
index 1644783..606d0f2 100644
--- config_180523_1200/Items/sword/sword_2.txt
+++ config_180529_2118/Items/sword/sword_2.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword2_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_02
 id: sword_2
 slot: MainGun
 tag: sword
 tier: '2'
diff --git config_180523_1200/Items/sword/sword_3.txt config_180529_2118/Items/sword/sword_3.txt
index e8a7ab1..061dc19 100644
--- config_180523_1200/Items/sword/sword_3.txt
+++ config_180529_2118/Items/sword/sword_3.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword3_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_03
 id: sword_3
 slot: MainGun
 tag: sword
 tier: '3'
diff --git config_180523_1200/Items/sword/sword_4.txt config_180529_2118/Items/sword/sword_4.txt
index 16336c7..18bea38 100644
--- config_180523_1200/Items/sword/sword_4.txt
+++ config_180529_2118/Items/sword/sword_4.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword4_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_04
 id: sword_4
 slot: MainGun
 tag: sword
 tier: '4'
diff --git config_180523_1200/Items/sword/sword_5.txt config_180529_2118/Items/sword/sword_5.txt
index db88312..76471f8 100644
--- config_180523_1200/Items/sword/sword_5.txt
+++ config_180529_2118/Items/sword/sword_5.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword5_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_05
 id: sword_5
 slot: MainGun
 tag: sword
 tier: '5'
diff --git config_180523_1200/Items/sword/sword_6.txt config_180529_2118/Items/sword/sword_6.txt
index e43e4e7..9e71b02 100644
--- config_180523_1200/Items/sword/sword_6.txt
+++ config_180529_2118/Items/sword/sword_6.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword6_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_06
 id: sword_6
 slot: MainGun
 tag: sword
 tier: '6'
diff --git config_180523_1200/Items/sword/sword_7.txt config_180529_2118/Items/sword/sword_7.txt
index d904771..5a4e540 100644
--- config_180523_1200/Items/sword/sword_7.txt
+++ config_180529_2118/Items/sword/sword_7.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword7_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_07
 id: sword_7
 slot: MainGun
 tag: sword
 tier: '7'
diff --git config_180523_1200/Items/sword/sword_8.txt config_180529_2118/Items/sword/sword_8.txt
index 6cbb746..ad59d23 100644
--- config_180523_1200/Items/sword/sword_8.txt
+++ config_180529_2118/Items/sword/sword_8.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword8_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_08
 id: sword_8
 slot: MainGun
 tag: sword
 tier: '8'
diff --git config_180523_1200/Items/sword/sword_9.txt config_180529_2118/Items/sword/sword_9.txt
index eb488bd..4357da4 100644
--- config_180523_1200/Items/sword/sword_9.txt
+++ config_180529_2118/Items/sword/sword_9.txt
@@ -72,10 +72,10 @@ actions:
     - '2.5'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword9_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_09
 id: sword_9
 slot: MainGun
 tag: sword
 tier: '9'
diff --git config_180523_1200/Quests/quests_bosses.txt config_180529_2118/Quests/quests_bosses.txt
index e4eaf6d..abfe99a 100644
--- config_180523_1200/Quests/quests_bosses.txt
+++ config_180529_2118/Quests/quests_bosses.txt
@@ -1,305 +1,193 @@
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - tank
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: tank
   id: overworldboss_tank
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - tank
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '3'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - clockboss
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: clockboss
   id: overworldboss_clockboss
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - clockboss
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '3'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - crawler
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: crawler
   id: overworldboss_crawler
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - crawler
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '3'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - berserker
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: berserker
   id: overworldboss_berserker
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - berserker
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '4'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - teslahq
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: teslahq
   id: overworldboss_teslahq
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - teslahq
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '4'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - gargantua
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: gargantua
   id: overworldboss_gargantua
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - gargantua
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '5'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - pharaoh
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: pharaoh
   id: overworldboss_pharaoh
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - pharaoh
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '5'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - bosstrain01
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: bosstrain01
   id: overworldboss_bosstrain01
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - bosstrain01
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '6'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - jester
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: jester
   id: overworldboss_jester
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - jester
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '7'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - hypnotist
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: hypnotist
   id: overworldboss_hypnotist
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - hypnotist
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '8'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - sprinkles
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: sprinkles
   id: overworldboss_sprinkles
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - sprinkles
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '9'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - notra
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: notra
   id: overworldboss_notra
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - notra
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '10'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - solarissun
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: solarissun
   id: overworldboss_solarissun
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - solarissun
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '10'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - ufo
-  goals:
+- goals:
   - target: '1'
     type: kill
     units:
     - id: ufo
   id: overworldboss_ufo
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
-  - ufo
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
diff --git config_180523_1200/Quests/quests_daily.txt config_180529_2118/Quests/quests_daily.txt
index e05f92a..5e1c05f 100644
--- config_180523_1200/Quests/quests_daily.txt
+++ config_180529_2118/Quests/quests_daily.txt
@@ -1,58 +1,40 @@
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - DQ_SP_2XMID_gasstation_turret
-  - DQ_SP_2XMID_gasstation_gastank
-  - DQ_SP_2XMID_gasstation_command
-  autoComplete: 'false'
+- autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - setpiece: DQ_SP_2XMID_gasstation
     target: '1'
     type: kill
     units:
     - id: DQ_SP_2XMID_gasstation_command
   id: DQ_SP_2XMID_gasstation
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
+  joinActivateUnits:
   - DQ_SP_2XMID_gasstation_turret
   - DQ_SP_2XMID_gasstation_gastank
   - DQ_SP_2XMID_gasstation_command
   permanent: 'false'
   replayConfig: immediate
   requirements:
     planeLevelMax: '8'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '3'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - DQ_SP_5XHMT_heist_turret
-  - DQ_SP_5XHMT_heist_riotguard
-  - DQ_SP_5XHMT_heist_barracks
-  - DQ_SP_5XHMT_heist_barracksguard
-  - DQ_SP_5XHMT_heist_treasure
-  autoComplete: 'false'
+- autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
     - id: quest_botcoins
     setpiece: DQ_SP_5XHMT_heist
     target: '1'
     type: collect
     units:
     - id: DQ_SP_5XHMT_heist_treasure
   id: DQ_SP_5XHMT_heist
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
+  joinActivateUnits:
   - DQ_SP_5XHMT_heist_turret
   - DQ_SP_5XHMT_heist_riotguard
   - DQ_SP_5XHMT_heist_barracks
   - DQ_SP_5XHMT_heist_barracksguard
   - DQ_SP_5XHMT_heist_treasure
@@ -64,31 +46,22 @@
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '8'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - DQ_SP_5XHMT_mine_snakemancer
-  - DQ_SP_5XHMT_mine_snakemancersnake01
-  - DQ_SP_5XHMT_mine_thumper
-  - DQ_SP_5XHMT_mine_treasure
-  autoComplete: 'false'
+- autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
     - id: quest_ancient_idol
     setpiece: DQ_SP_5XHMT_mine
     target: '1'
     type: collect
     units:
     - id: DQ_SP_5XHMT_mine_treasure
   id: DQ_SP_5XHMT_mine
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
+  joinActivateUnits:
   - DQ_SP_5XHMT_mine_snakemancer
   - DQ_SP_5XHMT_mine_snakemancersnake01
   - DQ_SP_5XHMT_mine_thumper
   - DQ_SP_5XHMT_mine_treasure
   permanent: 'false'
@@ -537,11 +510,11 @@
 - goals:
   - fallbackGuidanceTargets:
     - tunaleader
     items:
     - id: quest_prison_box
-    target: '1'
+    target: '3'
     type: collect
     units:
     - id: tuna
   id: DQ_CX_41MTN_tuna_T7
   listSortPriority: '-10000'
@@ -680,25 +653,19 @@
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '3'
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - DQ_KS_22MID_trainB01
-  autoComplete: 'false'
+- autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - target: '3'
     type: kill
     units:
     - id: DQ_KS_22MID_trainB01
   id: DQ_KS_22MID_trainB01
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
+  joinActivateUnits:
   - DQ_KS_22MID_trainB01
   listSortPriority: '-10000'
   replayConfig: immediate
   requirements:
     planeLevelMax: '8'
diff --git config_180523_1200/Quests/quests_escort.txt config_180529_2118/Quests/quests_escort.txt
index d60f311..97530a1 100644
--- config_180523_1200/Quests/quests_escort.txt
+++ config_180529_2118/Quests/quests_escort.txt
@@ -1,24 +1,18 @@
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - escort_01_escortmission
-  autoComplete: 'false'
+- autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - fallbackGuidanceTargets:
     - escort_01_escortmission
     - escort_01_startbutton
     - escort_01_master
     target: '1'
     type: encounter
     units:
     - id: escort_01_reward
   id: escort_01
-  joinGoalUnits: 'true'
-  joinTimeout: '8'
-  joinUnits:
+  joinActivateUnits:
   - escort_01_escortmission
   listSortPriority: '-10000'
   replayConfig: immediate
   requirements:
     planeLevelMax: '20'
diff --git config_180523_1200/Quests/quests_test.txt config_180529_2118/Quests/quests_test.txt
index a71f61c..eb61afa 100644
--- config_180523_1200/Quests/quests_test.txt
+++ config_180529_2118/Quests/quests_test.txt
@@ -1,39 +1,65 @@
-- activateGoalUnits: 'true'
-  activateTimeout: '10'
-  activateUnits:
-  - bombbarrel
+- activateTimeout: '10'
   goals:
   - items:
     - id: quest_ambergris
     target: '3'
     type: collect
     units:
     - id: husky
-  id: collect_ambergris
-  joinGoalUnits: 'true'
+  id: test_collect
+  joinActivateGoalUnits: 'true'
+  joinActivateUnits:
+  - bombbarrel
   joinRequirements:
     isAdmin: 'true'
     planeLevelMin: '10'
   joinTimeout: '8'
-  joinUnits:
-  - bombbarrel
   rewardTier: '5'
   source: giver
   tier: '10'
 - completeAtGiver: tavern
   goals:
   - items:
     - id: quest_tooth
     - id: quest_bone
     target: '2'
     type: collect
     units:
     - id: centipede01
-  id: collect_basic
+  id: test_basic
   source: giver
   tier: '10'
+- goals:
+  - items:
+    - id: quest_tooth
+    - id: quest_bone
+    target: '2'
+    type: collect
+    units:
+    - id: centipede01
+  - target: '1'
+    type: encounter
+    units:
+    - id: iceboss
+  id: test_template
+  template: 'true'
+  tier: '10'
+- completeAtGiver: tavern
+  goals:
+  - target: '10'
+    type: encounter
+    units:
+    - id: centipede01
+  id: test_inherit
+  inherit:
+  - test_template
+  source: giver
+- id: test_inherit_t2
+  inherit:
+  - test_inherit
+  tier: '2'
 - autoComplete: 'true'
   goals:
   - dungeon:
       id: DungeonIce
     target: '1'
diff --git config_180523_1200/Texts/en-US/bark.txt config_180529_2118/Texts/en-US/bark.txt
index e02535c..b951ed6 100644
--- config_180523_1200/Texts/en-US/bark.txt
+++ config_180529_2118/Texts/en-US/bark.txt
@@ -133,11 +133,11 @@ DQ_CX_41MTN_tuna_T7_firstencounter:
   - text: 'No slaves here!
 
       In late capitalism, contracts are binding.'
 DQ_CX_41MTN_tuna_T7_sgt_start:
   randomOptions:
-  - text: That boy owes me from our last poker game. You better bring him back or there’ll be hell to pay.
+  - text: Those boys owe me from our last poker game. You better bring them back or there’ll be hell to pay.
 DQ_CX_51HMT_dragonmama_T8_encounter:
   randomOptions:
   - text: Die. Little. Birds.
   - text: You. Are. Meat.
   - text: Not. Worthy. Of. Dinner.
diff --git config_180523_1200/Texts/en-US/item.txt config_180529_2118/Texts/en-US/item.txt
index 934a34f..2e53a07 100644
--- config_180523_1200/Texts/en-US/item.txt
+++ config_180529_2118/Texts/en-US/item.txt
@@ -59,10 +59,16 @@ armor_water:
   description: Cat lords wear this during parades to avoid any chance of being rained upon.
   name: Storm Armor
 assaultSniper_1:
   description: Assault Sniper Rifle.
   name: Assault Sniper Rifle
+consumable_steam:
+  description: Emergency steam supply. Limited use since it is basically a small explosive that instantly vaporizes water. Starts with 5 charges.
+  name: Steam Canister
+consumable_xpboost:
+  description: When memorized, the pilot's mind flows with the Great Words. They learn faster. Double XP for 30 minutes. Single use.
+  name: Meditation on Experience
 damage_0:
   description: Powers up ally weapons.
   name: Aura of Attack
 damage_1:
   description: Powers up ally weapons.
@@ -572,10 +578,13 @@ health7:
   name: Ultra Repair Patch
 health8:
   name: Advanced Repair Patch
 health9:
   name: Advanced Repair Patch
+health_boost:
+  description: Limited use repair kit. Starts with 5 charges.
+  name: Repair Kit
 item_olfaithful_pax03:
   description: This item, if equipped, unlocks the PAX 03 variant for Old Faithful.
   name: PAX 03 UNLOCK
 key_arena1:
   description: Teleport coordinates to the cruel Imperial Arena. Activate to summon a drop ship.
@@ -929,11 +938,11 @@ quest_fisher_crab_parts:
   name: Fisher Crab Parts
 quest_flamer_tank:
   description: Highly Flammable Fuel. Smells like uncooked marshmallow.
   name: Flamer Tank
 quest_kinetic_sphere_core:
-  description: Even though it's only the size of a water melon, it can act as a giant wrecking ball when the kinetic energy field is activated.
+  description: Even though it's only the size of a watermelon, it can act as a giant wrecking ball when the kinetic energy field is activated.
   name: Kinetic Sphere Core
 quest_list_of_names:
   description: It's a list of names; Most of them are crossed off.  It's also has a disturbing amount of blood on it.
   name: List of Names
 quest_moose_meat_horde:
diff --git config_180523_1200/Texts/en-US/planeclasses.txt config_180529_2118/Texts/en-US/planeclasses.txt
index efb1768..183a263 100644
--- config_180523_1200/Texts/en-US/planeclasses.txt
+++ config_180529_2118/Texts/en-US/planeclasses.txt
@@ -42,14 +42,14 @@ duster:
       name: Duster
 engineer:
   name: Engineer
   variants:
     VariantA:
-      flavor: ''
+      flavor: A master engineer selects the right tool for the job. Or dynamite. Both work, for varying definitions of 'work'.
       name: Specialist
     VariantB:
-      flavor: ''
+      flavor: The Docks used a thousand different types of gears. Small brass ones, immense stone ones. A vast whirring steam ecosystem, turning, driving, breaking and building. The coggers loved them all. One day, they will rebuild them.
       name: Cogger
     default:
       flavor: 'Before the great aerial Docks burned, engineering planes helped build the legendary floating capital ships. Now, they deploy drones in direct combat. '
       name: Engineer
 medic:
@@ -114,24 +114,30 @@ olfaithful:
       name: Chill Faithful
 paladin:
   name: Paladin
   variants:
     VariantA:
-      flavor: ''
+      flavor: The burly birds of the Northern forests use these rigs to haul logs. Fueled by flapjacks.
       name: Lumberjack
     VariantB:
-      flavor: ''
+      flavor: When the fire's low and the whiskey's half gone, they whisper tales. Once there was a bird, as tall as a mountain. With his trusty blue fox.
       name: Bunyan
     default:
       flavor: More mecha than plane, the steam-hungry Paladin slices through swathes of enemies with a signature 50-foot plasma chainsaw.
       name: Paladin
 pirate:
-  name: Pirate
+  name: Bandit
   variants:
+    VariantA:
+      flavor: In the western canyons, small bands eke out a harsh living preying on caravans. Fear the growing whine of an unseen sandbike.
+      name: Maurauder
+    VariantB:
+      flavor: Beware chipped beaks and jewel-crusted eye-patches. Do they dye those brilliant feathers? No. They pluck them from your corpse.
+      name: Scallywag
     default:
-      flavor: We sanction privateers as long as they make the Empires life worse than they make ours. Scrappy in all senses of the word.
-      name: Pirate
+      flavor: We sanction privateers as long as they make the Empire's life worse than they make ours. 'Scrappy' in all senses of the word.
+      name: Bandit
 rapier:
   name: Raptor
   variants:
     VariantA:
       flavor: ''
@@ -192,13 +198,13 @@ walker:
       name: Quad
 wizard:
   name: Merlin
   variants:
     VariantA:
-      flavor: ''
+      flavor: '***WARNING*** THE EXISTENCE OF THIS DEVICE IS CLASSIFIED. REPORT IMMEDIATELY TO DNO [NEED TO KNOW] FOR MINDWIPE'
       name: Unidentified
     VariantB:
-      flavor: ''
+      flavor: '[REDACTED] used the mechanism in the failed fulcrum point assasination June 5th, 18XX. Wreckage analysis suggests extra-historical origins.'
       name: X54
     default:
-      flavor: This highly experimental class uses a miniaturized teleportation apparatus to pop about the combat zone. Its egghead pilots are derisively known as wizkids.
+      flavor: This highly experimental class uses a miniaturized teleportation apparatus to pop about the combat zone. The egghead pilots are derisively known as wizkids.
       name: Merlin
diff --git config_180523_1200/Texts/en-US/quests.txt config_180529_2118/Texts/en-US/quests.txt
index c761c2a..a58efc5 100644
--- config_180523_1200/Texts/en-US/quests.txt
+++ config_180529_2118/Texts/en-US/quests.txt
@@ -60,11 +60,11 @@ DQ_CX_33HGH_blinks_T5:
   title: Dancing Lights
 DQ_CX_41MTN_dragonmama_T8:
   description: Guard Lion claws are being reused on replacement machines even after we shoot them down. Go collect some trophies.
   title: Declawing
 DQ_CX_41MTN_tuna_T7:
-  description: The Captain just learned that his brother was captured in a raid gone wrong. He's got to be on one of of the slaver ships.
+  description: The Captain just learned that his 3 brothers were captured in a raid gone wrong. They've got to be on one of the slaver ships.
   title: O Brother
 DQ_CX_51HMT_highmountainhunter:
   description: We've received numerous reports of Inquisitors raiding villages and rounding up non-believers of the cats' bogus religion. Collect the Eye of Meowza insignia they carry so our spies can use them to infiltrate the Office of Inquisition.
   title: Meowzan Inquisition
 DQ_CX_51HMT_ninjaleader:
@@ -529,16 +529,10 @@ basic_kill_x_506_highmountains_T8_hammerplanet2:
   description: Kill 5 of the designated target!
   title: 'Hunt: Crowd Control'
 basic_kill_x_507_highmountains_T8_hyperdrive:
   description: Kill 5 of the designated target!
   title: 'Hunt: Assassin'
-collect_ambergris:
-  description: Go find and collect some fabled Ambergris for a small reward
-  title: Collect Ambergris
-collect_basic:
-  description: Find stuff and we'll give you stuff, it's simple
-  title: Collect Stuff
 dailyreward_Friday:
   description: Claim your daily reward here!
   title: 'Daily Reward: Friday'
 dailyreward_Monday:
   description: Claim your daily reward here!
@@ -605,26 +599,42 @@ overworldboss_ufo:
   description: Kill the designated target!
   title: 'Bounty: Ambassador'
 test_auto:
   description: Just a test
   title: Test Auto Quest
+test_basic:
+  description: Find stuff and we'll give you stuff, it's simple
+  dialogueOnComplete:
+  - sergeant: Your reward.
+  dialogueOnCompleteGoal0:
+  - sergeant:
+    - Good job.
+    - That's the spirit.
+    - Well done.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1: Back off, this is MY whale grease!
+  - sergeant: Don't listen to them!
+  - catsoldier1: :'(
+  dialogueOnStart:
+  - sergeant: You've accepted the mission.
+  title: Collect Stuff
+test_collect:
+  description: Go find and collect some fabled Ambergris for a small reward
+  title: Collect Ambergris
 test_dungeon_ice:
   description: Testing dungeon spawning
   title: Test Dungeon Ice
 test_permanent_giver:
   description: Just a test
   goal_0: Discover a <color=#FBB040>Klaxon</color>
   title: Test Permanent Giver Quest
 test_spawn_piece:
   description: Testing setpiece spawning
   title: Test Setpieces
 test_trigger:
   description: Just a test
   title: Test Triggered Quest
-tut_0:
-  description: Learning is fun!
-  title: Tutorial 1
 tut_01:
   description: Hunt down the Scavenger Convoys in the dead capitol.
   title: First Contract
 tut_01_2:
   description: We've got new intel...Head back to the <color=#FBB040>Pub</color>.
@@ -641,8 +651,5 @@ tut_04:
   title: Find the Supply Depot
 tut_05:
   description: Destroy the secret Imperial fort.
   goal_0: Clear out the <color=#FBB040>Catipede Nest</color>.
   title: Catipede Central
-tut_1:
-  description: Learning is fun!
-  title: Tutorial 2
diff --git config_180523_1200/Texts/en-US/store.txt config_180529_2118/Texts/en-US/store.txt
index 52c2bc8..547c51e 100644
--- config_180523_1200/Texts/en-US/store.txt
+++ config_180529_2118/Texts/en-US/store.txt
@@ -84,5 +84,6 @@ section_name_general_dye: Paint Shop
 section_name_general_variant: Plane Variants
 steam_payment_category: Currency
 store_name_store_general: General Store
 store_name_store_hangar: Hangar Store
 store_name_store_storage: Storage Store
+timer: '{0} to go'
diff --git config_180523_1200/Texts/en-US/ui.txt config_180529_2118/Texts/en-US/ui.txt
index cdf9602..986f417 100644
--- config_180523_1200/Texts/en-US/ui.txt
+++ config_180529_2118/Texts/en-US/ui.txt
@@ -17,10 +17,13 @@ action_info_healthenergy_energy: Your steam gets recharged by {0}.
 action_info_healthenergy_health: You get healed by {0}.
 action_info_healthenergy_short_energy: +{0} Steam
 action_info_healthenergy_short_health: +{0} Healing
 action_info_maneuver: Maneuver
 action_info_minor_gun: Auxiliary Gun Mount {0}
+action_info_planexpboost: Plane XP Boost
+action_info_planexpboost_info: +{0}% XP for {1}
+action_info_planexpboost_short: '{0}% XP {1}'
 action_info_soulbound: Change Soulbound
 action_info_soulbound_add: By using this item it will get soulbound
 action_info_soulbound_remove: By using this item it will loose soulbound
 action_info_spawn: Drone Printer
 action_info_statboost: Timed Buff
@@ -45,10 +48,13 @@ button_hangar_variant_cancel: Back to Class Select
 capture_gif_done: You can find your GIF at {0}.
 capture_gif_error: GIF save failed. Sorry.
 capture_gif_start: Saving GIF...
 consumable_item_error_already_applied: You already applies this. Using it again would not change anything.
 consumable_item_error_already_unlocked: You already unlocked this item. You can not unlock it twice.
+consumable_item_error_dying: Consuming is not possible while dying.
+consumable_item_error_no_effect: Consuming this would not have any effect now.
+consumable_item_error_no_plane: You need a plane to consume an item.
 consumable_item_error_unknown: Failed to consume the item.
 consumable_item_unusable: Unusable
 death_crashed: Crashed
 death_enemy_line: 'by: {0}'
 death_plane_level: Plane Level
@@ -163,10 +169,11 @@ hint_cargo_full: '<color=#ffffff>Cargo Full!</color>
   Use Shift + number keys [<color=#ffff88ff>1-8</color>] to drop cargo you can''t use, or use [<color=#ffff88ff>~</color>] to drop all.'
 hint_v_inventory: 'Press <color=#FF9900>[<action:4>]</color> to hover
 
   and show Inventory.'
 hint_v_inventory_close: Press <color=#FF9900>[<action:4>]</color> to close the Inventory.
+info_currency_for_pilot_xp: You gained {0} {1} for getting {2} pilot xp.
 inventory_cargo: Cargo
 inventory_drop: Drop
 inventory_equip: Equip
 inventory_equipment: Equipment
 inventory_full_overlay: 'Inventory full!
@@ -350,10 +357,11 @@ notify_elemental_short: (ELEM)
 notify_equipped: <color=#{0}>Equipped</color>
 notify_equipped_auto: <color=#{0}>Auto-Equipped</color>
 notify_purchased: <color=#{0}>Purchased</color>
 notify_tier_short: (T{0})
 notify_ultrarare_short: (UR)
+onscreenindicator_target: TARGET
 options_bind: Rebind
 options_bind_unbound: You have unbound {0} from {1}
 options_menu_Return_Home: Return to Rebel City
 options_menu_SSAO: Ambient Occlusion
 options_menu_auto_equip: Auto Equip
@@ -478,10 +486,11 @@ plane_select_buyslot_header: '<color=#fffffff><b>Expand your hangar</b></color>
 plane_select_itemlist: '{0}: T{1} <color=#ffff88ff>{2}</color>'
 plane_select_newplane: New Plane
 plane_select_shortdesc: Level {0}
 plane_select_titleformat: <color=#B5A885FF><size=21><b>{0}</b></size></color>
 plane_select_unlocks: Unlocks at <color=#af4a30ff>{0} Level {1}</color>
+planexpboost_ui: +{0}% XP for {1}
 player_info_armor: Armor
 player_info_steam: Steam
 player_info_xp: Experience
 player_label: ' <color={1}>L{0}</color>'
 player_label_admin: ' <color={1}>L{0} A</color>'
@@ -598,10 +607,13 @@ storage_menu_title_storage: Storage Bays
 storage_menu_tooltip_buy: 'Add more storage spaces. Items stored in storage are still safe if your plane gets shot down.
 
   Price: {0}'
 store_popup_confirm_help: <color=#FBB040>[<action:43>]</color> Confirm
 store_popup_purchase_help: <color=#FBB040>[<action:43>]</color> Purchase
+timer_h: '{0} hours'
+timer_m: '{0} minutes'
+timer_s: '{0} seconds'
 title_hangar: Hangar
 title_hangar_newplane: 'Hangar: <b>New Plane</b>'
 title_hangar_variant: 'Hangar: <b>Select Plane Model</b>'
 title_inventory: Warehouse
 title_inventory_plane: 'Warehouse: Plane Cargo'
diff --git config_180523_1200/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_turret.txt config_180529_2118/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_turret.txt
index d36e831..c7f6496 100644
--- config_180523_1200/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_turret.txt	
+++ config_180529_2118/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_turret.txt	
@@ -30,16 +30,16 @@ gunMounts:
 gunTypes:
 - bulletPrefab: spinnerBullet
   burst: '6'
   cooldown: '10'
   damage: '1'
-  lifetime: '3'
+  lifetime: '2.4'
   multi: '1'
   multiSpread: '0'
   name: DQ_SP_5XHMT_heist_turretLaser
   rof: '2'
-  speed: '4'
+  speed: '5'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '12'
 maxSpeed: '1.5'
diff --git config_180523_1200/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistleft.txt config_180529_2118/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistleft.txt
index 765c44b..e76b5c4 100644
--- config_180523_1200/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistleft.txt	
+++ config_180529_2118/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistleft.txt	
@@ -1,12 +1,10 @@
 art: EnemyGargantuaHandB_Prefab
 artScale: '0.75'
 colliderRadius: '1.2'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistright.txt config_180529_2118/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistright.txt
index b1d8b0d..b35ea80 100644
--- config_180523_1200/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistright.txt	
+++ config_180529_2118/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuafistright.txt	
@@ -1,12 +1,10 @@
 art: EnemyGargantuaHandA_Prefab
 artScale: '0.75'
 colliderRadius: '1.2'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber01.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber01.txt
index 4b5829f..5dfc18b 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber01.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber01.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime01
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber02.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber02.txt
index 8a1cdf7..44e6ff5 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber02.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber02.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime02
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber03.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber03.txt
index 9d43b03..32d07c4 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber03.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber03.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime03
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber04.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber04.txt
index 0e661fa..c5c1125 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber04.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber04.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime04
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber05.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber05.txt
index 14aec96..165b432 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber05.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber05.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime05
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber06.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber06.txt
index 9ef6462..b0473a0 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber06.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber06.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime06
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber07.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber07.txt
index 3f7a5f4..0360370 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber07.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber07.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime07
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber08.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber08.txt
index a293169..8c277d8 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber08.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber08.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime08
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber09.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber09.txt
index 87c7190..1cacff8 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber09.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber09.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime09
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber10.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber10.txt
index 0fbc1ef..94bc919 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber10.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber10.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime10
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber11.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber11.txt
index 1de9e25..8121c0e 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber11.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber11.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime11
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber12.txt config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber12.txt
index 1074531..0717ca1 100644
--- config_180523_1200/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber12.txt	
+++ config_180529_2118/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber12.txt	
@@ -1,12 +1,10 @@
 art: EnemyClocktime12
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistleft.txt config_180529_2118/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistleft.txt
index 3871dfa..1065844 100644
--- config_180523_1200/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistleft.txt	
+++ config_180529_2118/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistleft.txt	
@@ -1,12 +1,10 @@
 art: EnemyGargantuaHandB_Prefab
 artScale: '1'
 colliderRadius: '1.2'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_180523_1200/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistright.txt config_180529_2118/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistright.txt
index 14e657d..2404e87 100644
--- config_180523_1200/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistright.txt	
+++ config_180529_2118/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuafistright.txt	
@@ -1,12 +1,10 @@
 art: EnemyGargantuaHandA_Prefab
 artScale: '1'
 colliderRadius: '1.2'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode.txt config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode.txt
index 3809d0c..8308fa5 100644
--- config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode.txt	
+++ config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode.txt	
@@ -1,12 +1,10 @@
 art: EnemyPharaohPyramid
 artScale: '1'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0'
diff --git config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_apex.txt config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_apex.txt
index 86f0c26..d0fcb8b 100644
--- config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_apex.txt	
+++ config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_apex.txt	
@@ -1,12 +1,10 @@
 art: EnemyPharaohPyramid
 artScale: '1'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0'
diff --git config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_singleblue.txt config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_singleblue.txt
index f9bfe89..607d91a 100644
--- config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_singleblue.txt	
+++ config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohpyramidnode_singleblue.txt	
@@ -1,12 +1,10 @@
 art: EnemyPharaohPyramid
 artScale: '1'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0'
diff --git config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/SLO2_sniper.txt config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/SLO2_sniper.txt
index e84a46f..a8c1d71 100644
--- config_180523_1200/Units/33 - Highlands (Rural) - Desert_Bones/SLO2_sniper.txt	
+++ config_180529_2118/Units/33 - Highlands (Rural) - Desert_Bones/SLO2_sniper.txt	
@@ -1,12 +1,10 @@
 art: EnemySniper
 artScale: '1.33'
 colliderRadius: '0.3'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0.4'
diff --git config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS2_treasureship.txt config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS2_treasureship.txt
index 1be0abc..0a282ba 100644
--- config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS2_treasureship.txt	
+++ config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS2_treasureship.txt	
@@ -1,12 +1,10 @@
 art: EnemyTreasureship
 artScale: '1'
 colliderRadius: '0.8'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: Hose
   firingArc: '360'
diff --git config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt
index b71ecf5..809c970 100644
--- config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt	
+++ config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyLobbyist
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '25'
 colliderRadius: '2.2'
diff --git config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt
index 6ff7587..0c4889e 100644
--- config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt	
+++ config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt	
@@ -1,12 +1,10 @@
 art: EnemyLobbyistMinion
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.33'
diff --git config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistpet.txt config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistpet.txt
index 5f3356a..224fa2c 100644
--- config_180523_1200/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistpet.txt	
+++ config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistpet.txt	
@@ -1,12 +1,10 @@
 art: EnemyLobbyistPet
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.33'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarismoon.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarismoon.txt
index 090c422..991daa5 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarismoon.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarismoon.txt	
@@ -2,12 +2,10 @@ art: EnemySolarisMinionB
 artScale: '1'
 bankSmoothing: '10000'
 colliderRadius: '0.8'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisplanet.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisplanet.txt
index 06e2e5c..762bb02 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisplanet.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisplanet.txt	
@@ -2,12 +2,10 @@ art: EnemySolarisMinionA
 artScale: '1'
 bankSmoothing: '10000'
 colliderRadius: '0.8'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.5'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisring.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisring.txt
index ad3756a..9cc4f77 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisring.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarisring.txt	
@@ -1,12 +1,10 @@
 art: EnemySolarisMinionRing
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt
index ae9364a..a65e422 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemySolarissunPrefab
 artScale: '1'
 bankSmoothing: '10000'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '25'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt
index 377dc6f..ff5d4a2 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyPoliticianPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '2'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt
index 25fa712..bc50f28 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyDoctorNotra
 artScale: '1'
 bankSmoothing: '100'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '25'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraminion.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraminion.txt
index 72abe6f..3f28a3b 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraminion.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraminion.txt	
@@ -1,12 +1,10 @@
 art: EnemyNotraSpecimen
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.33'
diff --git config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraremora.txt config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraremora.txt
index 81afbdd..80e453e 100644
--- config_180523_1200/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraremora.txt	
+++ config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraremora.txt	
@@ -1,12 +1,10 @@
 art: EnemyNotraAssistant
 artScale: '1'
 colliderRadius: '1.0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '180'
   flashOffset: '0.0'
diff --git config_180523_1200/Units/54 - Cancer Event/BOS1_spiderboss.txt config_180529_2118/Units/54 - Cancer Event/BOS1_spiderboss.txt
index 67453fb..9706207 100644
--- config_180523_1200/Units/54 - Cancer Event/BOS1_spiderboss.txt	
+++ config_180529_2118/Units/54 - Cancer Event/BOS1_spiderboss.txt	
@@ -1,5 +1,249 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.833'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.666'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.333'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.166'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyWhiteSpiderPrefab
 artScale: '1.0'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '25'
 colliderRadius: '1.9'
diff --git config_180523_1200/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt config_180529_2118/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt
index 16e1bd1..95425f6 100644
--- config_180523_1200/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt	
+++ config_180529_2118/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt	
@@ -1,6 +1,6 @@
-art: EnemyWhiteSpider
+art: EnemyWhiteSpiderPrefab
 artScale: '1.0'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '25'
 colliderRadius: '1.2'
 colliderX: '0'
diff --git config_180523_1200/Units/54 - Kaiju Event/BOS1_kaijuringminion.txt config_180529_2118/Units/54 - Kaiju Event/BOS1_kaijuringminion.txt
index 244b2c8..93cbc56 100644
--- config_180523_1200/Units/54 - Kaiju Event/BOS1_kaijuringminion.txt	
+++ config_180529_2118/Units/54 - Kaiju Event/BOS1_kaijuringminion.txt	
@@ -1,12 +1,10 @@
 art: EnemyKaijuTurret
 artScale: '1'
 colliderRadius: '0.8'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbosscloud.txt config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbosscloud.txt
index 7104e7e..39f3310 100644
--- config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbosscloud.txt	
+++ config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbosscloud.txt	
@@ -1,12 +1,10 @@
 art: '!EnemySmoke'
 artScale: '2'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbossgridleader.txt config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbossgridleader.txt
index 7c95394..5118b57 100644
--- config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbossgridleader.txt	
+++ config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbossgridleader.txt	
@@ -2,12 +2,10 @@ art: '!EnemyInvisible'
 artScale: '1.7'
 bankSmoothing: '10000'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
diff --git config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbosslightningwall.txt config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbosslightningwall.txt
index 0dfb284..12bbb44 100644
--- config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbosslightningwall.txt	
+++ config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbosslightningwall.txt	
@@ -2,12 +2,10 @@ art: EnemyUltraPouncer
 artScale: '1'
 bankSmoothing: '10000'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldblade.txt config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldblade.txt
index b024ee7..b7c231e 100644
--- config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldblade.txt	
+++ config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldblade.txt	
@@ -1,12 +1,10 @@
 art: EnemyHomingBomb_Prefab
 artScale: '0.8'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldbladeleader.txt config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldbladeleader.txt
index 814d457..5140175 100644
--- config_180523_1200/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldbladeleader.txt	
+++ config_180529_2118/Units/54 - Lightning Boss Event/BOS1_thunderbossshieldbladeleader.txt	
@@ -2,12 +2,10 @@ art: '!EnemyInvisible'
 artScale: '1.7'
 bankSmoothing: '10000'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '35'
diff --git config_180523_1200/Units/54 - Lightning Boss Event/BOS_thunderbeam.txt config_180529_2118/Units/54 - Lightning Boss Event/BOS_thunderbeam.txt
index 3bd1688..489f6e6 100644
--- config_180523_1200/Units/54 - Lightning Boss Event/BOS_thunderbeam.txt	
+++ config_180529_2118/Units/54 - Lightning Boss Event/BOS_thunderbeam.txt	
@@ -1,12 +1,10 @@
 art: EnemyUltraPouncer
 artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt config_180529_2118/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt
index c71bd04..c165c7a 100644
--- config_180523_1200/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt	
+++ config_180529_2118/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt	
@@ -1,5 +1,241 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.833'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.166'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyDragonSnake1Prefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '35'
 colliderRadius: '1.2'
diff --git config_180523_1200/Units/61D - Ice Dungeon/BOS_iceboss.txt config_180529_2118/Units/61D - Ice Dungeon/BOS_iceboss.txt
index f1b08e7..92cd02e 100644
--- config_180523_1200/Units/61D - Ice Dungeon/BOS_iceboss.txt	
+++ config_180529_2118/Units/61D - Ice Dungeon/BOS_iceboss.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyFrozenHorrorPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.1'
diff --git config_180523_1200/Units/61D - Ice Dungeon/unit_husky.txt config_180529_2118/Units/61D - Ice Dungeon/unit_husky.txt
index 7d80f8f..cde47b0 100644
--- config_180523_1200/Units/61D - Ice Dungeon/unit_husky.txt	
+++ config_180529_2118/Units/61D - Ice Dungeon/unit_husky.txt	
@@ -1,12 +1,10 @@
 art: EnemyHuskyPrefab
 artScale: '1'
 colliderRadius: '0.55'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
 energyRegenRate: '0'
 gunMounts:
diff --git config_180523_1200/Units/61D - Ice Dungeon/unit_huskyfreezing.txt config_180529_2118/Units/61D - Ice Dungeon/unit_huskyfreezing.txt
index 72600e9..35a5c36 100644
--- config_180523_1200/Units/61D - Ice Dungeon/unit_huskyfreezing.txt	
+++ config_180529_2118/Units/61D - Ice Dungeon/unit_huskyfreezing.txt	
@@ -1,11 +1,9 @@
 art: EnemyHuskyPrefab
 artScale: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
 energyRegenRate: '0'
 healthRegenRate: '0'
diff --git config_180523_1200/Units/61D - Ice Dungeon/unit_huskyfreezingminion.txt config_180529_2118/Units/61D - Ice Dungeon/unit_huskyfreezingminion.txt
index 02fab28..ef816ea 100644
--- config_180523_1200/Units/61D - Ice Dungeon/unit_huskyfreezingminion.txt	
+++ config_180529_2118/Units/61D - Ice Dungeon/unit_huskyfreezingminion.txt	
@@ -1,11 +1,9 @@
 art: EnemyHuskyPrefab
 artScale: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
 energyRegenRate: '0'
 healthRegenRate: '0'
diff --git config_180523_1200/Units/62D - Fire Dungeon/BOS1_phoenix1.txt config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix1.txt
index 67aed7b..91a0893 100644
--- config_180523_1200/Units/62D - Fire Dungeon/BOS1_phoenix1.txt	
+++ config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix1.txt	
@@ -1,5 +1,85 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '15'
 art: EnemyPhoenixInitial
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
diff --git config_180523_1200/Units/62D - Fire Dungeon/BOS1_phoenix3.txt config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix3.txt
index 615ea43..06f6f4d 100644
--- config_180523_1200/Units/62D - Fire Dungeon/BOS1_phoenix3.txt	
+++ config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix3.txt	
@@ -1,5 +1,85 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '15'
 art: EnemyPhoenix
 artScale: '1'
 colliderHeight: '2.8'
 colliderWidth: '4'
 effectImmunities:
diff --git config_180523_1200/Units/62D - Fire Dungeon/BOS1_phoenix5.txt config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix5.txt
index 98218f3..f433971 100644
--- config_180523_1200/Units/62D - Fire Dungeon/BOS1_phoenix5.txt	
+++ config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix5.txt	
@@ -1,5 +1,85 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '15'
 art: EnemyPhoenix
 artScale: '1'
 colliderHeight: '2.8'
 colliderWidth: '4'
 effectImmunities:
diff --git config_180523_1200/Units/65D - Grindhouse Dungeon/BOS_summoner.txt config_180529_2118/Units/65D - Grindhouse Dungeon/BOS_summoner.txt
index c8c4380..24f44ba 100644
--- config_180523_1200/Units/65D - Grindhouse Dungeon/BOS_summoner.txt	
+++ config_180529_2118/Units/65D - Grindhouse Dungeon/BOS_summoner.txt	
@@ -1,12 +1,10 @@
 art: EnemyBreeder
 artScale: '1'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig_NoDebris
diff --git config_180523_1200/Units/65D - Grindhouse Dungeon/BOS_summoner2.txt config_180529_2118/Units/65D - Grindhouse Dungeon/BOS_summoner2.txt
index 40aab95..0508f0c 100644
--- config_180523_1200/Units/65D - Grindhouse Dungeon/BOS_summoner2.txt	
+++ config_180529_2118/Units/65D - Grindhouse Dungeon/BOS_summoner2.txt	
@@ -1,12 +1,10 @@
 art: EnemyBreeder
 artScale: '1'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig_NoDebris
diff --git config_180523_1200/Units/65D - Grindhouse Dungeon/BOS_summoner3.txt config_180529_2118/Units/65D - Grindhouse Dungeon/BOS_summoner3.txt
index 0a38653..ef4a31e 100644
--- config_180523_1200/Units/65D - Grindhouse Dungeon/BOS_summoner3.txt	
+++ config_180529_2118/Units/65D - Grindhouse Dungeon/BOS_summoner3.txt	
@@ -1,12 +1,10 @@
 art: EnemyBreeder
 artScale: '1'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig_NoDebris
diff --git config_180523_1200/Units/66D - Space Dungeon/BOS1_avatar.txt config_180529_2118/Units/66D - Space Dungeon/BOS1_avatar.txt
index bda835f..262b62c 100644
--- config_180523_1200/Units/66D - Space Dungeon/BOS1_avatar.txt	
+++ config_180529_2118/Units/66D - Space Dungeon/BOS1_avatar.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyDoomsdayMechanismPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderHeight: '0'
diff --git config_180523_1200/Units/66D - Space Dungeon/BOS2_battlemechshieldbomb.txt config_180529_2118/Units/66D - Space Dungeon/BOS2_battlemechshieldbomb.txt
index 4b2067f..55bbd6f 100644
--- config_180523_1200/Units/66D - Space Dungeon/BOS2_battlemechshieldbomb.txt	
+++ config_180529_2118/Units/66D - Space Dungeon/BOS2_battlemechshieldbomb.txt	
@@ -1,12 +1,10 @@
 art: EnemyRoboMine
 artScale: '1'
 colliderRadius: '3'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/66D - Space Dungeon/unit_blocker4.txt config_180529_2118/Units/66D - Space Dungeon/unit_blocker4.txt
index b97a83f..5d395fa 100644
--- config_180523_1200/Units/66D - Space Dungeon/unit_blocker4.txt	
+++ config_180529_2118/Units/66D - Space Dungeon/unit_blocker4.txt	
@@ -1,12 +1,10 @@
 art: EnemySentinelB
 artScale: '1.0'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/66D - Space Dungeon/unit_blocker5.txt config_180529_2118/Units/66D - Space Dungeon/unit_blocker5.txt
index 1243136..2083fe8 100644
--- config_180523_1200/Units/66D - Space Dungeon/unit_blocker5.txt	
+++ config_180529_2118/Units/66D - Space Dungeon/unit_blocker5.txt	
@@ -1,12 +1,10 @@
 art: EnemySentinel
 artScale: '1.8'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/67D - Thief Dungeon/unit_thiefguard.txt config_180529_2118/Units/67D - Thief Dungeon/unit_thiefguard.txt
index 95fc62a..ba395c8 100644
--- config_180523_1200/Units/67D - Thief Dungeon/unit_thiefguard.txt	
+++ config_180529_2118/Units/67D - Thief Dungeon/unit_thiefguard.txt	
@@ -1,12 +1,10 @@
 art: EnemyThiefGuard
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - burnWeakness
 - poisonResist
 energyRegenRate: '0'
 gunMounts:
diff --git config_180523_1200/Units/67D - Thief Dungeon/unit_thiefguard2.txt config_180529_2118/Units/67D - Thief Dungeon/unit_thiefguard2.txt
index 1b9b9ab..ea38139 100644
--- config_180523_1200/Units/67D - Thief Dungeon/unit_thiefguard2.txt	
+++ config_180529_2118/Units/67D - Thief Dungeon/unit_thiefguard2.txt	
@@ -1,12 +1,10 @@
 art: EnemyThiefGuard
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - burnWeakness
 - poisonResist
 energyRegenRate: '0'
 gunMounts:
diff --git config_180523_1200/Units/68D - Eyeball Dungeon/BOS_octopus.txt config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopus.txt
index 62d6c2e..ae5d4f6 100644
--- config_180523_1200/Units/68D - Eyeball Dungeon/BOS_octopus.txt	
+++ config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopus.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyEyeBossPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.68'
diff --git config_180523_1200/Units/68D - Eyeball Dungeon/BOS_octopuslaser2.txt config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopuslaser2.txt
index 3d9b8ef..e573e10 100644
--- config_180523_1200/Units/68D - Eyeball Dungeon/BOS_octopuslaser2.txt	
+++ config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopuslaser2.txt	
@@ -1,12 +1,10 @@
 art: EnemyWatcherMinion
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/68D - Eyeball Dungeon/BOS_octopuslaser3.txt config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopuslaser3.txt
index 44557bd..cbd8299 100644
--- config_180523_1200/Units/68D - Eyeball Dungeon/BOS_octopuslaser3.txt	
+++ config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopuslaser3.txt	
@@ -1,12 +1,10 @@
 art: EnemyWatcherMinion
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/68D - Eyeball Dungeon/unit_cyclopuslaser.txt config_180529_2118/Units/68D - Eyeball Dungeon/unit_cyclopuslaser.txt
index 3cc9bfd..343ba4d 100644
--- config_180523_1200/Units/68D - Eyeball Dungeon/unit_cyclopuslaser.txt	
+++ config_180529_2118/Units/68D - Eyeball Dungeon/unit_cyclopuslaser.txt	
@@ -1,12 +1,10 @@
 art: EnemyPsychopusMinion
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
diff --git config_180523_1200/Units/69D - Temple Dungeon/BOS1_smokeboss.txt config_180529_2118/Units/69D - Temple Dungeon/BOS1_smokeboss.txt
index 88106d3..0532433 100644
--- config_180523_1200/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
+++ config_180529_2118/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemyTempleBoss
 artScale: '1'
 bankSmoothing: '10000'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
diff --git config_180523_1200/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt config_180529_2118/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt
index bfcf5c6..df259c0 100644
--- config_180523_1200/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
+++ config_180529_2118/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
@@ -1,5 +1,257 @@
+additionalStates:
+  toggle_safety:
+  - events:
+    - code: VariableSet
+      name: healthtriggershield1
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield2
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield3
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield4
+      value: '0'
+    - code: VariableSet
+      name: healthtriggershield5
+      value: '0'
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    name: initial
+    transitions:
+    - code: Auto
+      toState: main
+      value: '0'
+  - events:
+    - code: Speech
+      speechOptions:
+      - nonLocalizedText: main
+        weight: '1'
+      value: '1'
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    name: main
+    transitions:
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.9'
+      - code: VariableBelow
+        name: healthtriggershield1
+        value: '1'
+      toState: healthtriggershield1
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.7'
+      - code: VariableBelow
+        name: healthtriggershield2
+        value: '1'
+      toState: healthtriggershield2
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.5'
+      - code: VariableBelow
+        name: healthtriggershield3
+        value: '1'
+      toState: healthtriggershield3
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.3'
+      - code: VariableBelow
+        name: healthtriggershield4
+        value: '1'
+      toState: healthtriggershield4
+    - code: And
+      subconditions:
+      - code: HealthBelow
+        value: '0.1'
+      - code: VariableBelow
+        name: healthtriggershield5
+        value: '1'
+      toState: healthtriggershield5
+  - name: healthtriggershield1
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield1
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield1_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield1_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield2
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield2
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield2_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield2_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield3
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield3
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield3_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield3_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield4
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield4
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield4_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield4_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
+  - name: healthtriggershield5
+    substates:
+    - events:
+      - code: VariableSet
+        name: healthtriggershield5
+        value: '1'
+      - code: StartEffect
+        delay: '0.0'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.1'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.2'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.3'
+        name: Shielded
+        value: '1.0'
+      - code: StartEffect
+        delay: '0.4'
+        name: Shielded
+        value: '1.0'
+      name: healthtriggershield5_0
+      transitions:
+      - code: Time
+        toState: healthtriggershield5_0
+        value: '0.5'
+    transitions:
+    - code: Time
+      toState: main
+      value: '10'
 art: EnemySNZPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '45'
 colliderRadius: '2'
diff --git config_180523_1200/Units/72D - Arena Dungeon 1/BOS_swarmbossswarmspawner.txt config_180529_2118/Units/72D - Arena Dungeon 1/BOS_swarmbossswarmspawner.txt
index 5990faf..9c4d2c9 100644
--- config_180523_1200/Units/72D - Arena Dungeon 1/BOS_swarmbossswarmspawner.txt	
+++ config_180529_2118/Units/72D - Arena Dungeon 1/BOS_swarmbossswarmspawner.txt	
@@ -2,12 +2,10 @@ art: '!EnemyInvisible'
 artScale: '2'
 bankSmoothing: '10000'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
diff --git config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall.txt config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall.txt
index e3b8676..1913085 100644
--- config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall.txt	
+++ config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall2.txt config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall2.txt
index 565d6d5..69aaa09 100644
--- config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall2.txt	
+++ config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubebiglaserwall2.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubelasercross.txt config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubelasercross.txt
index 5d41e92..6af4f5d 100644
--- config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubelasercross.txt	
+++ config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubelasercross.txt	
@@ -1,12 +1,10 @@
 art: EnemyLaserEye
 artScale: '1'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubenode.txt config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubenode.txt
index 12bd1c5..e89f173 100644
--- config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubenode.txt	
+++ config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubenode.txt	
@@ -3,12 +3,10 @@ artScale: '0.5'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '90'
 colliderRadius: '2.5'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '1'
diff --git config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubenodemaster.txt config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubenodemaster.txt
index 3fe9ecc..144fb0b 100644
--- config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubenodemaster.txt	
+++ config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubenodemaster.txt	
@@ -1,9 +1,9 @@
 art: '!EnemyInvisible'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '90'
-colliderRadius: '2.5'
+colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
diff --git config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubesmalllaserwall.txt config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubesmalllaserwall.txt
index 817dce6..c7cc52f 100644
--- config_180523_1200/Units/73D - Arena Dungeon 2/BOS_arenacubesmalllaserwall.txt	
+++ config_180529_2118/Units/73D - Arena Dungeon 2/BOS_arenacubesmalllaserwall.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/BOS1_meowza.txt config_180529_2118/Units/99D - Boss Dungeon/BOS1_meowza.txt
index 25e4a1d..74f4249 100644
--- config_180523_1200/Units/99D - Boss Dungeon/BOS1_meowza.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/BOS1_meowza.txt	
@@ -187,10 +187,17 @@ loot:
       weight: '1.0001'
     - items:
       - id: shotgun_combat
       weight: '1.0001'
     lootTableId: meowza
+  scrapdrop:
+    lootTable:
+    - items:
+      - instant:
+          currency_amount: '100'
+          currency_id: scrap
+      weight: '1.0001'
   upgrades:
     lootTableId: upgrade_superior_100
 maxEnergyPoints: '1'
 maxHitPoints: '1333'
 maxSpeed: '4'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph2_meowzaB1.txt config_180529_2118/Units/99D - Boss Dungeon/ph2_meowzaB1.txt
index 74e522d..7232111 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph2_meowzaB1.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph2_meowzaB1.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaTurret
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '9999'
 maxSpeed: '20'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph2_meowzaB1m.txt config_180529_2118/Units/99D - Boss Dungeon/ph2_meowzaB1m.txt
index d94293a..5711e17 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph2_meowzaB1m.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph2_meowzaB1m.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaTurret
 artScale: '1'
 colliderRadius: '.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph2_meowzaB2.txt config_180529_2118/Units/99D - Boss Dungeon/ph2_meowzaB2.txt
index 9aaa6f0..70735a6 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph2_meowzaB2.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph2_meowzaB2.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '0.1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph3_meowzaC1m1.txt config_180529_2118/Units/99D - Boss Dungeon/ph3_meowzaC1m1.txt
index 8ea4cb9..ed83125 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph3_meowzaC1m1.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph3_meowzaC1m1.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaTurret
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph3_meowzaC1m2.txt config_180529_2118/Units/99D - Boss Dungeon/ph3_meowzaC1m2.txt
index 97a9235..7339784 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph3_meowzaC1m2.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph3_meowzaC1m2.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaTurret
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph3_meowzaC2m.txt config_180529_2118/Units/99D - Boss Dungeon/ph3_meowzaC2m.txt
index e3affe0..ec6cbbe 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph3_meowzaC2m.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph3_meowzaC2m.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaTurret
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph4_meowzaD2.txt config_180529_2118/Units/99D - Boss Dungeon/ph4_meowzaD2.txt
index 969fcb7..57a3bb6 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph4_meowzaD2.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph4_meowzaD2.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '0.1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunTypes:
 - burst: '50'
   cooldown: '0'
diff --git config_180523_1200/Units/99D - Boss Dungeon/ph4_meowzaD2m.txt config_180529_2118/Units/99D - Boss Dungeon/ph4_meowzaD2m.txt
index f8a65d4..82d6161 100644
--- config_180523_1200/Units/99D - Boss Dungeon/ph4_meowzaD2m.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/ph4_meowzaD2m.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaTurret
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/phx_meowzalaserA.txt config_180529_2118/Units/99D - Boss Dungeon/phx_meowzalaserA.txt
index 440be3d..3d81cd5 100644
--- config_180523_1200/Units/99D - Boss Dungeon/phx_meowzalaserA.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/phx_meowzalaserA.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaLaser
 artScale: '1.0'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: Sprinkler
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/phx_meowzalaserB.txt config_180529_2118/Units/99D - Boss Dungeon/phx_meowzalaserB.txt
index 64f7805..6f91c5f 100644
--- config_180523_1200/Units/99D - Boss Dungeon/phx_meowzalaserB.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/phx_meowzalaserB.txt	
@@ -1,12 +1,10 @@
 art: EnemyMeowzaLaser
 artScale: '1.0'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: Sprinkler
   firingArc: '360'
diff --git config_180523_1200/Units/99D - Boss Dungeon/unit_meowzahurtsnakespawner.txt config_180529_2118/Units/99D - Boss Dungeon/unit_meowzahurtsnakespawner.txt
index af5ef58..b364b40 100644
--- config_180523_1200/Units/99D - Boss Dungeon/unit_meowzahurtsnakespawner.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/unit_meowzahurtsnakespawner.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 hashOverride: '6006'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
diff --git config_180523_1200/Units/99D - Boss Dungeon/unit_meowzastardogspawner1.txt config_180529_2118/Units/99D - Boss Dungeon/unit_meowzastardogspawner1.txt
index a2c3f46..d181690 100644
--- config_180523_1200/Units/99D - Boss Dungeon/unit_meowzastardogspawner1.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/unit_meowzastardogspawner1.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '10000000'
diff --git config_180523_1200/Units/99D - Boss Dungeon/unit_meowzastardogspawner2.txt config_180529_2118/Units/99D - Boss Dungeon/unit_meowzastardogspawner2.txt
index e7daf37..fb7e80c 100644
--- config_180523_1200/Units/99D - Boss Dungeon/unit_meowzastardogspawner2.txt	
+++ config_180529_2118/Units/99D - Boss Dungeon/unit_meowzastardogspawner2.txt	
@@ -1,12 +1,10 @@
 art: '!EnemyInvisible'
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
-effectImmunities:
-- Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '10000000'
diff --git config_180523_1200/events.txt config_180529_2118/events.txt
index 8974b16..4a3879e 100644
--- config_180523_1200/events.txt
+++ config_180529_2118/events.txt
@@ -8,11 +8,12 @@ playtest_event:
       dayOfWeek: '3'
       hour: '17'
       minute: '0'
       month: '5'
 test_event:
-  Effects: []
+  Effects:
+  - xpMultiplier: '1'
   Time:
-    RunsFor: '1:15'
+    RunsFor: '23:00'
     StartsAt:
-      hour: '01'
-      minute: '45'
+      hour: '10'
+      minute: '00'
diff --git config_180523_1200/global.txt config_180529_2118/global.txt
index 3a2083a..a4a0f14 100644
--- config_180523_1200/global.txt
+++ config_180529_2118/global.txt
@@ -112,10 +112,13 @@ perfNoClouds: 'false'
 perfNoItems: 'false'
 perfNoLights: 'false'
 perfNoPlaneArt: 'false'
 perfNoRadar: 'false'
 perfNoShadows: 'false'
+pilotXpCurrencyAwardThreshold: '10'
+pilotXpCurrencyId: scrap
+pilotXpPer1Currency: '10'
 pilotXpTargets:
 - level: '1'
   xp: '0'
 - level: '2'
   xp: '1'
diff --git config_180523_1200/playerclasses.txt config_180529_2118/playerclasses.txt
index e8b2f1b..88e5afc 100644
--- config_180523_1200/playerclasses.txt
+++ config_180529_2118/playerclasses.txt
@@ -573,11 +573,11 @@ paladin:
   - id: default
     prefab: PlayerPaladin
   - hideIfLocked: 'true'
     id: VariantA
     prefab: PlayerPaladinVariantA
-    unlockItemId: playerclass_paladin_variantb
+    unlockItemId: playerclass_paladin_varianta
   - hideIfLocked: 'true'
     id: VariantB
     prefab: PlayerPaladinVariantB
     unlockItemId: playerclass_paladin_variantb
 pirate:
diff --git config_180523_1200/questGivers.txt config_180529_2118/questGivers.txt
index bfd2d58..eac3ab6 100644
--- config_180523_1200/questGivers.txt
+++ config_180529_2118/questGivers.txt
@@ -8,12 +8,14 @@
   questTables:
     basics:
       genCount: '3'
       maxDuration: 0:20
       quests:
-      - id: collect_ambergris
-      - id: collect_basic
+      - id: test_collect
+      - id: test_basic
+      - id: test_inherit
+      - id: test_inherit_t2
       schedule:
         minute: '*/5'
 - adminsOnly: 'true'
   completeGuidanceTargets:
   - tavern
diff --git config_180523_1200/store.txt config_180529_2118/store.txt
index 2aae5ab..4e16921 100644
--- config_180523_1200/store.txt
+++ config_180529_2118/store.txt
@@ -1,9 +1,9 @@
 currencies:
 - icon: gold-icon
   id: gold
-- hidden: 'true'
+- hidden: 'false'
   icon: scrap-icon
   id: scrap
 - hidden: 'true'
   icon: keys-icon
   id: keys
@@ -66,138 +66,10 @@ currency_packages:
   currency_val: '160000'
   extra_text: Best Value
   id: dummy_5
   money: '100'
   payment: dummy
-fillers:
-- id: sale_daily_dye_1
-  is_filling_up_overtime: 'true'
-  is_random_filler: 'true'
-  priority: '1'
-  product_selection:
-    with_tags_any:
-    - item_dye
-  product_settings:
-    amount: '10'
-    discount: '20'
-    has_limited_amount: 'true'
-  scheduled_time:
-    RunsFor: '4:00'
-    StartsAt:
-      hour: '00'
-      minute: '00'
-  tags:
-  - sale
-- id: sale_daily_key_1
-  is_filling_up_overtime: 'true'
-  is_random_filler: 'true'
-  priority: '1'
-  product_selection:
-    with_tags_any:
-    - item_key
-  product_settings:
-    amount: '10'
-    discount: '20'
-    has_limited_amount: 'true'
-  scheduled_time:
-    RunsFor: '4:00'
-    StartsAt:
-      hour: '4'
-      minute: '00'
-  tags:
-  - sale
-- id: sale_daily_variant_1
-  is_filling_up_overtime: 'true'
-  is_random_filler: 'true'
-  priority: '1'
-  product_selection:
-    with_tags_any:
-    - item_variant
-  product_settings:
-    amount: '10'
-    discount: '20'
-    has_limited_amount: 'true'
-  scheduled_time:
-    RunsFor: '4:00'
-    StartsAt:
-      hour: '8'
-      minute: '00'
-  tags:
-  - sale
-- id: sale_daily_consumable_1
-  is_filling_up_overtime: 'true'
-  is_random_filler: 'true'
-  priority: '1'
-  product_selection:
-    with_tags_any:
-    - item_consumable
-  product_settings:
-    amount: '10'
-    discount: '20'
-    has_limited_amount: 'true'
-  scheduled_time:
-    RunsFor: '4:00'
-    StartsAt:
-      hour: '12'
-      minute: '00'
-  tags:
-  - sale
-- id: sale_daily_dye_2
-  is_filling_up_overtime: 'true'
-  is_random_filler: 'true'
-  priority: '1'
-  product_selection:
-    with_tags_any:
-    - item_dye
-  product_settings:
-    amount: '10'
-    discount: '20'
-    has_limited_amount: 'true'
-  scheduled_time:
-    RunsFor: '4:00'
-    StartsAt:
-      hour: '16'
-      minute: '00'
-  tags:
-  - sale
-- id: sale_daily_key_2
-  is_filling_up_overtime: 'true'
-  is_random_filler: 'true'
-  priority: '1'
-  product_selection:
-    with_tags_any:
-    - item_key
-  product_settings:
-    amount: '10'
-    discount: '20'
-    has_limited_amount: 'true'
-  scheduled_time:
-    RunsFor: '4:00'
-    StartsAt:
-      hour: '20'
-      minute: '00'
-  tags:
-  - sale
-- id: sale_weekly_variant
-  is_filling_up_overtime: 'true'
-  is_random_filler: 'true'
-  priority: '2'
-  product_selection:
-    with_tags_any:
-    - item_unlock
-  product_settings:
-    amount: '10'
-    discount: '40'
-    has_limited_amount: 'true'
-  scheduled_time:
-    RunsFor: 1.00:00
-    StartsAt:
-      dayOfWeek: '5'
-      hour: '0'
-      minute: '00'
-  tags:
-  - sale
 products:
 - account_items:
   - storage_slot
   - storage_slot
   - storage_slot
@@ -208,11 +80,11 @@ products:
   - store_bundle_starter
   banner: store-banner-starter
   icon: ItemCrate
   id: store_bundle_starter
   max_per_account: '1'
-  max_per_account_count_account_items: 'true'
+  max_per_account_limiting_account_item: store_bundle_starter
   no_automatic_tags: 'true'
   normal_price:
     amount: '10000'
     currency: gold
   tags:
@@ -357,901 +229,1215 @@ products:
   tags:
   - item_key
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeProduct
-  id: dye_white_body
+  id: dye_gray_body
   items:
-  - dye_white_body
+  - dye_gray_body
   tags:
-  - item_dye
+  - item_dye_body_common
 - additional_price_tags:
   - id: normal
     price:
       amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeProduct
-  id: dye_gray_body
+  id: dye_darkgray_body
   items:
-  - dye_gray_body
+  - dye_darkgray_body
   tags:
-  - item_dye
+  - item_dye_body_common
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeProduct
-  id: dye_darkgray_body
+  id: dye_green_body
   items:
-  - dye_darkgray_body
+  - dye_green_body
   tags:
-  - item_dye
+  - item_dye_body_common
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeProduct
-  id: dye_black_body
+  id: dye_darkyelloworange_body
   items:
-  - dye_black_body
+  - dye_darkyelloworange_body
   tags:
-  - item_dye
+  - item_dye_body_common
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
+  icon: ItemDyeDetailProduct
+  id: dye_darkblue_body
+  items:
+  - dye_darkblue_body
+  tags:
+  - item_dye_body_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '500'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeProduct
-  id: dye_red_body
+  id: dye_verydarkblue_body
   items:
-  - dye_red_body
+  - dye_verydarkblue_body
+  tags:
+  - item_dye_body_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '500'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
+  icon: ItemDyeProduct
+  id: dye_verydarkpurple_body
+  items:
+  - dye_verydarkpurple_body
   tags:
-  - item_dye
+  - item_dye_body_common
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_orangered_body
   items:
   - dye_orangered_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_orange_body
   items:
   - dye_orange_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_yelloworange_body
   items:
   - dye_yelloworange_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_yellow_body
   items:
   - dye_yellow_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_greenyellow_body
   items:
   - dye_greenyellow_body
   tags:
-  - item_dye
-- additional_price_tags:
-  - id: normal
-    price:
-      amount: '500'
-      currency: gold
-  icon: ItemDyeProduct
-  id: dye_green_body
-  items:
-  - dye_green_body
-  tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_teal_body
   items:
   - dye_teal_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_blue_body
   items:
   - dye_blue_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_violet_body
   items:
   - dye_violet_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_purple_body
   items:
   - dye_purple_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_magenta_body
   items:
   - dye_magenta_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkred_body
   items:
   - dye_darkred_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkorangered_body
   items:
   - dye_darkorangered_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkorange_body
   items:
   - dye_darkorange_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
-  icon: ItemDyeProduct
-  id: dye_darkyelloworange_body
-  items:
-  - dye_darkyelloworange_body
-  tags:
-  - item_dye
-- additional_price_tags:
-  - id: normal
+  - id: scrap
     price:
-      amount: '1000'
-      currency: gold
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkyellow_body
   items:
   - dye_darkyellow_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkgreenyellow_body
   items:
   - dye_darkgreenyellow_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkgreen_body
   items:
   - dye_darkgreen_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkteal_body
   items:
   - dye_darkteal_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
-  icon: ItemDyeProduct
-  id: dye_darkblue_body
-  items:
-  - dye_darkblue_body
-  tags:
-  - item_dye
-- additional_price_tags:
-  - id: normal
+  - id: scrap
     price:
-      amount: '1000'
-      currency: gold
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkviolet_body
   items:
   - dye_darkviolet_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkpurple_body
   items:
   - dye_darkpurple_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_darkmagenta_body
   items:
   - dye_darkmagenta_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_verydarkred_body
   items:
   - dye_verydarkred_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_verydarkorangered_body
   items:
   - dye_verydarkorangered_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_verydarkorange_body
   items:
   - dye_verydarkorange_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_verydarkyelloworange_body
   items:
   - dye_verydarkyelloworange_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_verydarkgreenyellow_body
   items:
   - dye_verydarkgreenyellow_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_verydarkgreen_body
   items:
   - dye_verydarkgreen_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
   id: dye_verydarkteal_body
   items:
   - dye_verydarkteal_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
-  id: dye_verydarkblue_body
+  id: dye_verydarkviolet_body
   items:
-  - dye_verydarkblue_body
+  - dye_verydarkviolet_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeProduct
-  id: dye_verydarkviolet_body
+  id: dye_verydarkmagenta_body
   items:
-  - dye_verydarkviolet_body
+  - dye_verydarkmagenta_body
   tags:
-  - item_dye
+  - item_dye_body_rare
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '2000'
       currency: gold
   icon: ItemDyeProduct
-  id: dye_verydarkpurple_body
+  id: dye_white_body
   items:
-  - dye_verydarkpurple_body
+  - dye_white_body
   tags:
-  - item_dye
+  - item_dye_body_epic
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '2000'
       currency: gold
   icon: ItemDyeProduct
-  id: dye_verydarkmagenta_body
+  id: dye_black_body
   items:
-  - dye_verydarkmagenta_body
+  - dye_black_body
   tags:
-  - item_dye
+  - item_dye_body_epic
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '2000'
       currency: gold
-  icon: ItemDyeDetailProduct
-  id: dye_white_detail
+  icon: ItemDyeProduct
+  id: dye_red_body
   items:
-  - dye_white_detail
+  - dye_red_body
   tags:
-  - item_dye
+  - item_dye_body_epic
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_gray_detail
   items:
   - dye_gray_detail
   tags:
-  - item_dye
+  - item_dye_detail_common
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkgray_detail
   items:
   - dye_darkgray_detail
   tags:
-  - item_dye
+  - item_dye_detail_common
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeDetailProduct
-  id: dye_black_detail
+  id: dye_green_detail
   items:
-  - dye_black_detail
+  - dye_green_detail
   tags:
-  - item_dye
+  - item_dye_detail_common
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '500'
       currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
   icon: ItemDyeDetailProduct
-  id: dye_red_detail
+  id: dye_darkyelloworange_detail
   items:
-  - dye_red_detail
+  - dye_darkyelloworange_detail
   tags:
-  - item_dye
+  - item_dye_detail_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '500'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
+  icon: ItemDyeDetailProduct
+  id: dye_darkblue_detail
+  items:
+  - dye_darkblue_detail
+  tags:
+  - item_dye_detail_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '500'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
+  icon: ItemDyeDetailProduct
+  id: dye_verydarkblue_detail
+  items:
+  - dye_verydarkblue_detail
+  tags:
+  - item_dye_detail_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '500'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '1500'
+      currency: scrap
+  icon: ItemDyeDetailProduct
+  id: dye_verydarkpurple_detail
+  items:
+  - dye_verydarkpurple_detail
+  tags:
+  - item_dye_detail_common
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_orangered_detail
   items:
   - dye_orangered_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_orange_detail
   items:
   - dye_orange_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_yelloworange_detail
   items:
   - dye_yelloworange_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_yellow_detail
   items:
   - dye_yellow_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_greenyellow_detail
   items:
   - dye_greenyellow_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
-  icon: ItemDyeDetailProduct
-  id: dye_green_detail
-  items:
-  - dye_green_detail
-  tags:
-  - item_dye
-- additional_price_tags:
-  - id: normal
+  - id: scrap
     price:
-      amount: '1000'
-      currency: gold
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_teal_detail
   items:
   - dye_teal_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_blue_detail
   items:
   - dye_blue_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_violet_detail
   items:
   - dye_violet_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_purple_detail
   items:
   - dye_purple_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_magenta_detail
   items:
   - dye_magenta_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkred_detail
   items:
   - dye_darkred_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkorangered_detail
   items:
   - dye_darkorangered_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkorange_detail
   items:
   - dye_darkorange_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
-  icon: ItemDyeDetailProduct
-  id: dye_darkyelloworange_detail
-  items:
-  - dye_darkyelloworange_detail
-  tags:
-  - item_dye
-- additional_price_tags:
-  - id: normal
+  - id: scrap
     price:
-      amount: '1000'
-      currency: gold
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkyellow_detail
   items:
   - dye_darkyellow_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkgreenyellow_detail
   items:
   - dye_darkgreenyellow_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkgreen_detail
   items:
   - dye_darkgreen_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
-      amount: '500'
+      amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkteal_detail
   items:
   - dye_darkteal_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
-      amount: '500'
+      amount: '1000'
       currency: gold
-  icon: ItemDyeDetailProduct
-  id: dye_darkblue_detail
-  items:
-  - dye_darkblue_detail
-  tags:
-  - item_dye
-- additional_price_tags:
-  - id: normal
+  - id: scrap
     price:
-      amount: '500'
-      currency: gold
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkviolet_detail
   items:
   - dye_darkviolet_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkpurple_detail
   items:
   - dye_darkpurple_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_darkmagenta_detail
   items:
   - dye_darkmagenta_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkred_detail
   items:
   - dye_verydarkred_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkorangered_detail
   items:
   - dye_verydarkorangered_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkorange_detail
   items:
   - dye_verydarkorange_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkyelloworange_detail
   items:
   - dye_verydarkyelloworange_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkyellow_detail
   items:
   - dye_verydarkyellow_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkgreenyellow_detail
   items:
   - dye_verydarkgreenyellow_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkgreen_detail
   items:
   - dye_verydarkgreen_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
   id: dye_verydarkteal_detail
   items:
   - dye_verydarkteal_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
-  id: dye_verydarkblue_detail
+  id: dye_verydarkviolet_detail
   items:
-  - dye_verydarkblue_detail
+  - dye_verydarkviolet_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
       amount: '1000'
       currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
   icon: ItemDyeDetailProduct
-  id: dye_verydarkviolet_detail
+  id: dye_verydarkmagenta_detail
   items:
-  - dye_verydarkviolet_detail
+  - dye_verydarkmagenta_detail
   tags:
-  - item_dye
+  - item_dye_detail_rare
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '2000'
       currency: gold
   icon: ItemDyeDetailProduct
-  id: dye_verydarkpurple_detail
+  id: dye_white_detail
   items:
-  - dye_verydarkpurple_detail
+  - dye_white_detail
   tags:
-  - item_dye
+  - item_dye_detail_epic
 - additional_price_tags:
   - id: normal
     price:
-      amount: '1000'
+      amount: '2000'
       currency: gold
   icon: ItemDyeDetailProduct
-  id: dye_verydarkmagenta_detail
+  id: dye_black_detail
   items:
-  - dye_verydarkmagenta_detail
+  - dye_black_detail
   tags:
-  - item_dye
-- account_items:
-  - consumable_xpboost
-  disabled: 'true'
-  id: store_consumable_xpboost
-  normal_price:
-    amount: '2000'
-    currency: gold
+  - item_dye_detail_epic
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '2000'
+      currency: gold
+  icon: ItemDyeDetailProduct
+  id: dye_red_detail
+  items:
+  - dye_red_detail
   tags:
-  - item_consumable
-- disabled: 'true'
+  - item_dye_detail_epic
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '250'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '750'
+      currency: scrap
+  disabled: 'false'
   id: store_consumable_health
   items:
   - health_boost
-  normal_price:
-    amount: '250'
-    currency: gold
   tags:
   - item_consumable
 - account_items:
   - consumable_steam
-  disabled: 'true'
+  additional_price_tags:
+  - id: normal
+    price:
+      amount: '750'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '2250'
+      currency: scrap
+  disabled: 'false'
   id: store_consumable_steam
-  normal_price:
-    amount: '750'
-    currency: gold
+  tags:
+  - item_consumable
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '2000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '6000'
+      currency: scrap
+  disabled: 'false'
+  id: store_consumable_xpboost
+  items:
+  - consumable_xpboost
   tags:
   - item_consumable
 - account_items:
   - hangar_slot
   icon: ItemCrate
@@ -1284,91 +1470,150 @@ products:
     - '2000'
     - '1000'
     currency: gold
   tags:
   - storage_slot
-- id: store_unlock_playerclass_assault_flames
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_assault_flames
   items:
   - unlock_playerclass_assault_flames
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
   - item_variant_common
-- id: store_unlock_playerclass_assault_spikes
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_assault_spikes
   items:
   - unlock_playerclass_assault_spikes
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_assault_camo
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_assault_camo
   items:
   - unlock_playerclass_assault_camo
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_assault_camo
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_assault_camo
   items:
   - unlock_playerclass_assault_camo
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_medic_flames
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_medic_flames
   items:
   - unlock_playerclass_medic_flames
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_medic_spikes
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_medic_spikes
   items:
   - unlock_playerclass_medic_spikes
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_medic_camo
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_medic_camo
   items:
   - unlock_playerclass_medic_camo
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_oldfaithful_flames
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_oldfaithful_flames
   items:
   - unlock_playerclass_oldfaithful_flames
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_oldfaithful_spikes
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_oldfaithful_spikes
   items:
   - unlock_playerclass_oldfaithful_spikes
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
-- id: store_unlock_playerclass_oldfaithful_camo
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  id: store_unlock_playerclass_oldfaithful_camo
   items:
   - unlock_playerclass_oldfaithful_camo
-  normal_price:
-    amount: '5000'
-    currency: gold
   tags:
-  - item_unlock
+  - item_variant_common
 - id: store_unlock_playerclass_assault_varianta
   items:
   - unlock_playerclass_assault_varianta
   normal_price:
     amount: '7000'
@@ -1593,22 +1838,49 @@ stores:
   - icon: ItemBoost
     id: general_account
     max_product_count: '4'
     product_selection:
       with_tags_any:
-      - consumable
+      - item_consumable
     type: NORMAL
   - icon: ItemDyeProduct
     iconHexColor: '000000'
     id: general_dye
-    max_product_count: '40'
+    max_product_count: '12'
+    product_selection:
+      with_tags_any:
+      - item_dye_body_common
+      - item_dye_detail_common
+    type: NORMAL
+  - icon: ItemDyeProduct
+    id: general_dye_rare
+    max_product_count: '20'
+    product_selection:
+      with_tags_any:
+      - item_dye_body_rare
+      - item_dye_detail_rare
+    show_within_other_section_in_ui: general_dye
+    type: NORMAL
+  - icon: ItemDyeProduct
+    id: general_dye_epic
+    max_product_count: '4'
     product_selection:
       with_tags_any:
-      - item_dye
+      - item_dye_body_epic
+      - item_dye_detail_epic
+    show_within_other_section_in_ui: general_dye
     type: NORMAL
   - icon: ItemVariantProduct
     id: general_variant
-    max_product_count: '12'
+    max_product_count: '8'
+    product_selection:
+      with_tags_any:
+      - item_variant_common
+    type: NORMAL
+  - icon: ItemVariantProduct
+    id: general_variant_rare
+    max_product_count: '4'
     product_selection:
       with_tags_any:
-      - item_variant
+      - item_variant_rare
+    show_within_other_section_in_ui: general_variant
     type: NORMAL