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
 45 files changed, 762 insertions(+), 229 deletions(-)

diff --git config_190301_0621/Items/Primary Weapons/shotgun_basic.txt config_190307_221/Items/Primary Weapons/shotgun_basic.txt
index 0537a97..a1ad505 100644
--- config_190301_0621/Items/Primary Weapons/shotgun_basic.txt	
+++ config_190307_221/Items/Primary Weapons/shotgun_basic.txt	
@@ -375,5 +375,37 @@
   id: shotgun_10
   slot: MainGun
   soulbound: 'true'
   tag: shotgun
   tier: '10'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: ringing_white
+      bulletPrefab: leisurelyBullet
+      bulletSize: '1.08'
+      burst: '12'
+      cooldown: '1.33'
+      damage: '20.31'
+      doesReloadNonemptyClips: 'true'
+      effect: Poison
+      effectAmount: '0.1'
+      effectDamage: '5.77'
+      effectTime: '0.1'
+      isPiercing: 'true'
+      lifetime: '0.25'
+      multi: '6'
+      multiSpread: '10'
+      name: shotgun_10_brosnan_1
+      rof: '3'
+      speed: '18.0'
+      spread: '0'
+    mountName: shotgun10_brosnan_mount
+    sfx:
+      sound: shotgun
+  icon: ItemLootShotgun_10
+  id: shotgun_10_brosnan
+  slot: MainGun
+  soulbound: 'true'
+  tag: shotgun
+  tier: '100'
diff --git config_190301_0621/Items/Primary Weapons/siege_basic.txt config_190307_221/Items/Primary Weapons/siege_basic.txt
index b08f024..a4ea9b4 100644
--- config_190301_0621/Items/Primary Weapons/siege_basic.txt	
+++ config_190307_221/Items/Primary Weapons/siege_basic.txt	
@@ -15,20 +15,220 @@
 - actions:
   - maneuver:
       cooldown: '0.2'
       count: '3'
       distance: '2.6'
-      energy: '1'
+      energy: '5'
       name: flak
-      scale: '1.5'
+      scale: '1.2'
       secondsToVelocity1: '0.2'
       spreadX: '1'
       spreadY: '2'
   icon: ItemLootVortex_0
   id: flak_0
   slot: SecondaryAttack
   statMods:
   - amount: '1'
     math: add
     name: energyRegenRate
   tag: flak
   tier: '0'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '3'
+      distance: '2.6'
+      energy: '5'
+      name: flak
+      scale: '1.3'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.066'
+      spreadY: '2'
+  icon: ItemLootVortex_1
+  id: flak_1
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '1'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '3'
+      distance: '2.6'
+      energy: '5'
+      name: flak
+      scale: '1.4'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.132'
+      spreadY: '2'
+  icon: ItemLootVortex_2
+  id: flak_2
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '2'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '3'
+      distance: '2.6'
+      energy: '5'
+      name: flak
+      scale: '1.5'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.198'
+      spreadY: '2'
+  icon: ItemLootVortex_3
+  id: flak_3
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '3'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '4'
+      distance: '2.6'
+      energy: '6'
+      name: flak
+      scale: '1.2'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.264'
+      spreadY: '2'
+  icon: ItemLootVortex_4
+  id: flak_4
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '4'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '4'
+      distance: '2.6'
+      energy: '6'
+      name: flak
+      scale: '1.3'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.33'
+      spreadY: '2'
+  icon: ItemLootVortex_5
+  id: flak_5
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '5'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '4'
+      distance: '2.6'
+      energy: '6'
+      name: flak
+      scale: '1.4'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.396'
+      spreadY: '2'
+  icon: ItemLootVortex_6
+  id: flak_6
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '6'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '4'
+      distance: '2.6'
+      energy: '6'
+      name: flak
+      scale: '1.5'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.462'
+      spreadY: '2'
+  icon: ItemLootVortex_7
+  id: flak_7
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '7'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '5'
+      distance: '2.6'
+      energy: '7'
+      name: flak
+      scale: '1.3'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.528'
+      spreadY: '2'
+  icon: ItemLootVortex_8
+  id: flak_8
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '8'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '5'
+      distance: '2.6'
+      energy: '7'
+      name: flak
+      scale: '1.4'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.594'
+      spreadY: '2'
+  icon: ItemLootVortex_9
+  id: flak_9
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '9'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '5'
+      distance: '2.6'
+      energy: '7'
+      name: flak
+      scale: '1.5'
+      secondsToVelocity1: '0.2'
+      spreadX: '1.66'
+      spreadY: '2'
+  icon: ItemLootVortex_10
+  id: flak_10
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '10'
diff --git config_190301_0621/Items/Secondary Weapons/cloud.txt config_190307_221/Items/Secondary Weapons/cloud.txt
index c33a2ac..63e7e14 100644
--- config_190301_0621/Items/Secondary Weapons/cloud.txt	
+++ config_190307_221/Items/Secondary Weapons/cloud.txt	
@@ -240,11 +240,11 @@
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -261,209 +261,209 @@
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_1
   id: shield_blast_1
   slot: SecondaryAttack
   tag: shield_blast
   tier: '1'
 - actions:
   - cloud: shieldblast2
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_2
   id: shield_blast_2
   slot: SecondaryAttack
   tag: shield_blast
   tier: '2'
 - actions:
   - cloud: shieldblast3
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_3
   id: shield_blast_3
   slot: SecondaryAttack
   tag: shield_blast
   tier: '3'
 - actions:
   - cloud: shieldblast4
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_4
   id: shield_blast_4
   slot: SecondaryAttack
   tag: shield_blast
   tier: '4'
 - actions:
   - cloud: shieldblast5
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_5
   id: shield_blast_5
   slot: SecondaryAttack
   tag: shield_blast
   tier: '5'
 - actions:
   - cloud: shieldblast6
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_6
   id: shield_blast_6
   slot: SecondaryAttack
   tag: shield_blast
   tier: '6'
 - actions:
   - cloud: shieldblast7
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_7
   id: shield_blast_7
   slot: SecondaryAttack
   tag: shield_blast
   tier: '7'
 - actions:
   - cloud: shieldblast8
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_8
   id: shield_blast_8
   slot: SecondaryAttack
   tag: shield_blast
   tier: '8'
 - actions:
   - cloud: shieldblast9
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_9
   id: shield_blast_9
   slot: SecondaryAttack
   tag: shield_blast
   tier: '9'
 - actions:
   - cloud: shieldblast10
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '1.33'
+      - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
       - amount: '0.25'
         math: multiply
         name: gunCooldownMod
-  icon: ItemLootBlast_Shield_0
+  icon: ItemLootBlast_Shield_10
   id: shield_blast_10
   slot: SecondaryAttack
   tag: shield_blast
   tier: '10'
 - actions:
diff --git config_190301_0621/Items/Secondary Weapons/mine.txt config_190307_221/Items/Secondary Weapons/mine.txt
index 0521802..b3c576f 100644
--- config_190301_0621/Items/Secondary Weapons/mine.txt	
+++ config_190307_221/Items/Secondary Weapons/mine.txt	
@@ -168,11 +168,11 @@
       offset:
         angle: '0'
         distance: '0.0'
         isRelative: 'true'
       unit: allymine10
-  icon: ItemLoot_Turret_10
+  icon: ItemLootMine_10
   id: mine_10
   slot: SecondaryAttack
   soulbound: 'true'
   tag: mine
   tier: '10'
diff --git config_190301_0621/Texts/en-US/conversations.txt config_190307_221/Texts/en-US/conversations.txt
index 8c0d1d6..5474166 100644
--- config_190301_0621/Texts/en-US/conversations.txt
+++ config_190307_221/Texts/en-US/conversations.txt
@@ -1,13 +1,14 @@
 characters:
+  bartender_parrot: Parker
+  mechanic_penguin: Spocket
+  merchant_peacock: Kakoli
   portaloperator: Portal Operator
+  scientist_owl: Doc Barnhouse
   sergeant: Sergeant
+  stevedore_pelican: Coop
 text:
-  intro-crafting_01: Welcome to the Crafting Workshop!
-  intro-crafting_02: You can craft some awesome items, but you'll need the right crafting materials.
-  intro-crafting_03: Collect crafting materials from bounty quests, available at the pub on a rotation.
-  intro-crafting_04: Don't forget to visit the pub and get today's bounty quest!
   intro-hangar_01: A new plane? What happened to that new Quad I just tuned up for you?
   intro-hangar_02: Crashed!? You pilots don't know how to treat fine machinery.
   intro-hangar_03: Ah well, I shouldn't complain. I suppose it's good for business.
   intro-hangar_04: I'll get you fixed right up with a replacement.
   intro-hangar_05: Oh, when you unlock a new class, I'll have it ready for you here at the Hangar.
@@ -35,13 +36,13 @@ text:
   intro-storage_03: Your Plane Cargo can only hold so much.
   intro-storage_04: Plus if your plane crashes, all that loot goes with it!
   intro-storage_05: Don't worry, I've got a Storage Bay earmarked for you. Your loot is always safe with me.
   intro-storage_06: Transfer items between your Plane Cargo and Storage Bay whenever you like.
   intro-storage_07: If that's still not enough space, come talk to me about expanding your storage for a price.
