Skip to content

Commit

Permalink
List guns up to p1024 but don't change stats
Browse files Browse the repository at this point in the history
  • Loading branch information
ceebo committed Jun 2, 2018
1 parent f19809b commit b3d95eb
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 20 deletions.
62 changes: 45 additions & 17 deletions README
Expand Up @@ -1063,6 +1063,31 @@ Gun List
997 (7502, 'p00853_18')
998 (5920, 'p00443x2_7')
999 (4895, 'p00436x9_1')
1000 (4712, 'p00436x2_8')
1001 (7442, 'p00865_17')
1002 (6566, 'p00485x2_2')
1003 (7381, 'p00867_17')
1004 (6318, 'p00358x2_18')
1005 (5696, 'p00662x3_1')
1006 (7524, 'p00886_15')
1007 (7872, 'p00863_18')
1008 (4648, 'p00504osc48x2_0')
1009 (7626, 'p00865_18')
1010 (6141, 'p00441x2_8')
1011 (7442, 'p00867_18')
1012 (4505, 'p00482x2_3')
1013 (7626, 'p00853_20')
1014 (6075, 'p00443x2_8')
1015 (7426, 'p00847osc7_21')
1016 (4851, 'p00436x2_9')
1017 (5040, 'p00436x9_2')
1018 (6732, 'p00485x2_3')
1019 (7626, 'p00867_19')
1020 (6478, 'p00358x2_19')
1021 (7812, 'p00853_21')
1022 (7772, 'p00886_17')
1023 (8000, 'p00863_20')
1024 (5046, 'p00488osc8x2_3')

*************
Stats
Expand All @@ -1074,59 +1099,62 @@ p00498 28
p00356 28
p00448 23
p00564 19
p00358x2 16
p00363 14
p00358x2 14
p00482x3 13
p00652 13
p00865 12
p00436x3 12
p00721 12
p00683 12
p00443 12
p00418 11
p00358x3 11
p00865 10
p00853 11
p00867 10
p00392 10
p00436x2 10
p00686 10
p00363x2 9
p00448x3 9
p00356x2 9
p00615 9
p00590 9
p00853 9
p00418x3 8
p00895 8
p00436x2 8
p00441x2 8
p00693 8
p00345 7
p00867 7
p00345x2 7
p00762 7
p00571 7
p00356x3 7
p00550osc5 7
p00441x2 7
p00618 7
p00443x2 7
p00581 6
p00886 6
p00827 6
p00559 6
p00590x3 6
p00414osc3 6
p00443x2 6
p00743 6
p00418x2 5
p00618x3 5
p00482x2 5
p00482 5
p00726 5
p00681 5
p00741 5
p00445 5
p00426osc3 5
p00886 4
p00863 4
p00465osc3 4
p00482x2 4
p00369osc3 4
p00847osc7 4
p00534 4
p00616osc8 4
p00485x2 4
p00534osc6 4
p00518osc7 4
p00601 4
Expand All @@ -1139,9 +1167,9 @@ p00561 3
p00556x3 3
p00456osc16x2 3
p00436x4 3
p00436x9 3
p00653 3
p00550osc5x3 3
p00847osc7 3
p00815 3
p00445x2 3
p00724 3
Expand All @@ -1155,7 +1183,6 @@ p00505 2
p00490osc15x3 2
p00350osc5 2
p00862 2
p00863 2
p00515osc5 2
p00378osc6 2
p00567osc7 2
Expand All @@ -1164,24 +1191,24 @@ p00410osc5 2
p00813 2
p00719 2
p00405osc9x2 2
p00662x3 2
p00380osc15x3 2
p00485 2
p00845osc5 2
p00556 2
p00746 2
p00436x9 2
p00549 2
p00534x3 2
p00861osc7 2
p00408osc6 2
p00488osc8x2 2
p00608 2
p00405osc3 2
p00413osc7x2 2
p00518osc7x3 2
p00758 2
p00535osc5 2
p00507osc3 2
p00485x2 2
p00915osc5 2
p00714 2
p00603osc3 2
Expand All @@ -1201,8 +1228,8 @@ p00402osc6 1
p00399osc7x3 1
p00648osc6 1
p00423osc9 1
p00504osc48x2 1
p00405osc9x3 1
p00662x3 1
p00558osc9x3 1
p00874 1
p00553osc7 1
Expand All @@ -1215,7 +1242,6 @@ p00652x3 1
p00942 1
p00413osc7 1
p00497osc7 1
p00488osc8x2 1
p00441 1
p00392x2 1
p00568osc8 1
Expand Down Expand Up @@ -1264,7 +1290,6 @@ p00873 0
p00848osc8 0
p00577x2 0
p00891osc9 0
p00504osc48x2 0
p00460osc15x3 0
p00777 0
p00376osc8 0
Expand Down Expand Up @@ -1380,8 +1405,11 @@ p00764 0
p00935 0
p00571x2 0
p00691 0
variable 759
variable 784

*************
Tentative guns
*************
1002 (6405, 'p00652x3_2')
1011 (6499, 'p00618x3_7')
1023 (6566, 'p00618x3_8')
6 changes: 3 additions & 3 deletions get_area.py
Expand Up @@ -228,7 +228,7 @@ def add_variable_gun(base, x, y, compression, x_slack, y_slack,
print "*************"

for period in sorted(guns):
if period < 1000:
if period < 1025:
gun_type = guns[period][1].split("_")[0]
stats[gun_type] += 1
print period, guns[period]
Expand All @@ -241,7 +241,7 @@ def add_variable_gun(base, x, y, compression, x_slack, y_slack,
for gun_type in sorted(stats, key=stats.get, reverse=True):
print "%-*s%d" % (16, gun_type, stats[gun_type])

print "variable %d" % (1000 - 14 - stats["fixed"])
print "variable %d" % (1025 - 14 - stats["fixed"])

for period in guns:
guns[period] = guns[period][0], ""
Expand All @@ -255,7 +255,7 @@ def add_variable_gun(base, x, y, compression, x_slack, y_slack,
print "*************"

for period in guns:
if period < 1000 and guns[period][1]:
if period < 1025 and guns[period][1]:
print period, guns[period]


Expand Down

0 comments on commit b3d95eb

Please sign in to comment.