ref: 82ebe0a72205d4ef5cbbf759c290b17a13bcfe41
parent: 77fc01311ff6541134fff682ee72435c011ddb62
author: Clownacy <Clownacy@users.noreply.github.com>
date: Fri Feb 1 09:27:46 EST 2019
Unuglied gBulTbl
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -4,53 +4,52 @@
BULLET_TABLE gBulTbl[46] =
{
- //TODO: un-ugly this
- {'\0', '\0', 0, 0, 0, 0, 0, 0, {0, 0, 0, 0}},
- {'\x04', '\x01', 20, 36, 4, 4, 2, 2, {8, 8, 8, 8}},
- {'\x06', '\x01', 23, 36, 4, 4, 2, 2, {8, 8, 8, 8}},
- {'\b', '\x01', 30, 36, 4, 4, 2, 2, {8, 8, 8, 8}},
- {'\x01', '\x01', 8, 32, 6, 6, 2, 2, {8, 8, 8, 8}},
- {'\x02', '\x01', 12, 32, 6, 6, 2, 2, {8, 8, 8, 8}},
- {'\x04', '\x01', 16, 32, 6, 6, 2, 2, {8, 8, 8, 8}},
- {'\x02', '\x02', 100, 8, 8, 16, 4, 2, {8, 8, 8, 8}},
- {'\x03', '\x02', 100, 8, 4, 4, 4, 2, {8, 8, 8, 8}},
- {'\x03', '\x02', 100, 8, 4, 4, 4, 2, {8, 8, 8, 8}},
- {'\x02', '\x01', 20, 32, 2, 2, 2, 2, {8, 8, 8, 8}},
- {'\x04', '\x01', 20, 32, 2, 2, 2, 2, {8, 8, 8, 8}},
- {'\x06', '\x01', 20, 32, 2, 2, 2, 2, {8, 8, 8, 8}},
- {'\0', '\n', 50, 40, 2, 2, 2, 2, {8, 8, 8, 8}},
- {'\0', '\n', 70, 40, 4, 4, 4, 4, {8, 8, 8, 8}},
- {'\0', '\n', 90, 40, 4, 4, 0, 0, {8, 8, 8, 8}},
- {'\x01', 'd', 100, 20, 16, 16, 0, 0, {0, 0, 0, 0}},
- {'\x01', 'd', 100, 20, 16, 16, 0, 0, {0, 0, 0, 0}},
- {'\x01', 'd', 100, 20, 16, 16, 0, 0, {0, 0, 0, 0}},
- {'\x01', '\x01', 20, 8, 2, 2, 2, 2, {4, 4, 4, 4}},
- {'\x02', '\x01', 20, 8, 2, 2, 2, 2, {4, 4, 4, 4}},
- {'\x02', '\x01', 20, 8, 4, 4, 4, 4, {4, 4, 4, 4}},
- {'\x03', '\x01', 32, 32, 2, 2, 2, 2, {4, 4, 4, 4}},
- {'\0', 'd', 0, 36, 8, 8, 8, 8, {12, 12, 12, 12}},
- {'\x7F', '\x01', 2, 4, 8, 4, 8, 4, {0, 0, 0, 0}},
- {'\x0F', '\x01', 30, 36, 8, 8, 4, 2, {8, 8, 8, 8}},
- {'\x06', '\x03', 18, 36, 10, 10, 4, 2, {12, 12, 12, 12}},
- {'\x01', 'd', 30, 36, 6, 6, 4, 4, {12, 12, 12, 12}},
- {'\0', '\n', 30, 40, 2, 2, 2, 2, {8, 8, 8, 8}},
- {'\0', '\n', 40, 40, 4, 4, 4, 4, {8, 8, 8, 8}},
- {'\0', '\n', 40, 40, 4, 4, 0, 0, {8, 8, 8, 8}},
- {'\x02', 'd', 100, 20, 12, 12, 0, 0, {0, 0, 0, 0}},
- {'\x02', 'd', 100, 20, 12, 12, 0, 0, {0, 0, 0, 0}},
- {'\x02', 'd', 100, 20, 12, 12, 0, 0, {0, 0, 0, 0}},
- {'\x04', '\x04', 20, 32, 4, 4, 3, 3, {8, 8, 24, 8}},
- {'\x04', '\x02', 20, 32, 2, 2, 2, 2, {8, 8, 24, 8}},
- {'\x01', '\x01', 20, 32, 2, 2, 2, 2, {8, 8, 24, 8}},
- {'\x04', '\x04', 30, 64, 6, 6, 3, 3, {8, 8, 8, 8}},
- {'\b', '\b', 30, 64, 6, 6, 3, 3, {8, 8, 8, 8}},
- {'\f', '\f', 30, 64, 6, 6, 3, 3, {8, 8, 8, 8}},
- {'\x03', 'd', 30, 32, 6, 6, 3, 3, {4, 4, 4, 4}},
- {'\x06', 'd', 30, 32, 6, 6, 3, 3, {4, 4, 4, 4}},
- {'\v', 'd', 30, 32, 6, 6, 3, 3, {4, 4, 4, 4}},
- {'\x04', '\x04', 20, 32, 4, 4, 3, 3, {8, 8, 24, 8}},
- {'\0', '\x04', 4, 4, 0, 0, 0, 0, {0, 0, 0, 0}},
- {'\x01', '\x01', 1, 36, 1, 1, 1, 1, {1, 1, 1, 1}}
+ {0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0}},
+ {4, 1, 20, 36, 4, 4, 2, 2, {8, 8, 8, 8}},
+ {6, 1, 23, 36, 4, 4, 2, 2, {8, 8, 8, 8}},
+ {8, 1, 30, 36, 4, 4, 2, 2, {8, 8, 8, 8}},
+ {1, 1, 8, 32, 6, 6, 2, 2, {8, 8, 8, 8}},
+ {2, 1, 12, 32, 6, 6, 2, 2, {8, 8, 8, 8}},
+ {4, 1, 16, 32, 6, 6, 2, 2, {8, 8, 8, 8}},
+ {2, 2, 100, 8, 8, 16, 4, 2, {8, 8, 8, 8}},
+ {3, 2, 100, 8, 4, 4, 4, 2, {8, 8, 8, 8}},
+ {3, 2, 100, 8, 4, 4, 4, 2, {8, 8, 8, 8}},
+ {2, 1, 20, 32, 2, 2, 2, 2, {8, 8, 8, 8}},
+ {4, 1, 20, 32, 2, 2, 2, 2, {8, 8, 8, 8}},
+ {6, 1, 20, 32, 2, 2, 2, 2, {8, 8, 8, 8}},
+ {0, 10, 50, 40, 2, 2, 2, 2, {8, 8, 8, 8}},
+ {0, 10, 70, 40, 4, 4, 4, 4, {8, 8, 8, 8}},
+ {0, 10, 90, 40, 4, 4, 0, 0, {8, 8, 8, 8}},
+ {1, 100, 100, 20, 16, 16, 0, 0, {0, 0, 0, 0}},
+ {1, 100, 100, 20, 16, 16, 0, 0, {0, 0, 0, 0}},
+ {1, 100, 100, 20, 16, 16, 0, 0, {0, 0, 0, 0}},
+ {1, 1, 20, 8, 2, 2, 2, 2, {4, 4, 4, 4}},
+ {2, 1, 20, 8, 2, 2, 2, 2, {4, 4, 4, 4}},
+ {2, 1, 20, 8, 4, 4, 4, 4, {4, 4, 4, 4}},
+ {3, 1, 32, 32, 2, 2, 2, 2, {4, 4, 4, 4}},
+ {0, 100, 0, 36, 8, 8, 8, 8, {12, 12, 12, 12}},
+ {127, 1, 2, 4, 8, 4, 8, 4, {0, 0, 0, 0}},
+ {15, 1, 30, 36, 8, 8, 4, 2, {8, 8, 8, 8}},
+ {6, 3, 18, 36, 10, 10, 4, 2, {12, 12, 12, 12}},
+ {1, 100, 30, 36, 6, 6, 4, 4, {12, 12, 12, 12}},
+ {0, 10, 30, 40, 2, 2, 2, 2, {8, 8, 8, 8}},
+ {0, 10, 40, 40, 4, 4, 4, 4, {8, 8, 8, 8}},
+ {0, 10, 40, 40, 4, 4, 0, 0, {8, 8, 8, 8}},
+ {2, 100, 100, 20, 12, 12, 0, 0, {0, 0, 0, 0}},
+ {2, 100, 100, 20, 12, 12, 0, 0, {0, 0, 0, 0}},
+ {2, 100, 100, 20, 12, 12, 0, 0, {0, 0, 0, 0}},
+ {4, 4, 20, 32, 4, 4, 3, 3, {8, 8, 24, 8}},
+ {4, 2, 20, 32, 2, 2, 2, 2, {8, 8, 24, 8}},
+ {1, 1, 20, 32, 2, 2, 2, 2, {8, 8, 24, 8}},
+ {4, 4, 30, 64, 6, 6, 3, 3, {8, 8, 8, 8}},
+ {8, 8, 30, 64, 6, 6, 3, 3, {8, 8, 8, 8}},
+ {12, 12, 30, 64, 6, 6, 3, 3, {8, 8, 8, 8}},
+ {3, 100, 30, 32, 6, 6, 3, 3, {4, 4, 4, 4}},
+ {6, 100, 30, 32, 6, 6, 3, 3, {4, 4, 4, 4}},
+ {11, 100, 30, 32, 6, 6, 3, 3, {4, 4, 4, 4}},
+ {4, 4, 20, 32, 4, 4, 3, 3, {8, 8, 24, 8}},
+ {0, 4, 4, 4, 0, 0, 0, 0, {0, 0, 0, 0}},
+ {1, 1, 1, 36, 1, 1, 1, 1, {1, 1, 1, 1}}
};
BULLET gBul[BULLET_MAX];