-  intro-store_01: Welcome, pilot! Looking to spend some Copper or Scrap? I've got what you need.
+  intro-store_01: Welcome, pilot! Looking to spend some Gold or Scrap? I've got what you need.
   intro-store_02: Items to jump start your new plane's loadout?
-  intro-store_03: Special Mission Plans for a chance at rare loot?
+  intro-store_03: Special Mission Plans by our spies in the Cat Empire?
   intro-store_04: Customize your plane with Emotes, Trails, Paint Jobs or Plane Variants?
   intro-store_05: If you want it, I probably sell it. Come by any time.
   intro-workshop_01: Greetings, Pilot. I am the Chief Military Research Scientist.
   intro-workshop_02: A bit pretentious, yes. But that's how the brass prefer their titles.
   intro-workshop_03: To you, I am a crafter of weapons and items.
diff --git config_190301_0621/Texts/en-US/events.txt config_190307_221/Texts/en-US/events.txt
index a826332..01401a9 100644
--- config_190301_0621/Texts/en-US/events.txt
+++ config_190307_221/Texts/en-US/events.txt
@@ -272,10 +272,16 @@ news_ibis_icubators:
   description: 'Huge new update, with new classes (Dagger Knight and Siege Tank), loads more skills, friends list revamp, and overflowing with polish and improvements all over!
 
     '
   header_image: EventHeader_Updates
   title: 'News: Incoming Ibis Incubators'
+news_jazzy_jays:
+  description: 'Polish and bug fix update, following up after the big update last week.
+
+    '
+  header_image: EventHeader_Updates
+  title: 'News: Joyous Jazzy Jays'
 playtest_event:
   description: "Welcome to the latest Steambirds playtest. Be kind to one another. Explore the game. Have fun. Good skies! \n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n {0}{1}\n"
   ending_server_message: The playtest is over!
   header_image: EventHeader_Updates
   starting_server_message: Playtest is starting now!
diff --git config_190301_0621/Texts/en-US/item.txt config_190307_221/Texts/en-US/item.txt
index 578856b..6f543c0 100644
--- config_190301_0621/Texts/en-US/item.txt
+++ config_190307_221/Texts/en-US/item.txt
@@ -664,10 +664,43 @@ engine_speed_8:
   description: Engine of Speed.
   name: Swift Engine
 engine_speed_9:
   description: Engine of Speed.
   name: Rocket Engine
+flak_0:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_1:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_10:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_2:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_3:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_4:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_5:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_6:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_7:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_8:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
+flak_9:
+  description: Destroys incoming enemy bullets.
+  name: Flak Cannon
 hadouken:
   description: Fires kinetic energy. Designed by a master of aerial arts. (Hold down fire button for rapid fire)
   name: Spring Dragon
 hadouken_10:
   description: Fires kinetic energy. Designed by a master of aerial arts. (Hold down fire button for rapid fire)
@@ -709,10 +742,43 @@ heal_8:
   description: Hovering micro-mechanics that repair damaged allies.
   name: Aura of Hippocrates
 heal_9:
   description: Hovering micro-mechanics that repair damaged allies.
   name: Aura of Caduceus
+healaura_0:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_1:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_10:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_2:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_3:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_4:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_5:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_6:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_7:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_8:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
+healaura_9:
+  description: Gradually heals nearby allies.
+  name: Heal Aura
 health0:
   name: Small Repair Patch
 health1:
   name: Small Repair Patch
 health10:
@@ -1360,10 +1426,43 @@ resist_aura_8:
   description: It's only a short distance to the ground, if you measure by time.
   name: Aura of Defense
 resist_aura_9:
   description: Polishing the lens on the defense projector is item 64 in the pre-flight checklist.
   name: Aura of Defense
+shield_blast_0:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_1:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_10:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_2:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_3:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_4:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_5:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_6:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_7:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_8:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
+shield_blast_9:
+  description: Grants a temporary shield to itself and nearby allies.
+  name: Shield Blast
 shotgun_0:
   description: At short range, you can't miss.
   name: Training Shotgun
 shotgun_1:
   description: Perhaps someone's great great great grandfather owned this.
diff --git config_190301_0621/Texts/en-US/planeclasses.txt config_190307_221/Texts/en-US/planeclasses.txt
index ca743fe..e60127d 100644
--- config_190301_0621/Texts/en-US/planeclasses.txt
+++ config_190307_221/Texts/en-US/planeclasses.txt
@@ -6,11 +6,11 @@ angler:
       name: Angler
 assault:
   name: Assault
   variants:
     Camo:
-      flavor: ''
+      flavor: Hard to say if this plane has never been washed or if it's just painted to look that way.
       name: Mudslide
     EpicA:
       flavor: Though many of their arts relied on silence, the nuns of St. Avem knew of a forbidden chant. When executed at exactly the correct frequency, autopsies revealed brains turned black with terror.
       name: Ghost Assault
     EpicB:
@@ -21,12 +21,12 @@ assault:
       name: Avalanche
     EpicD:
       flavor: ''
       name: ''
     Tiger:
-      flavor: ''
-      name: ''
+      flavor: Radiant, unblinking. It compells you to match its gaze and be mesmerized. The last thing you see is a thing of such beauty.
+      name: Tiger's Eye
     VariantA:
       flavor: This is what happens when a crew of good old birds with a machine shop discover a pirate's stash of 1835 LeTigre Absinthe. Smashing.
       name: Tusker
     VariantB:
       flavor: The whole Rebel-thing doesn't pay, so many have scavengers jobs on the side. This Mining Assault can burrow deep into the dangerous layers of ruins.
@@ -78,11 +78,11 @@ daggerknight:
       name: Revel Knight
     VariantB:
       flavor: How might we attain happiness? 1. Build your community. 2. Support others in times of need. 3. Invest your love in a few good friends. 4. Improve yourself.
       name: The Good Citizen
     default:
-      flavor: ''
+      flavor: Commissioned as a vanguard craft for officers and nobles, the DK-1 was designed to inspire the troops with heroic, close-range assaults. Later models added the now-standard shield for increased survivability.
       name: Dagger Knight
     flames:
       flavor: Her son wanted to be a fighter pilot. So she did everything to support him. Extra shifts to buy his uniforms. Leaving good jobs so he could be near the school and then the base. When his empty casket came back, she could only blame herself.
       name: Fire Knight
     spikes:
@@ -96,11 +96,11 @@ duster:
   variants:
     Camo:
       flavor: There's a strange cult of rural would-be-warriors who get together on weekends, drink corn liquor, puff up their chests and brag loudly about How-Things-Would-Go if there was an apocalypse. Strangely, the apocalypse is happening right now, yet these blowhards still manage to do nothing useful or constructive.
       name: Militia
     EpicA:
-      flavor: Before she joined the Order, she was drunken mechanic. Trapped in a wheelchair due to that horrible accident involving a coffin, 3-tons of freshly harvested sweet potatoes and an amorous parrot.
+      flavor: Before she joined the Order, she was a drunken mechanic. Trapped in a wheelchair due to that horrible accident involving a coffin, 3-tons of freshly harvested sweet potatoes and an amorous parrot.
       name: Ghost Duster
     EpicB:
       flavor: ''
       name: The Sympathizer
     EpicC:
@@ -171,11 +171,11 @@ engineer:
       name: Gearhead
 medic:
   name: Medic
   variants:
     Camo:
-      flavor: ''
+      flavor: Healers once relied on folk remedies to treat patients. Modern medicine has proven much more effective, but something warm and comforting was lost in the transition.
       name: Naturopath
     EpicA:
       flavor: The remnants of a dead religious order. They heal the unenlightened as a penance. Penance for betrayal of their mistress during her time of greatest need.
       name: Ghost Medic
     EpicB:
@@ -186,12 +186,12 @@ medic:
       name: Northern Doc
     EpicD:
       flavor: ''
       name: ''
     Tiger:
-      flavor: ''
-      name: ''
+      flavor: Great cats are fiercely protective of their young. The cubs must learn to fight for themselves, but know they can always return home to have their wounds licked.
+      name: Tiger Mother
     VariantA:
       flavor: A doctor flies a fine line when they dabble in their own medicine. There are fixes that give a bird confidence, agility, a sense of speed. The risks seems worth the greater good; the self treatment justified.
       name: Speed Medic
     VariantB:
       flavor: What good is a dead medic? Balance the risk of saving this one life against the long years ahead where you might save a thousand lives.
@@ -255,11 +255,11 @@ olfaithful:
       name: Spirit of Saint Leonardo
     default:
       flavor: Originally intended as a training plane, the Old Faithful was pressed into full service when we lost our northern factories.
       name: Old Faithful
     flames:
-      flavor: Crowdown Garage employs a grumpy grackle who only paints planes with bad-ass flames. It is her thing.
+      flavor: The Rebel City Store employs a grumpy grackle who only paints planes with bad-ass flames. It is her thing.
       name: Old Pepper
     spikes:
       flavor: Cool blue spikes transform this ancient training plane into a hipster fashion statement. Comes with built-in record player.
       name: Chill Faithful
     stars:
@@ -283,11 +283,11 @@ paladin:
     EpicD:
       flavor: ''
       name: ''
     Tiger:
       flavor: ''
-      name: ''
+      name: Lord of Claw and Fang
     VariantA:
       flavor: The burly birds of the Northern forests use these rigs to haul logs. Fueled by flapjacks.
       name: Lumberjack
     VariantB:
       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. And his trusty blue fox.
@@ -348,38 +348,38 @@ rapier:
   variants:
     Camo:
       flavor: ''
       name: Mud Pigeon
     EpicA:
-      flavor: That flickering motion in the corner of you eye? It is too late for you. It was always too late.
+      flavor: That flickering motion in the corner of your eye? It is too late for you. It was always too late.
       name: Ghost Hawk
     EpicB:
       flavor: Why do we invest in shiny baubles? It is because, as social animals, we are compelled to engage in social comparison. The bauble is communication of our identity and status. Without baubles, we have no way to signal our ties and roles within the communal whole.
       name: Comparative Advantage
     EpicC:
       flavor: ''
       name: Ice Hawk
     EpicD:
       flavor: ''
       name: ''
     Tiger:
-      flavor: ''
-      name: ''
+      flavor: Originally the pattern of a dangerous predator, now everyone wears it to mimic that strength. Turns out that can be just as effective.
+      name: Tiger Strike
     VariantA:
       flavor: ''
       name: Great Eagle
     VariantB:
-      flavor: ''
+      flavor: You'd think the hunt is about killing, but in reality it's all in the waiting. Waiting and watching. Watching and waiting.
       name: Hawk
     default:
       flavor: 'Finicky, but beloved by skilled pilots, the Raptor offers immense firepower combined with surprising agility. '
       name: Raptor
     flames:
-      flavor: ''
+      flavor: Pepper doesn't hide her distaste for these smaller, open-cockpit planes. Less surface area for painting flames, she says.
       name: Peregrine Pepper
     spikes:
-      flavor: ''
+      flavor: Swoop down, talons out. Snatched from the pond in the blink of an eye. The fish never sees it coming, and how could it? An attacker from another dimension.
       name: Razor Raptor
     stars:
       flavor: Famously piloted by an ancient field scout who lost most of his head feathers. Some say due to a gas attack. Others joke he furrowed his brow so much, his plummage fell right out.
       name: Bald Eagle
 siegetank:
@@ -408,21 +408,21 @@ siegetank:
       name: ''
     VariantB:
       flavor: Come middle age, you stand at the edge of a curious abyss. Not a straight plunge, but a soft slope going downward forever. If you trip, you will start to tumble and nothing will stop you.
       name: Old Timer
     default:
-      flavor: ''
+      flavor: The birds moth-balled their ground artillery when they ceded the poisoned soil. But Avian engineers abhor wasted firepower, so this unlikely flying tank was born.
       name: Siege Tank
     flames:
       flavor: Never, ever call Pepper a crow. And none of those New Caledonian compliments. Like her mama said, grackles ain't crows. And even with all the Equalizing and Uplifting, there's a certain amount of pride that goes with being a smaller icterid.
       name: Pepper Tank
     spikes:
       flavor: ''
       name: Grind Tank
     stars:
       flavor: ''
-      name: ''
+      name: Celestia
 support:
   name: Shieldmaiden
   variants:
     Camo:
       flavor: ''
@@ -489,11 +489,11 @@ tank:
       name: Some Pig
     default:
       flavor: An immense hulk composed mostly of armor and field generators. The Hog shrugs off bullets as it barrels straight into the crossfire.
       name: Hog
     flames:
-      flavor: ''
+      flavor: Like a flying bonfire, lighting the heavens. Pepper went through 6 cans of paint on this one.
       name: Porky Pepper
     spikes:
       flavor: ''
       name: Sulky Sow
     stars:
diff --git config_190301_0621/Texts/en-US/stats.txt config_190307_221/Texts/en-US/stats.txt
index 0767434..865b5e0 100644
--- config_190301_0621/Texts/en-US/stats.txt
+++ config_190307_221/Texts/en-US/stats.txt
@@ -31,10 +31,12 @@ maneuverEnergyCostMod: Manuever Steam Cost
 maxEnergyPoints: Max Steam
 maxHitPoints: Armor
 maxSpeed: Max Speed
 maxTurnRate: Turn Rate
 minSpeed: Min Speed
+secondaryCooldownMod: Secondary Cooldown
+secondaryDamageMod: Secondary Damage
 secondaryEnergyCostMod: Secondary Steam Cost
 spawnCooldownMod: Spawn Cooldown
 spawnDamageMod: Spawn Damage
 spawnHealthMod: Spawn Health
 spawnRangeMod: Spawn Range
diff --git config_190301_0621/Texts/en-US/store.txt config_190307_221/Texts/en-US/store.txt
index da0e9de..0af47ac 100644
--- config_190301_0621/Texts/en-US/store.txt
+++ config_190307_221/Texts/en-US/store.txt
@@ -28,16 +28,16 @@ post_purchase_action_storage: Just put into storage
 post_purchase_action_use_and_inventory: Use and put into inventory
 post_purchase_action_use_and_storage: Use and put into storage
 post_purchase_action_use_instantly: Use instantly
 product_desc_dye_blue_body: Turns your plane blue
 product_desc_dye_red_body: Turns your plane red
-product_desc_hangar_slot: More places for even more planes
+product_desc_hangar_slot: 1 additional plane Hangar slot
 product_desc_store_bundle_keys1: A binder of 5 special missions deep in Imperial Territory
-product_desc_store_bundle_starter: Jump start your rebel career with extra storage and an extra hangar space.
+product_desc_store_bundle_starter: Jump start your rebel career with 6 additional Storage slots and 1 Hangar slot!
 product_desc_store_inventory_slot: 4 additional cargo spaces on your plane inventory. These spaces are added to the single shared cargo container used by all your planes.
 product_desc_store_skill_loadout_slot: Another loadout for a different build of Pilot Skills. Swap between these in the Pilot School.
-product_desc_store_storage_slot: 6 additional storage spaces to keep items safe. You don't lose items stashed in storage when you are shot down.
+product_desc_store_storage_slot: 6 additional Storage spaces to keep items safe. You don't lose items stashed in storage when you are shot down.
 product_name_dye_black: Can of black
 product_name_dye_blue: Can of blue
 product_name_dye_c1_red: Can of c1_red
 product_name_dye_c2_red: Can of c2_red
 product_name_dye_clean_colors: Can of clean_colors
diff --git config_190301_0621/Texts/en-US/ui.txt config_190307_221/Texts/en-US/ui.txt
index 0b296ff..cd26ca0 100644
--- config_190301_0621/Texts/en-US/ui.txt
+++ config_190307_221/Texts/en-US/ui.txt
@@ -764,10 +764,13 @@ pilot_skill_mod_levelup: ' <color=#B5AC96>({0})</color>'
 pilot_skill_mod_rate: '{0}: {1}/s'
 pilot_skill_mod_standard: '{0}: {1}'
 pilot_skill_title: '{0} - L{1}'
 pilot_skill_title_maxlevel: '{0} - L{1} <size=75%>of {2}</size>'
 pilot_skill_title_nolevel: '{0}'
+pilot_skill_trigger_oncloudaffectsally: On cloud affects ally
+pilot_skill_trigger_oncloudaffectsally_heal: On heal ally
+pilot_skill_trigger_oncloudaffectsenemy: On cloud affects enemy
 pilot_skill_trigger_onhit: On hit
 pilot_skill_trigger_onkill: On kill
 pilot_skill_trigger_onmaneuverend: On maneuver end
 pilot_skill_trigger_onmaneuverstart: On maneuver start
 pilot_skill_trigger_onsecondary: On secondary
diff --git config_190301_0621/Texts/en-US/units.txt config_190307_221/Texts/en-US/units.txt
index 34201bf..4a850ba 100644
--- config_190301_0621/Texts/en-US/units.txt
+++ config_190307_221/Texts/en-US/units.txt
@@ -150,15 +150,15 @@ arenacloudleader: Smog Beast
 arenacube: Dark Sphinx
 arenacubeDEATH: Dark Sphinx
 arenacubebiglaserwall: Dark Sphinx
 arenacubebiglaserwall2: Dark Sphinx
 arenacubelasercross: Laser X 2
-arenacubemini: Guard Cube
+arenacubemini: Arena Bomber
 arenacubenode: Sphinx Cannon
-arenacubespiral: Spastic Cube
-arenacubetendril: Spastic Cube
-arenacubetendrilrandom: Spastic Cube
+arenacubespiral: Riddle
+arenacubetendril: Riddle
+arenacubetendrilrandom: Riddle
 arenadungeontreasure: Treasure
 arenadungeontreasureBIG: Big Treasure
 arenadungeontreasureBIG_reward: Big Treasure
 arenalasereye: Heckler
 arenamaster: (invisible master unit)
@@ -897,10 +897,13 @@ suppressor: Sleep Machine
 swarmboss: Commodus
 swarmbossDEATH: Commodus
 swarmbossswarm: Commodus Mob
 sweeper: Disinfector
 sweeperminion: Disinfector
+tailtrain01: Shield Convoy
+tailtrain02: Shield Convoy
+tailtrain03: Shield Convoy
 tank: Big Dog
 tankDEATH: Big Dog
 tankmine: Dogmine
 tankmissile: Dog Missile
 tankturret: Big Dog
@@ -976,10 +979,11 @@ thunderbossshieldblade: Defence Grid 2
 thunderbossshieldbladeleader: Defence Grid 2
 thunderminion: Rei
 thunderminion2: Rei
 tieleader2: Dread Rachel
 tiewingman: Peg Boy
+tiewingman_big: Big Boy
 trainA01: Scavenger Convoy
 trainA02: Scavenger
 trainB01: Ghost Train
 trainB02: Ghost Train
 trainB03: Ghost Train
diff --git config_190307_221/Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowispBUG.txt config_190307_221/Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowispBUG.txt
new file mode 100644
index 0000000..85a5d9d
--- /dev/null
+++ config_190307_221/Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowispBUG.txt	
@@ -0,0 +1,16 @@
+art: EnemyPoisonSprayer
+artScale: '1'
+colliderRadius: '0.6'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+hashOverride: '6003'
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '3'
+maxTurnRate: '180'
+minSpeed: '3'
+spawnInvulnerabilitySeconds: '2'
+templateName: willowispBUG
+tier: '2'
diff --git config_190301_0621/Units/66D - Space Dungeon/BOS1_avatarcannon.txt config_190307_221/Units/66D - Space Dungeon/BOS1_avatarcannon.txt
index 69f05b0..62fbdba 100644
--- config_190301_0621/Units/66D - Space Dungeon/BOS1_avatarcannon.txt	
+++ config_190307_221/Units/66D - Space Dungeon/BOS1_avatarcannon.txt	
@@ -1,6 +1,6 @@
-art: EnemyDoomsdayMissile
+art: '!EnemyInvisible'
 artScale: '2'
 colliderRadius: '0.3'
 colliderX: '0'
 colliderY: '0'
 effectImmunities:
@@ -155,12 +155,12 @@ gunTypes:
   spread: '0'
   turn: '-130'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '25'
-maxSpeed: '1.5'
+maxSpeed: '0'
 maxTurnRate: '180'
-minSpeed: '0.8'
+minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: avatarcannon
 tier: '10'
 xpMultiplier: '0'
diff --git config_190301_0621/Units/66D - Space Dungeon/xxx_spaceturret.txt config_190307_221/Units/66D - Space Dungeon/xxx_spaceturret.txt
index b20fc37..4ed3368 100644
--- config_190301_0621/Units/66D - Space Dungeon/xxx_spaceturret.txt	
+++ config_190307_221/Units/66D - Space Dungeon/xxx_spaceturret.txt	
@@ -50,10 +50,10 @@ particlePositions:
   - '0'
   - '0'
   - '-90'
 spawnDuration: '3'
 spawnInvulnerabilitySeconds: '0'
-spawnPFXPrefab: EnemyLaunchPod
+spawnPFXPrefab: EnemyLaunchPodQuick
 spawnPFXRotateRandomly: 'true'
 templateName: spaceturret
 tier: '10'
 useSpawnDuration: 'true'
diff --git config_190301_0621/Units/67D - Thief Dungeon/unit_thiefguard.txt config_190307_221/Units/67D - Thief Dungeon/unit_thiefguard.txt
index 12982ec..cd59abc 100644
--- config_190301_0621/Units/67D - Thief Dungeon/unit_thiefguard.txt	
+++ config_190307_221/Units/67D - Thief Dungeon/unit_thiefguard.txt	
@@ -15,10 +15,12 @@ gunMounts:
   mountAngle: '0'
   mountName: trail
   offset:
   - '0'
   - '-0.2'
+  sfx:
+    sound: 'null'
   slewRate: '0'
 - fireMode: Aimed
   firingArc: '90'
   flashOffset: '0'
   gunTemplateName: thiefguardLaser
diff --git config_190301_0621/Units/67D - Thief Dungeon/unit_thiefguard2.txt config_190307_221/Units/67D - Thief Dungeon/unit_thiefguard2.txt
index 765fccc..36496ca 100644
--- config_190301_0621/Units/67D - Thief Dungeon/unit_thiefguard2.txt	
+++ config_190307_221/Units/67D - Thief Dungeon/unit_thiefguard2.txt	
@@ -15,10 +15,12 @@ gunMounts:
   mountAngle: '0'
   mountName: trail
   offset:
   - '0'
   - '-0.2'
+  sfx:
+    sound: 'null'
   slewRate: '0'
 - fireMode: Aimed
   firingArc: '90'
   flashOffset: '0'
   gunTemplateName: thiefguard2Laser
diff --git config_190301_0621/Units/69D - Temple Dungeon/BOS1_smokeboss.txt config_190307_221/Units/69D - Temple Dungeon/BOS1_smokeboss.txt
index 0c3fe57..e5607b5 100644
--- config_190301_0621/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
+++ config_190307_221/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
@@ -10,10 +10,17 @@ additionalStates:
     - code: NearMarker
       name: mousesacrifice
       toState: eatmouse
       value: '6'
   - events:
+    - code: InstantEffect
+      name: EnemyEffect_Heal_large
+      offset:
+        pos:
+        - '0'
+        - '0'
+        - '5'
     - code: GunAwake
       name: heal
       value: '0'
     - code: AdjustHealthBy
       value: '0.02'
diff --git config_190301_0621/Units/69D - Temple Dungeon/BOS2_bansheeleader5.txt config_190307_221/Units/69D - Temple Dungeon/BOS2_bansheeleader5.txt
index 7a6b2f7..5869ae3 100644
--- config_190301_0621/Units/69D - Temple Dungeon/BOS2_bansheeleader5.txt	
+++ config_190307_221/Units/69D - Temple Dungeon/BOS2_bansheeleader5.txt	
@@ -219,11 +219,11 @@ loot:
   bossloot:
     lootTableId: miniboss
   upgrades:
     lootTableId: upgrade_water_bonus_20
 maxEnergyPoints: '1'
-maxHitPoints: '180'
+maxHitPoints: '270'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 particlePositions:
 - name: darkSmokeSlow
diff --git config_190301_0621/Units/69D - Temple Dungeon/unit_trooper.txt config_190307_221/Units/69D - Temple Dungeon/unit_trooper.txt
index ba8179c..14dad33 100644
--- config_190301_0621/Units/69D - Temple Dungeon/unit_trooper.txt	
+++ config_190307_221/Units/69D - Temple Dungeon/unit_trooper.txt	
@@ -44,5 +44,6 @@ maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: trooper
 tier: '10'
+xpMultiplier: '0'
diff --git config_190301_0621/Units/69D - Temple Dungeon/unit_trooperleader.txt config_190307_221/Units/69D - Temple Dungeon/unit_trooperleader.txt
index 5b723f4..5e9e413 100644
--- config_190301_0621/Units/69D - Temple Dungeon/unit_trooperleader.txt	
+++ config_190307_221/Units/69D - Temple Dungeon/unit_trooperleader.txt	
@@ -59,5 +59,6 @@ particlePositions:
   - '0'
   - '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: trooperleader
 tier: '10'
+xpMultiplier: '1.5'
diff --git config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenaangel.txt config_190307_221/Units/72D - Arena Dungeon 1/unit_arenaangel.txt
index d288361..0a9917d 100644
--- config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenaangel.txt	
+++ config_190307_221/Units/72D - Arena Dungeon 1/unit_arenaangel.txt	
@@ -72,11 +72,11 @@ particlePositions:
   - '0'
   - '0'
   - '0'
 spawnDuration: '3'
 spawnInvulnerabilitySeconds: '2'
-spawnPFXPrefab: EnemyLaunchPod
+spawnPFXPrefab: EnemyLaunchPodLarge
 spawnPFXRotateRandomly: 'true'
 templateName: arenaangel
 tier: '5'
 useSpawnDuration: 'true'
 xpMultiplier: '1.2'
diff --git config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenacloudleader.txt config_190307_221/Units/72D - Arena Dungeon 1/unit_arenacloudleader.txt
index 6adb1fa..97b0d39 100644
--- config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenacloudleader.txt	
+++ config_190307_221/Units/72D - Arena Dungeon 1/unit_arenacloudleader.txt	
@@ -39,11 +39,11 @@ maxHitPoints: '25'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 spawnDuration: '3'
 spawnInvulnerabilitySeconds: '2'
-spawnPFXPrefab: EnemyLaunchPod
+spawnPFXPrefab: EnemyLaunchPodLarge
 spawnPFXRotateRandomly: 'true'
 templateName: arenacloudleader
 tier: '5'
 useSpawnDuration: 'true'
 xpMultiplier: '1.2'
diff --git config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt config_190307_221/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt
index 2ee78d0..f6318a3 100644
--- config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt	
+++ config_190307_221/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt	
@@ -58,11 +58,11 @@ particlePositions:
   - '-90'
   - '0'
   - '0'
 spawnDuration: '3'
 spawnInvulnerabilitySeconds: '2'
-spawnPFXPrefab: EnemyLaunchPod
+spawnPFXPrefab: EnemyLaunchPodLarge
 spawnPFXRotateRandomly: 'true'
 templateName: arenalasereye
 tier: '5'
 useSpawnDuration: 'true'
 xpMultiplier: '1.2'
diff --git config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenatackler.txt config_190307_221/Units/72D - Arena Dungeon 1/unit_arenatackler.txt
index ba85898..0c1ec14 100644
--- config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenatackler.txt	
+++ config_190307_221/Units/72D - Arena Dungeon 1/unit_arenatackler.txt	
@@ -79,11 +79,11 @@ particlePositions:
   - '0'
   - '0'
   - '0'
 spawnDuration: '3'
 spawnInvulnerabilitySeconds: '2'
-spawnPFXPrefab: EnemyLaunchPod
+spawnPFXPrefab: EnemyLaunchPodLarge
 spawnPFXRotateRandomly: 'true'
 templateName: arenatackler
 tier: '5'
 useSpawnDuration: 'true'
 xpMultiplier: '1.2'
diff --git config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt config_190307_221/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt
index e1cc56f..3f44408 100644
--- config_190301_0621/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt	
+++ config_190307_221/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt	
@@ -42,11 +42,11 @@ particlePositions:
   - '0'
   - '0'
   - '-90'
 spawnDuration: '3'
 spawnInvulnerabilitySeconds: '2'
-spawnPFXPrefab: EnemyLaunchPod
+spawnPFXPrefab: EnemyLaunchPodLarge
 spawnPFXRotateRandomly: 'true'
 templateName: arenawhaleshark
 tier: '5'
 useSpawnDuration: 'true'
 xpMultiplier: '1.2'
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacube.txt config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacube.txt
index 4874eb6..35af801 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacube.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacube.txt	
@@ -50,16 +50,16 @@ gunMounts:
     effect: Lightning
     effectAmount: '0.1'
     effectDamage: '0.5'
     effectTime: '0.1'
     isPiercing: 'true'
-    lifetime: '10'
+    lifetime: '200'
     multi: '72'
     multiSpread: '5'
     name: quad
     rof: '1'
-    speed: '4.5'
+    speed: '3.85'
     spread: '0'
   mountAngle: '0'
   mountName: giantring
   sfx:
     pitch: '2'
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubemini.txt config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubemini.txt
index d6b7e99..f46901c 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubemini.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubemini.txt	
@@ -1,22 +1,26 @@
-art: EnemyGuardBarracks
-artScale: '0.5'
-colliderRadius: '3'
+art: EnemyArena2H
+artScale: '1.3'
+colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 difficultyTable: standardBoss
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig2
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '200'
+maxHitPoints: '150'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
-spawnInvulnerabilitySeconds: '2'
+spawnDuration: '3'
+spawnInvulnerabilitySeconds: '5'
+spawnPFXPrefab: EnemyLaunchPodLarge
+spawnPFXRotateRandomly: 'true'
 templateName: arenacubemini
 tier: '10'
+useSpawnDuration: 'true'
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubespiral.txt config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubespiral.txt
index ac9379d..442e869 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubespiral.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubespiral.txt	
@@ -1,8 +1,8 @@
-art: EnemyGuardBarracks
-artScale: '0.25'
-colliderRadius: '3'
+art: EnemyArena2I
+artScale: '0.7'
+colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubetendril.txt config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubetendril.txt
index d9a11a8..7430bac 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubetendril.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubetendril.txt	
@@ -1,8 +1,8 @@
-art: EnemyGuardBarracks
-artScale: '0.33'
-colliderRadius: '3'
+art: EnemyArena2I
+artScale: '0.7'
+colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
@@ -50,12 +50,12 @@ gunTypes:
   effect: Lightning
   effectAmount: '0.1'
   effectDamage: '0.5'
   effectTime: '0.1'
   lifetime: '0.75'
-  multi: '30'
-  multiSpread: '12'
+  multi: '15'
+  multiSpread: '24'
   name: arenacubetendrilexplode
   rof: '100'
   speed: '6'
   spread: '0'
 healthRegenRate: '0'
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubetendrilrandom.txt config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubetendrilrandom.txt
index 6479d3a..4fc592d 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/BOS_arenacubetendrilrandom.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/BOS_arenacubetendrilrandom.txt	
@@ -1,8 +1,8 @@
-art: EnemyGuardBarracks
-artScale: '0.25'
-colliderRadius: '3'
+art: EnemyArena2I
+artScale: '0.7'
+colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/unit_arena2ballnchain.txt config_190307_221/Units/73D - Arena Dungeon 2/unit_arena2ballnchain.txt
index ff8c550..f1be434 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/unit_arena2ballnchain.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/unit_arena2ballnchain.txt	
@@ -98,13 +98,13 @@ gunMounts:
     damage: '0.25'
     effect: Lightning
     effectAmount: '0.1'
     effectDamage: '0.25'
     effectTime: '0.1'
-    lifetime: '1.5'
-    multi: '15'
-    multiSpread: '12'
+    lifetime: '0.25'
+    multi: '10'
+    multiSpread: '182'
     name: shotty
     rof: '10'
     speed: '4'
     spread: '0'
   mountAngle: '0'
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/unit_arena2lasereye.txt config_190307_221/Units/73D - Arena Dungeon 2/unit_arena2lasereye.txt
index 6760d51..e8c5d9e 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/unit_arena2lasereye.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/unit_arena2lasereye.txt	
@@ -40,14 +40,14 @@ gunMounts:
 gunTypes:
 - bulletPrefab: laserBullet
   bulletSize: '2'
   burst: '210'
   cooldown: '3'
-  damage: '0.7'
+  damage: '0.1'
   effect: Lightning
   effectAmount: '0.1'
-  effectDamage: '0.7'
+  effectDamage: '0.1'
   effectTime: '0.1'
   isPiercing: 'true'
   lifetime: '4'
   multi: '2'
   multiOffset:
@@ -60,14 +60,14 @@ gunTypes:
   spread: '0'
 - bulletPrefab: laserBullet
   bulletSize: '2'
   burst: '210'
   cooldown: '3'
-  damage: '0.7'
+  damage: '0.1'
   effect: Lightning
   effectAmount: '0.1'
-  effectDamage: '0.7'
+  effectDamage: '0.1'
   effectTime: '0.1'
   isPiercing: 'true'
   lifetime: '4'
   multi: '2'
   multiOffset:
diff --git config_190301_0621/Units/73D - Arena Dungeon 2/unit_arena2tripod.txt config_190307_221/Units/73D - Arena Dungeon 2/unit_arena2tripod.txt
index 036d002..c17f560 100644
--- config_190301_0621/Units/73D - Arena Dungeon 2/unit_arena2tripod.txt	
+++ config_190307_221/Units/73D - Arena Dungeon 2/unit_arena2tripod.txt	
@@ -64,16 +64,16 @@ gunMounts:
     damage: '0.5'
     effect: Lightning
     effectAmount: '0.1'
     effectDamage: '0.5'
     effectTime: '0.1'
-    lifetime: '1.5'
+    lifetime: '3'
     multi: '1'
     multiSpread: '0'
     name: shotty
     rof: '3'
-    speed: '8'
+    speed: '4'
     spread: '0'
   mountAngle: '0'
   mountName: cannon
   offset:
   - '0'
@@ -88,10 +88,10 @@ maxHitPoints: '40'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 spawnDuration: '3'
 spawnInvulnerabilitySeconds: '0'
-spawnPFXPrefab: EnemyLaunchPod
+spawnPFXPrefab: EnemyLaunchPodLarge
 spawnPFXRotateRandomly: 'true'
 templateName: arena2tripod
 tier: '10'
 useSpawnDuration: 'true'
diff --git config_190301_0621/conversations.txt config_190307_221/conversations.txt
index 2254ff9..9ea878d 100644
--- config_190301_0621/conversations.txt
+++ config_190307_221/conversations.txt
@@ -1,45 +1,45 @@
 characters:
   bartender_parrot:
     art:
-      default: sarge_armsdown_01
-      flirty: sarge_armships_01
-      smiling: sarge_armsdown_01
-      whisper: sarge_armships_01
+      default: rebelnpc_pub_01
+      flirty: rebelnpc_pub_01
+      smiling: rebelnpc_pub_01
+      whisper: rebelnpc_pub_01
   mechanic_penguin:
     art:
-      angry: sarge_armships_01
-      default: sarge_armsdown_01
-      smiling: sarge_armsdown_01
-      waving: sarge_armsdown_01
+      angry: rebelnpc_hangar_01
+      default: rebelnpc_hangar_01
+      smiling: rebelnpc_hangar_01
+      waving: rebelnpc_hangar_01
   merchant_peacock:
     art:
-      arms_spread: sarge_armships_01
-      default: sarge_armsdown_01
-      smiling: sarge_armsdown_01
+      arms_spread: rebelnpc_store_01
+      default: rebelnpc_store_01
+      smiling: rebelnpc_store_01
   portaloperator:
     art:
       default: PortalOperator
   scientist_owl:
     art:
-      default: sarge_armsdown_01
-      distracted: sarge_armships_01
-      pointing: sarge_armsdown_01
-      waving: sarge_armships_01
+      default: rebelnpc_workshop_01
+      distracted: rebelnpc_workshop_01
+      pointing: rebelnpc_workshop_01
+      waving: rebelnpc_workshop_01
   sergeant:
     art:
       alt: sarge_armsdown_02
       default: sarge_armsdown_01
       hips1: sarge_armships_01
       hips2: sarge_armships_02
       pointing: sarge_point_01
       shout: sarge_shout
   stevedore_pelican:
     art:
-      default: sarge_armsdown_01
-      smiling: sarge_armsdown_01
-      worried: sarge_armships_01
+      default: rebelnpc_storage_01
+      smiling: rebelnpc_storage_01
+      worried: rebelnpc_storage_01
 conversations:
 - content:
   - character: sergeant
   - text: test-01
   - text: test-01b
@@ -216,22 +216,10 @@ conversations:
   - text: test2-01
   id: test2
 - clientTriggerable: 'true'
   content:
   - character: sergeant
-    position: rightFlipped
-  - text: intro-crafting_01
-  - text: intro-crafting_02
-  - text: intro-crafting_03
-  - character: sergeant
-    pose: pointing
-    position: rightFlipped
-  - text: intro-crafting_04
-  id: intro-crafting
-- clientTriggerable: 'true'
-  content:
-  - character: sergeant
     pose: alt
     position: rightFlipped
   - background: image
     image: pilotschool_01
   - text: intro-pilot-school_01
@@ -275,118 +263,151 @@ conversations:
   id: intro-pilot-school
 - clientTriggerable: 'true'
   content:
   - character: mechanic_penguin
     pose: default
+    position: rightFlipped
   - text: intro-hangar_01
   - character: mechanic_penguin
     pose: angry
+    position: rightFlipped
   - text: intro-hangar_02
   - character: mechanic_penguin
     pose: default
+    position: rightFlipped
   - text: intro-hangar_03
   - character: mechanic_penguin
     pose: smiling
+    position: rightFlipped
   - text: intro-hangar_04
   - character: mechanic_penguin
     pose: default
+    position: rightFlipped
   - text: intro-hangar_05
   - character: mechanic_penguin
     pose: smiling
+    position: rightFlipped
   - text: intro-hangar_06
   - character: mechanic_penguin
     pose: waving
+    position: rightFlipped
   - text: intro-hangar_07
   id: intro-hangar
 - clientTriggerable: 'true'
   content:
   - character: merchant_peacock
     pose: smiling
+    position: rightFlipped
   - text: intro-store_01
   - character: merchant_peacock
     pose: default
+    position: rightFlipped
   - text: intro-store_02
   - character: merchant_peacock
     pose: default
+    position: rightFlipped
   - text: intro-store_03
   - character: merchant_peacock
     pose: default
+    position: rightFlipped
   - background: image
-    image: pilotschool_01
+    image: slide_shop
   - text: intro-store_04
   - background: none
   - character: merchant_peacock
     pose: arms_spread
+    position: rightFlipped
   - text: intro-store_05
   id: intro-store
 - clientTriggerable: 'true'
   content:
   - character: stevedore_pelican
     pose: default
+    position: rightFlipped
   - text: intro-storage_01
   - character: stevedore_pelican
     pose: smiling
+    position: rightFlipped
   - text: intro-storage_02
   - character: stevedore_pelican
     pose: default
+    position: rightFlipped
   - text: intro-storage_03
   - character: stevedore_pelican
     pose: worried
+    position: rightFlipped
   - text: intro-storage_04
   - character: stevedore_pelican
     pose: smiling
+    position: rightFlipped
   - text: intro-storage_05
   - character: stevedore_pelican
     pose: default
+    position: rightFlipped
   - text: intro-storage_06
   - character: stevedore_pelican
     pose: smiling
+    position: rightFlipped
   - text: intro-storage_07
   id: intro-storage
 - clientTriggerable: 'true'
   content:
   - character: scientist_owl
     pose: distracted
+    position: rightFlipped
   - text: intro-workshop_01
   - character: scientist_owl
     pose: waving
+    position: rightFlipped
   - text: intro-workshop_02
   - character: scientist_owl
     pose: default
+    position: rightFlipped
   - text: intro-workshop_03
   - character: scientist_owl
     pose: pointing
+    position: rightFlipped
   - text: intro-workshop_04
   - character: scientist_owl
     pose: default
+    position: rightFlipped
   - text: intro-workshop_05
   - character: scientist_owl
     pose: distracted
+    position: rightFlipped
   - text: intro-workshop_06
   - character: scientist_owl
     pose: waving
+    position: rightFlipped
   - text: intro-workshop_07
-  id: intro-workshop
+  id: intro-crafting
 - clientTriggerable: 'true'
   content:
   - character: bartender_parrot
     pose: default
+    position: rightFlipped
   - text: intro-pub_01
   - character: bartender_parrot
     pose: smiling
+    position: rightFlipped
   - text: intro-pub_02
   - character: bartender_parrot
     pose: default
+    position: rightFlipped
   - text: intro-pub_03
   - character: bartender_parrot
     pose: whisper
+    position: rightFlipped
   - text: intro-pub_04
   - character: bartender_parrot
     pose: default
+    position: rightFlipped
   - text: intro-pub_05
   - character: bartender_parrot
     pose: smiling
+    position: rightFlipped
   - text: intro-pub_06
   - character: bartender_parrot
     pose: flirty
+    position: rightFlipped
   - text: intro-pub_07
   id: intro-pub
diff --git config_190301_0621/global.txt config_190307_221/global.txt
index b6e200b..a738864 100644
--- config_190301_0621/global.txt
+++ config_190307_221/global.txt
@@ -32,11 +32,11 @@ backend: ozy
 backendErrorPercentage: '0'
 backendMonkeyDelayMaxMs: '500'
 backendMonkeyDelayMinMs: '10'
 baseNumHangarSlots: '2'
 baseNumInventorySlots: '12'
-baseNumStorageSlots: '12'
+baseNumStorageSlots: '16'
 baseSkillLoadoutSlots: '1'
 bulletMultipleSpacing: '0.5'
 checkLinkTimeout: '5'
 clientFPS: '60'
 clientNetworkHeartbeatIntervalMs: '6'
diff --git config_190301_0621/index.txt config_190307_221/index.txt
index b021126..8c6d7f3 100644
--- config_190301_0621/index.txt
+++ config_190307_221/index.txt
@@ -294,10 +294,11 @@
 - Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede02
 - Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede03
 - Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navi
 - Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navileader
 - Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowisp
+- Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowispBUG
 - Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tank
 - Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tankDEATH
 - Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tankmine
 - Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tankmissile
 - Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopper
diff --git config_190301_0621/instantEffects.txt config_190307_221/instantEffects.txt
index cd39af5..3e710c2 100644
--- config_190301_0621/instantEffects.txt
+++ config_190307_221/instantEffects.txt
@@ -1,9 +1,5 @@
-EnemyEffect_BarrierBeam:
-  steps:
-  - prefab: EnemyEffect_BarrierBeam
-    time: '0.0'
 EnemyEffect_Heal_large:
   steps:
   - prefab: EnemyEffect_Heal_large
     time: '0.0'
 EnemyEffect_Heal_medium:
@@ -136,46 +132,10 @@ dangerRect_3:
     time: '0'
 deathAnimation:
   steps:
   - animationTriggerName: death
     time: '0.00'
-detectionCone180_1:
-  steps:
-  - prefab: detectionCone180_1
-    time: '0.0'
-detectionCone180_2:
-  steps:
-  - prefab: detectionCone180_2
-    time: '0.0'
-detectionCone180_3:
-  steps:
-  - prefab: detectionCone180_3
-    time: '0.0'
-detectionCone45_1:
-  steps:
-  - prefab: detectionCone45_1
-    time: '0.0'
-detectionCone45_2:
-  steps:
-  - prefab: detectionCone45_2
-    time: '0.0'
-detectionCone45_3:
-  steps:
-  - prefab: detectionCone45_3
-    time: '0.0'
-detectionCone90_1:
-  steps:
-  - prefab: detectionCone90_1
-    time: '0.0'
-detectionCone90_2:
-  steps:
-  - prefab: detectionCone90_2
-    time: '0.0'
-detectionCone90_3:
-  steps:
-  - prefab: detectionCone90_3
-    time: '0.0'
 detectionZone_1:
   steps:
   - prefab: detectionZone_1
     time: '0'
 detectionZone_2:
diff --git config_190301_0621/news.txt config_190307_221/news.txt
index 09edf69..62f7be1 100644
--- config_190301_0621/news.txt
+++ config_190307_221/news.txt
@@ -32,8 +32,12 @@ news_hardy_heron:
   Url: https://community.steambirds.com/blog/340
 news_ibis_icubators:
   IsVisibleToClient: 'true'
   Time: 2019-02-27 15:00
   Url: https://steambirds.com/2019/02/27/incoming-ibis-incubators/
+news_jazzy_jays:
+  IsVisibleToClient: 'true'
+  Time: 2019-03-07 22:00
+  Url: https://steambirds.com/2019/03/07/joyous-jazzy-jays/
 test_news:
   IsVisibleToClient: 'false'
   Time: 2018-05-31 00:00
diff --git config_190301_0621/playerclasses.txt config_190307_221/playerclasses.txt
index f87dd85..e6ec0ad 100644
--- config_190301_0621/playerclasses.txt
+++ config_190307_221/playerclasses.txt
@@ -741,11 +741,11 @@ engineer:
     slot: Armor
   statMods:
   - amount: '1.5'
     math: multiply
     name: energyRegenRate
-  - amount: '0.8'
+  - amount: '0.9'
     math: multiply
     name: maxHitPoints
   - amount: '1.2'
     math: multiply
     name: gunDamageMod
@@ -899,11 +899,11 @@ medic:
     math: multiply
     name: gunDamageMod
   - amount: '2.0'
     math: multiply
     name: energyRegenRate
-  - amount: '1.0'
+  - amount: '0.9'
     math: multiply
     name: maxHitPoints
   - amount: '1.024'
     leveling: 'true'
     math: multiply
@@ -2331,11 +2331,11 @@ wizard:
     Armor:
     - maneuver: warpForward
     Engine:
     - maneuver: superspeed
     - buff:
-      - amount: '0.4'
+      - amount: '0.65'
         math: multiply
         name: maxTurnRate
       - amount: '1.5'
         math: multiply
         name: maxSpeed
@@ -2361,11 +2361,11 @@ wizard:
     slot: Armor
   statMods:
   - amount: '1.5'
     math: multiply
     name: energyRegenRate
-  - amount: '0.8'
+  - amount: '0.9'
     math: multiply
     name: maxHitPoints
   - amount: '1.026'
     leveling: 'true'
     math: multiply
diff --git config_190301_0621/skillTree.txt config_190307_221/skillTree.txt
index 66d1d89..3f8a626 100644
--- config_190301_0621/skillTree.txt
+++ config_190307_221/skillTree.txt
@@ -375,20 +375,27 @@ groups:
       level: '10'
       planeClass: medic
   skills:
   - medic_1a
   - medic_1b
+- id: medic_2
+  requirements:
+  - pilotLevelAboveOrEq: '46'
+  skills:
+  - medic_2a
+  - medic_2b
 - id: medic_3
   requirements:
   - pilotLevelAboveOrEq: '77'
   skills:
   - medic_3a
   - medic_3b
 - id: medic_4
   requirements:
   - pilotLevelAboveOrEq: '144'
   skills:
+  - medic_4a
   - medic_4b
 - id: daggerknight_1
   requirements:
   - pilotLevelAboveOrEq: '15'
   - classLevelReached:
@@ -474,21 +481,24 @@ groups:
   - pilotLevelAboveOrEq: '21'
   - classLevelReached:
       level: '10'
       planeClass: pirate
   skills:
+  - bandit_1a
   - bandit_1b
 - id: bandit_2
   requirements:
   - pilotLevelAboveOrEq: '74'
   skills:
   - bandit_2a
+  - bandit_2b
 - id: bandit_3
   requirements:
   - pilotLevelAboveOrEq: '105'
   skills:
   - bandit_3a
+  - bandit_3b
 - id: bandit_4
   requirements:
   - pilotLevelAboveOrEq: '172'
   skills:
   - bandit_4a
@@ -612,10 +622,11 @@ groups:
   - duster_1b
 - id: duster_2
   requirements:
   - pilotLevelAboveOrEq: '98'
   skills:
+  - duster_2a
   - duster_2b
 - id: duster_3
   requirements:
   - pilotLevelAboveOrEq: '129'
   skills:
diff --git config_190301_0621/skills.txt config_190307_221/skills.txt
index 3eb650f..5fcbd51 100644
--- config_190301_0621/skills.txt
+++ config_190307_221/skills.txt
@@ -1516,15 +1516,15 @@
   label: 1-A
   maxLevel: '5'
   passives:
   - mods:
     - statMod:
-        amount: '0.8'
+        amount: '0.9'
         math: multiply
         name: gunCooldownMod
     - statMod:
-        amount: '0.95'
+        amount: '0.97'
         leveling: 'true'
         math: multiply
         name: gunCooldownMod
     - effectIcon: effecticon_speedgun
     volatileConditions:
@@ -2743,11 +2743,11 @@
     - statMod:
         amount: '1.50'
         math: multiply
         name: energyRegenRate
     - statMod:
-        amount: '0.02'
+        amount: '1.02'
         leveling: 'true'
         math: multiply
         name: energyRegenRate
     - effectIcon: effecticon_armorboost
     volatileConditions:
@@ -2866,10 +2866,49 @@
         amount: '1.1'
         math: multiply
         name: secondaryEnergyCostMod
 - conditions:
   - planeClass: medic
+  cost: '2'
+  icon: skillicon_medic
+  id: medic_2a
+  label: 2-A
+  maxLevel: '1'
+  passives:
+  - mods:
+    - statMod:
+        amount: '0.5'
+        math: multiply
+        name: energyRegenRate
+  triggers:
+  - actions:
+    - duration: '2'
+      mods:
+      - statMod:
+          amount: '2'
+          math: multiply
+          name: energyRegenRate
+      - effectIcon: effecticon_steamboost
+    cloudType: heal
+    trigger: OnCloudAffectsAlly
+- conditions:
+  - planeClass: medic
+  cost: '2'
+  icon: skillicon_medic
+  id: medic_2b
+  label: 2-B
+  maxLevel: '1'
+  triggers:
+  - actions:
+    - health: '5'
+    cloudType: heal
+    trigger: OnCloudAffectsAlly
+  - actions:
+    - health: '-5'
+    trigger: OnKill
+- conditions:
+  - planeClass: medic
   cost: '3'
   icon: skillicon_medic
   id: medic_3a
   label: 3-A
   maxLevel: '5'
@@ -2907,10 +2946,37 @@
         name: secondaryEnergyCostMod
 - conditions:
   - planeClass: medic
   cost: '3'
   icon: skillicon_medic
+  id: medic_4a
+  label: 4-A
+  maxLevel: '5'
+  triggers:
+  - actions:
+    - duration: '2'
+      mods:
+      - statMod:
+          amount: '1.15'
+          math: multiply
+          name: gunRangeMod
+      - statMod:
+          amount: '1.01'
+          leveling: 'true'
+          math: multiply
+          name: gunRangeMod
+      - statMod:
+          amount: '0.5'
+          math: multiply
+          name: maxHitPoints
+      - effectIcon: effecticon_rangeboost
+    cloudType: heal
+    trigger: OnCloudAffectsAlly
+- conditions:
+  - planeClass: medic
+  cost: '3'
+  icon: skillicon_medic
   id: medic_4b
   label: 4-B
   maxLevel: '5'
   triggers:
   - actions:
@@ -3076,20 +3142,20 @@
   triggers:
   - actions:
     - duration: '1.5'
       mods:
       - statMod:
-          amount: '0.8'
+          amount: '0.9'
           math: multiply
           name: gunCooldownMod
       - statMod:
           amount: '0.98'
           leveling: 'true'
           math: multiply
           name: gunCooldownMod
       - effectIcon: effecticon_speedgun
-      stacks: '3'
+      stacks: '2'
     trigger: OnKill
 - conditions:
   - planeClass: daggerknight
   cost: '3'
   icon: skillicon_daggerknight
@@ -3463,10 +3529,31 @@
     trigger: OnKill
 - conditions:
   - planeClass: pirate
   cost: '1'
   icon: skillicon_bandit
+  id: bandit_1a
+  label: 1-A
+  maxLevel: '5'
+  passives:
+  - mods:
+    - statMod:
+        amount: '1.25'
+        math: multiply
+        name: secondaryDamageMod
+    - statMod:
+        amount: '1.01'
+        leveling: 'true'
+        math: multiply
+        name: secondaryDamageMod
+    - effectIcon: effecticon_secondarydamageboost
+    volatileConditions:
+    - nearbyPlayersAboveOrEq: '2'
+- conditions:
+  - planeClass: pirate
+  cost: '1'
+  icon: skillicon_bandit
   id: bandit_1b
   label: 1-B
   maxLevel: '5'
   passives:
   - mods:
@@ -3504,10 +3591,28 @@
         amount: '0.6'
         math: multiply
         name: maneuverEnergyCostMod
 - conditions:
   - planeClass: pirate
+  cost: '2'
+  icon: skillicon_bandit
+  id: bandit_2b
+  label: 2-B
+  maxLevel: '5'
+  passives:
+  - mods:
+    - statMod:
+        amount: '0.7'
+        math: multiply
+        name: secondaryCooldownMod
+    - statMod:
+        amount: '0.98'
+        leveling: 'true'
+        math: multiply
+        name: secondaryCooldownMod
+- conditions:
+  - planeClass: pirate
   cost: '3'
   icon: skillicon_bandit
   id: bandit_3a
   label: 3-A
   maxLevel: '5'
@@ -3529,10 +3634,37 @@
     trigger: OnHit
 - conditions:
   - planeClass: pirate
   cost: '3'
   icon: skillicon_bandit
+  id: bandit_3b
+  label: 3-B
+  maxLevel: '5'
+  triggers:
+  - actions:
+    - duration: '2'
+      mods:
+      - statMod:
+          amount: '1.3'
+          math: multiply
+          name: secondaryDamageMod
+      - statMod:
+          amount: '1.02'
+          leveling: 'true'
+          math: multiply
+          name: secondaryDamageMod
+      - statMod:
+          amount: '1.2'
+          math: multiply
+          name: secondaryEnergyCostMod
+      - effectIcon: effecticon_secondarydamageboost
+      stacks: '2'
+    trigger: OnKill
+- conditions:
+  - planeClass: pirate
+  cost: '3'
+  icon: skillicon_bandit
   id: bandit_4a
   label: 4-A
   maxLevel: '1'
   passives:
   - mods:
@@ -3551,11 +3683,12 @@
   id: bandit_4b
   label: 4-B
   maxLevel: '1'
   triggers:
   - actions:
-    - health: '10'
+    - cooldown: '2'
+      health: '4'
     trigger: OnHit
 - conditions:
   - planeClass: wizard
   cost: '1'
   icon: skillicon_merlin
@@ -4323,10 +4456,35 @@
     - superspeed: 'true'
 - conditions:
   - planeClass: duster
   cost: '2'
   icon: skillicon_duster
+  id: duster_2a
+  label: 2-A
+  maxLevel: '5'
+  passives:
+  - mods:
+    - statMod:
+        amount: '1.4'
+        math: multiply
+        name: secondaryDamageMod
+    - statMod:
+        amount: '1.02'
+        leveling: 'true'
+        math: multiply
+        name: secondaryDamageMod
+    - statMod:
+        amount: '0.2'
+        math: multiply
+        name: gunDamageMod
+    - effectIcon: effecticon_secondaryboost
+    volatileConditions:
+    - superspeed: 'true'
+- conditions:
+  - planeClass: duster
+  cost: '2'
+  icon: skillicon_duster
   id: duster_2b
   label: 2-B
   maxLevel: '5'
   passives:
   - mods:
diff --git config_190301_0621/statefulEffects.txt config_190307_221/statefulEffects.txt
index d260cbe..99c10d5 100644
--- config_190301_0621/statefulEffects.txt
+++ config_190307_221/statefulEffects.txt
@@ -1,7 +1,9 @@
 Blizzard:
   loopPrefab: Blizzard
+EnemyEffect_BarrierBeam:
+  loopPrefab: EnemyEffect_BarrierBeam
 EnemyEffect_Malfuction_large:
   loopPrefab: EnemyEffect_Malfuction_large
 EnemyEffect_Malfuction_medium:
   loopPrefab: EnemyEffect_Malfuction_medium
 EnemyEffect_Malfuction_small:
@@ -12,56 +14,16 @@ EnemyEffect_chargeUp_medium:
   loopPrefab: EnemyEffect_chargeUp_medium
 EnemyEffect_chargeUp_small:
   loopPrefab: EnemyEffect_chargeUp_small
 EnemyEffect_sniperLaser:
   loopPrefab: EnemyEffect_sniperLaser
-dangerCircle_1_stateful:
-  loopPrefab: dangerCircle_1
-dangerCircle_2_stateful:
-  loopPrefab: dangerCircle_2
-dangerCircle_3_stateful:
-  loopPrefab: dangerCircle_3
-dangerCone180_1_stateful:
-  loopPrefab: dangerCone180_1
-dangerCone180_2_stateful:
-  loopPrefab: dangerCone180_2
-dangerCone180_3_stateful:
-  loopPrefab: dangerCone180_3
-dangerCone45_1_stateful:
-  loopPrefab: dangerCone45_1
-dangerCone45_2_stateful:
-  loopPrefab: dangerCone45_2
-dangerCone45_3_stateful:
-  loopPrefab: dangerCone45_3
-dangerCone90_1_stateful:
-  loopPrefab: dangerCone90_1
-dangerCone90_2_stateful:
-  loopPrefab: dangerCone90_2
-dangerCone90_3_stateful:
-  loopPrefab: dangerCone90_3
-dangerNarrowRect_3_stateful:
-  loopPrefab: dangerNarrowRect_3
-dangerRectMid_1_stateful:
-  loopPrefab: dangerRectMid_1
-dangerRectMid_2_stateful:
-  loopPrefab: dangerRectMid_2
-dangerRectMid_3_stateful:
-  loopPrefab: dangerRectMid_3
-dangerRectMid_4_stateful:
-  loopPrefab: dangerRectMid_4
-dangerRect_1_stateful:
-  loopPrefab: dangerRect_1
-dangerRect_2_stateful:
-  loopPrefab: dangerRect_2
-dangerRect_3_stateful:
-  loopPrefab: dangerRect_3
 detectionCone180_1:
-  loopPrefab: etectionCone180_1
+  loopPrefab: detectionCone180_1
 detectionCone180_2:
-  loopPrefab: etectionCone180_2
+  loopPrefab: detectionCone180_2
 detectionCone180_3:
-  loopPrefab: etectionCone180_3
+  loopPrefab: detectionCone180_3
 detectionCone45_1:
   loopPrefab: detectionCone45_1
 detectionCone45_2:
   loopPrefab: detectionCone45_2
 detectionCone45_3:
diff --git config_190301_0621/store.txt config_190307_221/store.txt
index 7063939..fcdd033 100644
--- config_190301_0621/store.txt
+++ config_190307_221/store.txt
@@ -5246,22 +5246,22 @@ stores:
     id: general_sales
     max_product_count: '4'
     type: SPECIAL
   - icon: ItemBoost
     id: general_account
-    max_product_count: '16'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - hangar_slot
       - storage_slot
       - inventory_slot
       - item_consumable
       - skill_loadout_slot
     type: NORMAL
   - icon: ItemLootShield_3
     id: general_recycled
-    max_product_count: '16'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - item_recycled
     type: NORMAL
   - icon: ItemKeyProduct
@@ -5279,33 +5279,33 @@ stores:
       - item_key_epic
     show_within_other_section_in_ui: general_keys
     type: NORMAL
   - icon: ItemEmote
     id: general_emotes
-    max_product_count: '32'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - emotes_common
     type: NORMAL
   - icon: ItemEmote
     id: general_emotes_epic
-    max_product_count: '8'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - emotes_epic
     show_within_other_section_in_ui: general_emotes
     type: NORMAL
   - icon: ItemConsumableTrail
     id: general_trails
-    max_product_count: '32'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - trails_common
     type: NORMAL
   - icon: ItemConsumableTrail
     id: general_trails_epic
-    max_product_count: '8'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - trails_epic
     show_within_other_section_in_ui: general_trails
     type: NORMAL
@@ -5336,26 +5336,26 @@ stores:
       - item_dye_detail_epic
     show_within_other_section_in_ui: general_dye
     type: NORMAL
   - icon: ItemVariantProduct
     id: general_variant
-    max_product_count: '20'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - item_variant_common
     type: NORMAL
   - icon: ItemVariantProduct
     id: general_variant_rare
-    max_product_count: '20'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - item_variant_rare
     show_within_other_section_in_ui: general_variant
     type: NORMAL
   - icon: ItemVariantProduct
     id: general_variant_epic
-    max_product_count: '20'
+    max_product_count: '10000'
     product_selection:
       with_tags_any:
       - item_variant_epic
     show_within_other_section_in_ui: general_variant
     type: NORMAL
diff --git config_190301_0621/territories.txt config_190307_221/territories.txt
index 3e44f9d..8c90dfa 100644
--- config_190301_0621/territories.txt
+++ config_190307_221/territories.txt
@@ -762,12 +762,48 @@
         parameterF1: '-3'
         parameterF2: '-1.6'
         reaction: lore_text_relative_pos
         rotation: '-90'
       trigger: pilot_school
+    - condition:
+        code: NotOnceKeySet
+        name: tavern_intro
+      once_key: tavern_intro
+      reactions:
+      - asset: intro-pub
+        reaction: conversation
+      trigger: tavern_opened
+    - condition:
+        code: NotOnceKeySet
+        name: store_intro
+      once_key: store_intro
+      reactions:
+      - asset: intro-store
+        reaction: conversation
+      trigger: store_docked
+    - condition:
+        code: NotOnceKeySet
+        name: storage_intro
+      once_key: storage_intro
+      reactions:
+      - asset: intro-storage
+        reaction: conversation
+      trigger: storage_docked
+    - condition:
+        code: NotOnceKeySet
+        name: hangar_intro
+      once_key: hangar_intro
+      reactions:
+      - asset: intro-hangar
+        reaction: conversation
+      trigger: hangar_docked
     persistentOnceKeys:
     - crafting_intro
+    - tavern_intro
+    - hangar_intro
+    - store_intro
+    - storage_intro
   distancePerElevation: '0.15'
   localChatDistance: '0'
   maxAllowedOverlapOnSubterritory: '0.9'
   maxDiskRadius: '20'
   minDiskRadius: '7'