From c6e3c3e5082d086925cc2ebf781f01b4f982c234 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Sat, 14 Oct 2017 17:44:01 +0100 Subject: [PATCH] Add Remote Release Flak Launcher --- commodity.csv | 4 +- coriolis.py | 1 + modules.p | 1837 +++++++++++++++++++++++++------------------------ outfitting.py | 3 + 4 files changed, 929 insertions(+), 916 deletions(-) diff --git a/commodity.csv b/commodity.csv index a4656267..5cb8ddfe 100644 --- a/commodity.csv +++ b/commodity.csv @@ -115,9 +115,9 @@ id,symbol,category,name 128672135,Hostage,Salvage,Hostage 128672136,LargeExplorationDataCash,Salvage,Large Survey Data Cache 128672137,SmallExplorationDataCash,Salvage,Small Survey Data Cache -128672159,AntiqueJewellery,Salvage,Antique Jewellery +128672159,AntiqueJewellery,Salvage,Antique Jewellery 128672160,PreciousGems,Salvage,Precious Gems -128672161,EarthRelics,Salvage,Earth Relics +128672161,EarthRelics,Salvage,Earth Relics 128672162,GeneBank,Salvage,Gene Bank 128672163,TimeCapsule,Salvage,Time Capsule 128672294,Cryolite,Minerals,Cryolite diff --git a/coriolis.py b/coriolis.py index 02ef5e68..fa14c09c 100755 --- a/coriolis.py +++ b/coriolis.py @@ -174,6 +174,7 @@ if __name__ == "__main__": modules[('AX Missile Rack', None, '2', 'B')] = {'mass': 4} modules[('AX Multi-Cannon', None, '2', 'E')] = {'mass': 4} modules[('AX Multi-Cannon', None, '2', 'F')] = {'mass': 4} + modules[('Remote Release Flak Launcher', None, '2', 'B')] = {'mass': 4} modules[('Xeno Scanner', None, '0', 'E')] = {'mass': 1.3} modules = OrderedDict([(k,modules[k]) for k in sorted(modules)]) # sort for easier diffing diff --git a/modules.p b/modules.p index 20bae268..cd249308 100644 --- a/modules.p +++ b/modules.p @@ -5898,1561 +5898,1570 @@ a(dp2112 g7 I17 saa(lp2113 -(S'Repair Limpet Controller' +(S'Remote Release Flak Launcher' p2114 -NS'1' -S'A' -tp2115 -ag1770 -aa(lp2116 -(g2114 -NS'1' -S'B' -tp2117 -ag1773 -aa(lp2118 -(g2114 -NS'1' -S'C' -tp2119 -ag1776 -aa(lp2120 -(g2114 -NS'1' -S'D' -tp2121 -ag1779 -aa(lp2122 -(g2114 -NS'1' -S'E' -tp2123 -ag1782 -aa(lp2124 -(g2114 -NS'3' -S'A' -tp2125 -ag1785 -aa(lp2126 -(g2114 -NS'3' -S'B' -tp2127 -ag1788 -aa(lp2128 -(g2114 -NS'3' -S'C' -tp2129 -ag1791 -aa(lp2130 -(g2114 -NS'3' -S'D' -tp2131 -ag1794 -aa(lp2132 -(g2114 -NS'3' -S'E' -tp2133 -ag1797 -aa(lp2134 -(g2114 -NS'5' -S'A' -tp2135 -ag1800 -aa(lp2136 -(g2114 -NS'5' -S'B' -tp2137 -ag1803 -aa(lp2138 -(g2114 -NS'5' -S'C' -tp2139 -ag1806 -aa(lp2140 -(g2114 -NS'5' -S'D' -tp2141 -ag1809 -aa(lp2142 -(g2114 -NS'5' -S'E' -tp2143 -ag1812 -aa(lp2144 -(g2114 -NS'7' -S'A' -tp2145 -ag1815 -aa(lp2146 -(g2114 -NS'7' -S'B' -tp2147 -ag1818 -aa(lp2148 -(g2114 -NS'7' -S'C' -tp2149 -ag1821 -aa(lp2150 -(g2114 -NS'7' -S'D' -tp2151 -ag1824 -aa(lp2152 -(g2114 -NS'7' -S'E' -tp2153 -ag1827 -aa(lp2154 -(S'Research Limpet Controller' -p2155 -NS'1' -S'A' -tp2156 -ag1770 -aa(lp2157 -(g2155 -NS'1' -S'B' -tp2158 -ag1773 -aa(lp2159 -(g2155 -NS'1' -S'C' -tp2160 -ag1776 -aa(lp2161 -(g2155 -NS'1' -S'D' -tp2162 -ag1779 -aa(lp2163 -(g2155 -NS'1' -S'E' -tp2164 -ag1782 -aa(lp2165 -(g2155 -NS'3' -S'A' -tp2166 -ag1785 -aa(lp2167 -(g2155 -NS'3' -S'B' -tp2168 -ag1788 -aa(lp2169 -(g2155 -NS'3' -S'C' -tp2170 -ag1791 -aa(lp2171 -(g2155 -NS'3' -S'D' -tp2172 -ag1794 -aa(lp2173 -(g2155 -NS'3' -S'E' -tp2174 -ag1797 -aa(lp2175 -(g2155 -NS'5' -S'A' -tp2176 -ag1800 -aa(lp2177 -(g2155 -NS'5' -S'B' -tp2178 -ag1803 -aa(lp2179 -(g2155 -NS'5' -S'C' -tp2180 -ag1806 -aa(lp2181 -(g2155 -NS'5' -S'D' -tp2182 -ag1809 -aa(lp2183 -(g2155 -NS'5' -S'E' -tp2184 -ag1812 -aa(lp2185 -(g2155 -NS'7' -S'A' -tp2186 -ag1815 -aa(lp2187 -(g2155 -NS'7' -S'B' -tp2188 -ag1818 -aa(lp2189 -(g2155 -NS'7' -S'C' -tp2190 -ag1821 -aa(lp2191 -(g2155 -NS'7' -S'D' -tp2192 -ag1824 -aa(lp2193 -(g2155 -NS'7' -S'E' -tp2194 -ag1827 -aa(lp2195 -(S'Retributor Beam Laser' -p2196 -NS'1' -S'E' -tp2197 -a(dp2198 -g7 -I2 -saa(lp2199 -(S'Rocket Propelled FSD Disruptor' -p2200 NS'2' S'B' +tp2115 +a(dp2116 +g7 +I4 +saa(lp2117 +(S'Repair Limpet Controller' +p2118 +NS'1' +S'A' +tp2119 +ag1770 +aa(lp2120 +(g2118 +NS'1' +S'B' +tp2121 +ag1773 +aa(lp2122 +(g2118 +NS'1' +S'C' +tp2123 +ag1776 +aa(lp2124 +(g2118 +NS'1' +S'D' +tp2125 +ag1779 +aa(lp2126 +(g2118 +NS'1' +S'E' +tp2127 +ag1782 +aa(lp2128 +(g2118 +NS'3' +S'A' +tp2129 +ag1785 +aa(lp2130 +(g2118 +NS'3' +S'B' +tp2131 +ag1788 +aa(lp2132 +(g2118 +NS'3' +S'C' +tp2133 +ag1791 +aa(lp2134 +(g2118 +NS'3' +S'D' +tp2135 +ag1794 +aa(lp2136 +(g2118 +NS'3' +S'E' +tp2137 +ag1797 +aa(lp2138 +(g2118 +NS'5' +S'A' +tp2139 +ag1800 +aa(lp2140 +(g2118 +NS'5' +S'B' +tp2141 +ag1803 +aa(lp2142 +(g2118 +NS'5' +S'C' +tp2143 +ag1806 +aa(lp2144 +(g2118 +NS'5' +S'D' +tp2145 +ag1809 +aa(lp2146 +(g2118 +NS'5' +S'E' +tp2147 +ag1812 +aa(lp2148 +(g2118 +NS'7' +S'A' +tp2149 +ag1815 +aa(lp2150 +(g2118 +NS'7' +S'B' +tp2151 +ag1818 +aa(lp2152 +(g2118 +NS'7' +S'C' +tp2153 +ag1821 +aa(lp2154 +(g2118 +NS'7' +S'D' +tp2155 +ag1824 +aa(lp2156 +(g2118 +NS'7' +S'E' +tp2157 +ag1827 +aa(lp2158 +(S'Research Limpet Controller' +p2159 +NS'1' +S'A' +tp2160 +ag1770 +aa(lp2161 +(g2159 +NS'1' +S'B' +tp2162 +ag1773 +aa(lp2163 +(g2159 +NS'1' +S'C' +tp2164 +ag1776 +aa(lp2165 +(g2159 +NS'1' +S'D' +tp2166 +ag1779 +aa(lp2167 +(g2159 +NS'1' +S'E' +tp2168 +ag1782 +aa(lp2169 +(g2159 +NS'3' +S'A' +tp2170 +ag1785 +aa(lp2171 +(g2159 +NS'3' +S'B' +tp2172 +ag1788 +aa(lp2173 +(g2159 +NS'3' +S'C' +tp2174 +ag1791 +aa(lp2175 +(g2159 +NS'3' +S'D' +tp2176 +ag1794 +aa(lp2177 +(g2159 +NS'3' +S'E' +tp2178 +ag1797 +aa(lp2179 +(g2159 +NS'5' +S'A' +tp2180 +ag1800 +aa(lp2181 +(g2159 +NS'5' +S'B' +tp2182 +ag1803 +aa(lp2183 +(g2159 +NS'5' +S'C' +tp2184 +ag1806 +aa(lp2185 +(g2159 +NS'5' +S'D' +tp2186 +ag1809 +aa(lp2187 +(g2159 +NS'5' +S'E' +tp2188 +ag1812 +aa(lp2189 +(g2159 +NS'7' +S'A' +tp2190 +ag1815 +aa(lp2191 +(g2159 +NS'7' +S'B' +tp2192 +ag1818 +aa(lp2193 +(g2159 +NS'7' +S'C' +tp2194 +ag1821 +aa(lp2195 +(g2159 +NS'7' +S'D' +tp2196 +ag1824 +aa(lp2197 +(g2159 +NS'7' +S'E' +tp2198 +ag1827 +aa(lp2199 +(S'Retributor Beam Laser' +p2200 +NS'1' +S'E' tp2201 a(dp2202 g7 -I4 +I2 saa(lp2203 -(S'Sensors' +(S'Rocket Propelled FSD Disruptor' p2204 -NS'1' -S'A' +NS'2' +S'B' tp2205 a(dp2206 g7 -F1.3 +I4 saa(lp2207 -(g2204 +(S'Sensors' +p2208 +NS'1' +S'A' +tp2209 +a(dp2210 +g7 +F1.3 +saa(lp2211 +(g2208 NS'1' S'B' -tp2208 -a(dp2209 +tp2212 +a(dp2213 g7 I2 -saa(lp2210 -(g2204 +saa(lp2214 +(g2208 NS'1' S'C' -tp2211 -a(dp2212 +tp2215 +a(dp2216 g7 F1.3 -saa(lp2213 -(g2204 +saa(lp2217 +(g2208 NS'1' S'D' -tp2214 -a(dp2215 +tp2218 +a(dp2219 g7 F0.5 -saa(lp2216 -(g2204 +saa(lp2220 +(g2208 NS'1' S'E' -tp2217 -a(dp2218 +tp2221 +a(dp2222 g7 F1.3 -saa(lp2219 -(g2204 +saa(lp2223 +(g2208 NS'2' S'A' -tp2220 -a(dp2221 +tp2224 +a(dp2225 g7 F2.5 -saa(lp2222 -(g2204 +saa(lp2226 +(g2208 NS'2' S'B' -tp2223 -a(dp2224 +tp2227 +a(dp2228 g7 I4 -saa(lp2225 -(g2204 +saa(lp2229 +(g2208 NS'2' S'C' -tp2226 -a(dp2227 +tp2230 +a(dp2231 g7 F2.5 -saa(lp2228 -(g2204 +saa(lp2232 +(g2208 NS'2' S'D' -tp2229 -a(dp2230 +tp2233 +a(dp2234 g7 I1 -saa(lp2231 -(g2204 +saa(lp2235 +(g2208 NS'2' S'E' -tp2232 -a(dp2233 +tp2236 +a(dp2237 g7 F2.5 -saa(lp2234 -(g2204 +saa(lp2238 +(g2208 NS'3' S'A' -tp2235 -a(dp2236 +tp2239 +a(dp2240 g7 I5 -saa(lp2237 -(g2204 +saa(lp2241 +(g2208 NS'3' S'B' -tp2238 -a(dp2239 +tp2242 +a(dp2243 g7 I8 -saa(lp2240 -(g2204 +saa(lp2244 +(g2208 NS'3' S'C' -tp2241 -a(dp2242 +tp2245 +a(dp2246 g7 I5 -saa(lp2243 -(g2204 +saa(lp2247 +(g2208 NS'3' S'D' -tp2244 -a(dp2245 +tp2248 +a(dp2249 g7 I2 -saa(lp2246 -(g2204 +saa(lp2250 +(g2208 NS'3' S'E' -tp2247 -a(dp2248 +tp2251 +a(dp2252 g7 I5 -saa(lp2249 -(g2204 +saa(lp2253 +(g2208 NS'4' S'A' -tp2250 -a(dp2251 +tp2254 +a(dp2255 g7 I10 -saa(lp2252 -(g2204 +saa(lp2256 +(g2208 NS'4' S'B' -tp2253 -a(dp2254 +tp2257 +a(dp2258 g7 I16 -saa(lp2255 -(g2204 +saa(lp2259 +(g2208 NS'4' S'C' -tp2256 -a(dp2257 +tp2260 +a(dp2261 g7 I10 -saa(lp2258 -(g2204 +saa(lp2262 +(g2208 NS'4' S'D' -tp2259 -a(dp2260 +tp2263 +a(dp2264 g7 I4 -saa(lp2261 -(g2204 +saa(lp2265 +(g2208 NS'4' S'E' -tp2262 -a(dp2263 +tp2266 +a(dp2267 g7 I10 -saa(lp2264 -(g2204 +saa(lp2268 +(g2208 NS'5' S'A' -tp2265 -a(dp2266 +tp2269 +a(dp2270 g7 I20 -saa(lp2267 -(g2204 +saa(lp2271 +(g2208 NS'5' S'B' -tp2268 -a(dp2269 +tp2272 +a(dp2273 g7 I32 -saa(lp2270 -(g2204 +saa(lp2274 +(g2208 NS'5' S'C' -tp2271 -a(dp2272 +tp2275 +a(dp2276 g7 I20 -saa(lp2273 -(g2204 +saa(lp2277 +(g2208 NS'5' S'D' -tp2274 -a(dp2275 +tp2278 +a(dp2279 g7 I8 -saa(lp2276 -(g2204 +saa(lp2280 +(g2208 NS'5' S'E' -tp2277 -a(dp2278 +tp2281 +a(dp2282 g7 I20 -saa(lp2279 -(g2204 +saa(lp2283 +(g2208 NS'6' S'A' -tp2280 -a(dp2281 +tp2284 +a(dp2285 g7 I40 -saa(lp2282 -(g2204 +saa(lp2286 +(g2208 NS'6' S'B' -tp2283 -a(dp2284 +tp2287 +a(dp2288 g7 I64 -saa(lp2285 -(g2204 +saa(lp2289 +(g2208 NS'6' S'C' -tp2286 -a(dp2287 +tp2290 +a(dp2291 g7 I40 -saa(lp2288 -(g2204 +saa(lp2292 +(g2208 NS'6' S'D' -tp2289 -a(dp2290 +tp2293 +a(dp2294 g7 I16 -saa(lp2291 -(g2204 +saa(lp2295 +(g2208 NS'6' S'E' -tp2292 -a(dp2293 +tp2296 +a(dp2297 g7 I40 -saa(lp2294 -(g2204 +saa(lp2298 +(g2208 NS'7' S'A' -tp2295 -a(dp2296 +tp2299 +a(dp2300 g7 I80 -saa(lp2297 -(g2204 +saa(lp2301 +(g2208 NS'7' S'B' -tp2298 -a(dp2299 +tp2302 +a(dp2303 g7 I128 -saa(lp2300 -(g2204 +saa(lp2304 +(g2208 NS'7' S'C' -tp2301 -a(dp2302 +tp2305 +a(dp2306 g7 I80 -saa(lp2303 -(g2204 +saa(lp2307 +(g2208 NS'7' S'D' -tp2304 -a(dp2305 +tp2308 +a(dp2309 g7 I32 -saa(lp2306 -(g2204 +saa(lp2310 +(g2208 NS'7' S'E' -tp2307 -a(dp2308 +tp2311 +a(dp2312 g7 I80 -saa(lp2309 -(g2204 +saa(lp2313 +(g2208 NS'8' S'A' -tp2310 -a(dp2311 +tp2314 +a(dp2315 g7 I160 -saa(lp2312 -(g2204 +saa(lp2316 +(g2208 NS'8' S'B' -tp2313 -a(dp2314 +tp2317 +a(dp2318 g7 I256 -saa(lp2315 -(g2204 +saa(lp2319 +(g2208 NS'8' S'C' -tp2316 -a(dp2317 +tp2320 +a(dp2321 g7 I160 -saa(lp2318 -(g2204 +saa(lp2322 +(g2208 NS'8' S'D' -tp2319 -a(dp2320 +tp2323 +a(dp2324 g7 I64 -saa(lp2321 -(g2204 +saa(lp2325 +(g2208 NS'8' S'E' -tp2322 -a(dp2323 -g7 -I160 -saa(lp2324 -(S'Shield Booster' -p2325 -NS'0' -S'A' tp2326 a(dp2327 g7 -F3.5 +I160 saa(lp2328 -(g2325 +(S'Shield Booster' +p2329 +NS'0' +S'A' +tp2330 +a(dp2331 +g7 +F3.5 +saa(lp2332 +(g2329 NS'0' S'B' -tp2329 -a(dp2330 +tp2333 +a(dp2334 g7 I3 -saa(lp2331 -(g2325 +saa(lp2335 +(g2329 NS'0' S'C' -tp2332 -a(dp2333 +tp2336 +a(dp2337 g7 I2 -saa(lp2334 -(g2325 +saa(lp2338 +(g2329 NS'0' S'D' -tp2335 -a(dp2336 +tp2339 +a(dp2340 g7 I1 -saa(lp2337 -(g2325 +saa(lp2341 +(g2329 NS'0' S'E' -tp2338 -a(dp2339 -g7 -F0.5 -saa(lp2340 -(S'Shield Cell Bank' -p2341 -NS'1' -S'A' tp2342 a(dp2343 g7 -F1.3 +F0.5 saa(lp2344 -(g2341 +(S'Shield Cell Bank' +p2345 +NS'1' +S'A' +tp2346 +a(dp2347 +g7 +F1.3 +saa(lp2348 +(g2345 NS'1' S'B' -tp2345 -a(dp2346 +tp2349 +a(dp2350 g7 I2 -saa(lp2347 -(g2341 +saa(lp2351 +(g2345 NS'1' S'C' -tp2348 -a(dp2349 +tp2352 +a(dp2353 g7 F1.3 -saa(lp2350 -(g2341 +saa(lp2354 +(g2345 NS'1' S'D' -tp2351 -a(dp2352 +tp2355 +a(dp2356 g7 F0.5 -saa(lp2353 -(g2341 +saa(lp2357 +(g2345 NS'1' S'E' -tp2354 -a(dp2355 +tp2358 +a(dp2359 g7 F1.3 -saa(lp2356 -(g2341 +saa(lp2360 +(g2345 NS'2' S'A' -tp2357 -a(dp2358 +tp2361 +a(dp2362 g7 F2.5 -saa(lp2359 -(g2341 +saa(lp2363 +(g2345 NS'2' S'B' -tp2360 -a(dp2361 +tp2364 +a(dp2365 g7 I4 -saa(lp2362 -(g2341 +saa(lp2366 +(g2345 NS'2' S'C' -tp2363 -a(dp2364 +tp2367 +a(dp2368 g7 F2.5 -saa(lp2365 -(g2341 +saa(lp2369 +(g2345 NS'2' S'D' -tp2366 -a(dp2367 +tp2370 +a(dp2371 g7 I1 -saa(lp2368 -(g2341 +saa(lp2372 +(g2345 NS'2' S'E' -tp2369 -a(dp2370 +tp2373 +a(dp2374 g7 F2.5 -saa(lp2371 -(g2341 +saa(lp2375 +(g2345 NS'3' S'A' -tp2372 -a(dp2373 +tp2376 +a(dp2377 g7 I5 -saa(lp2374 -(g2341 +saa(lp2378 +(g2345 NS'3' S'B' -tp2375 -a(dp2376 +tp2379 +a(dp2380 g7 I8 -saa(lp2377 -(g2341 +saa(lp2381 +(g2345 NS'3' S'C' -tp2378 -a(dp2379 +tp2382 +a(dp2383 g7 I5 -saa(lp2380 -(g2341 +saa(lp2384 +(g2345 NS'3' S'D' -tp2381 -a(dp2382 +tp2385 +a(dp2386 g7 I2 -saa(lp2383 -(g2341 +saa(lp2387 +(g2345 NS'3' S'E' -tp2384 -a(dp2385 +tp2388 +a(dp2389 g7 I5 -saa(lp2386 -(g2341 +saa(lp2390 +(g2345 NS'4' S'A' -tp2387 -a(dp2388 +tp2391 +a(dp2392 g7 I10 -saa(lp2389 -(g2341 +saa(lp2393 +(g2345 NS'4' S'B' -tp2390 -a(dp2391 +tp2394 +a(dp2395 g7 I16 -saa(lp2392 -(g2341 +saa(lp2396 +(g2345 NS'4' S'C' -tp2393 -a(dp2394 +tp2397 +a(dp2398 g7 I10 -saa(lp2395 -(g2341 +saa(lp2399 +(g2345 NS'4' S'D' -tp2396 -a(dp2397 +tp2400 +a(dp2401 g7 I4 -saa(lp2398 -(g2341 +saa(lp2402 +(g2345 NS'4' S'E' -tp2399 -a(dp2400 +tp2403 +a(dp2404 g7 I10 -saa(lp2401 -(g2341 +saa(lp2405 +(g2345 NS'5' S'A' -tp2402 -a(dp2403 +tp2406 +a(dp2407 g7 I20 -saa(lp2404 -(g2341 +saa(lp2408 +(g2345 NS'5' S'B' -tp2405 -a(dp2406 +tp2409 +a(dp2410 g7 I32 -saa(lp2407 -(g2341 +saa(lp2411 +(g2345 NS'5' S'C' -tp2408 -a(dp2409 +tp2412 +a(dp2413 g7 I20 -saa(lp2410 -(g2341 +saa(lp2414 +(g2345 NS'5' S'D' -tp2411 -a(dp2412 +tp2415 +a(dp2416 g7 I8 -saa(lp2413 -(g2341 +saa(lp2417 +(g2345 NS'5' S'E' -tp2414 -a(dp2415 +tp2418 +a(dp2419 g7 I20 -saa(lp2416 -(g2341 +saa(lp2420 +(g2345 NS'6' S'A' -tp2417 -a(dp2418 +tp2421 +a(dp2422 g7 I40 -saa(lp2419 -(g2341 +saa(lp2423 +(g2345 NS'6' S'B' -tp2420 -a(dp2421 +tp2424 +a(dp2425 g7 I64 -saa(lp2422 -(g2341 +saa(lp2426 +(g2345 NS'6' S'C' -tp2423 -a(dp2424 +tp2427 +a(dp2428 g7 I40 -saa(lp2425 -(g2341 +saa(lp2429 +(g2345 NS'6' S'D' -tp2426 -a(dp2427 +tp2430 +a(dp2431 g7 I16 -saa(lp2428 -(g2341 +saa(lp2432 +(g2345 NS'6' S'E' -tp2429 -a(dp2430 +tp2433 +a(dp2434 g7 I40 -saa(lp2431 -(g2341 +saa(lp2435 +(g2345 NS'7' S'A' -tp2432 -a(dp2433 +tp2436 +a(dp2437 g7 I80 -saa(lp2434 -(g2341 +saa(lp2438 +(g2345 NS'7' S'B' -tp2435 -a(dp2436 +tp2439 +a(dp2440 g7 I128 -saa(lp2437 -(g2341 +saa(lp2441 +(g2345 NS'7' S'C' -tp2438 -a(dp2439 +tp2442 +a(dp2443 g7 I80 -saa(lp2440 -(g2341 +saa(lp2444 +(g2345 NS'7' S'D' -tp2441 -a(dp2442 +tp2445 +a(dp2446 g7 I32 -saa(lp2443 -(g2341 +saa(lp2447 +(g2345 NS'7' S'E' -tp2444 -a(dp2445 +tp2448 +a(dp2449 g7 I80 -saa(lp2446 -(g2341 +saa(lp2450 +(g2345 NS'8' S'A' -tp2447 -a(dp2448 +tp2451 +a(dp2452 g7 I160 -saa(lp2449 -(g2341 +saa(lp2453 +(g2345 NS'8' S'B' -tp2450 -a(dp2451 +tp2454 +a(dp2455 g7 I256 -saa(lp2452 -(g2341 +saa(lp2456 +(g2345 NS'8' S'C' -tp2453 -a(dp2454 +tp2457 +a(dp2458 g7 I160 -saa(lp2455 -(g2341 +saa(lp2459 +(g2345 NS'8' S'D' -tp2456 -a(dp2457 +tp2460 +a(dp2461 g7 I64 -saa(lp2458 -(g2341 +saa(lp2462 +(g2345 NS'8' S'E' -tp2459 -a(dp2460 -g7 -I160 -saa(lp2461 -(S'Shield Generator' -p2462 -NS'1' -S'A' tp2463 a(dp2464 g7 -F1.3 +I160 saa(lp2465 -(g2462 +(S'Shield Generator' +p2466 +NS'1' +S'A' +tp2467 +a(dp2468 +g7 +F1.3 +saa(lp2469 +(g2466 NS'2' S'A' -tp2466 -a(dp2467 +tp2470 +a(dp2471 g7 F2.5 -saa(lp2468 -(g2462 +saa(lp2472 +(g2466 NS'2' S'B' -tp2469 -a(dp2470 +tp2473 +a(dp2474 g7 I4 -saa(lp2471 -(g2462 +saa(lp2475 +(g2466 NS'2' S'C' -tp2472 -a(dp2473 +tp2476 +a(dp2477 g7 F2.5 -saa(lp2474 -(g2462 +saa(lp2478 +(g2466 NS'2' S'D' -tp2475 -a(dp2476 +tp2479 +a(dp2480 g7 I1 -saa(lp2477 -(g2462 +saa(lp2481 +(g2466 NS'2' S'E' -tp2478 -a(dp2479 +tp2482 +a(dp2483 g7 F2.5 -saa(lp2480 -(g2462 +saa(lp2484 +(g2466 NS'3' S'A' -tp2481 -a(dp2482 +tp2485 +a(dp2486 g7 I5 -saa(lp2483 -(g2462 +saa(lp2487 +(g2466 NS'3' S'B' -tp2484 -a(dp2485 +tp2488 +a(dp2489 g7 I8 -saa(lp2486 -(g2462 +saa(lp2490 +(g2466 NS'3' S'C' -tp2487 -a(dp2488 +tp2491 +a(dp2492 g7 I5 -saa(lp2489 -(g2462 +saa(lp2493 +(g2466 NS'3' S'D' -tp2490 -a(dp2491 +tp2494 +a(dp2495 g7 I2 -saa(lp2492 -(g2462 +saa(lp2496 +(g2466 NS'3' S'E' -tp2493 -a(dp2494 +tp2497 +a(dp2498 g7 I5 -saa(lp2495 -(g2462 +saa(lp2499 +(g2466 NS'4' S'A' -tp2496 -a(dp2497 +tp2500 +a(dp2501 g7 I10 -saa(lp2498 -(g2462 +saa(lp2502 +(g2466 NS'4' S'B' -tp2499 -a(dp2500 +tp2503 +a(dp2504 g7 I16 -saa(lp2501 -(g2462 +saa(lp2505 +(g2466 NS'4' S'C' -tp2502 -a(dp2503 +tp2506 +a(dp2507 g7 I10 -saa(lp2504 -(g2462 +saa(lp2508 +(g2466 NS'4' S'D' -tp2505 -a(dp2506 +tp2509 +a(dp2510 g7 I4 -saa(lp2507 -(g2462 +saa(lp2511 +(g2466 NS'4' S'E' -tp2508 -a(dp2509 +tp2512 +a(dp2513 g7 I10 -saa(lp2510 -(g2462 +saa(lp2514 +(g2466 NS'5' S'A' -tp2511 -a(dp2512 +tp2515 +a(dp2516 g7 I20 -saa(lp2513 -(g2462 +saa(lp2517 +(g2466 NS'5' S'B' -tp2514 -a(dp2515 +tp2518 +a(dp2519 g7 I32 -saa(lp2516 -(g2462 +saa(lp2520 +(g2466 NS'5' S'C' -tp2517 -a(dp2518 +tp2521 +a(dp2522 g7 I20 -saa(lp2519 -(g2462 +saa(lp2523 +(g2466 NS'5' S'D' -tp2520 -a(dp2521 +tp2524 +a(dp2525 g7 I8 -saa(lp2522 -(g2462 +saa(lp2526 +(g2466 NS'5' S'E' -tp2523 -a(dp2524 +tp2527 +a(dp2528 g7 I20 -saa(lp2525 -(g2462 +saa(lp2529 +(g2466 NS'6' S'A' -tp2526 -a(dp2527 +tp2530 +a(dp2531 g7 I40 -saa(lp2528 -(g2462 +saa(lp2532 +(g2466 NS'6' S'B' -tp2529 -a(dp2530 +tp2533 +a(dp2534 g7 I64 -saa(lp2531 -(g2462 +saa(lp2535 +(g2466 NS'6' S'C' -tp2532 -a(dp2533 +tp2536 +a(dp2537 g7 I40 -saa(lp2534 -(g2462 +saa(lp2538 +(g2466 NS'6' S'D' -tp2535 -a(dp2536 +tp2539 +a(dp2540 g7 I16 -saa(lp2537 -(g2462 +saa(lp2541 +(g2466 NS'6' S'E' -tp2538 -a(dp2539 +tp2542 +a(dp2543 g7 I40 -saa(lp2540 -(g2462 +saa(lp2544 +(g2466 NS'7' S'A' -tp2541 -a(dp2542 +tp2545 +a(dp2546 g7 I80 -saa(lp2543 -(g2462 +saa(lp2547 +(g2466 NS'7' S'B' -tp2544 -a(dp2545 +tp2548 +a(dp2549 g7 I128 -saa(lp2546 -(g2462 +saa(lp2550 +(g2466 NS'7' S'C' -tp2547 -a(dp2548 +tp2551 +a(dp2552 g7 I80 -saa(lp2549 -(g2462 +saa(lp2553 +(g2466 NS'7' S'D' -tp2550 -a(dp2551 +tp2554 +a(dp2555 g7 I32 -saa(lp2552 -(g2462 +saa(lp2556 +(g2466 NS'7' S'E' -tp2553 -a(dp2554 +tp2557 +a(dp2558 g7 I80 -saa(lp2555 -(g2462 +saa(lp2559 +(g2466 NS'8' S'A' -tp2556 -a(dp2557 +tp2560 +a(dp2561 g7 I160 -saa(lp2558 -(g2462 +saa(lp2562 +(g2466 NS'8' S'B' -tp2559 -a(dp2560 +tp2563 +a(dp2564 g7 I256 -saa(lp2561 -(g2462 +saa(lp2565 +(g2466 NS'8' S'C' -tp2562 -a(dp2563 +tp2566 +a(dp2567 g7 I160 -saa(lp2564 -(g2462 +saa(lp2568 +(g2466 NS'8' S'D' -tp2565 -a(dp2566 +tp2569 +a(dp2570 g7 I64 -saa(lp2567 -(g2462 +saa(lp2571 +(g2466 NS'8' S'E' -tp2568 -a(dp2569 -g7 -I160 -saa(lp2570 -(S'Shock Mine Launcher' -p2571 -NS'1' -S'I' tp2572 a(dp2573 g7 -I2 +I160 saa(lp2574 -(S'Standard Docking Computer' +(S'Shock Mine Launcher' p2575 NS'1' -S'E' +S'I' tp2576 a(dp2577 g7 -I0 +I2 saa(lp2578 -(S'Thrusters' +(S'Standard Docking Computer' p2579 -NS'2' -S'A' +NS'1' +S'E' tp2580 a(dp2581 g7 -F2.5 +I0 saa(lp2582 -(g2579 +(S'Thrusters' +p2583 +NS'2' +S'A' +tp2584 +a(dp2585 +g7 +F2.5 +saa(lp2586 +(g2583 NS'2' S'B' -tp2583 -a(dp2584 +tp2587 +a(dp2588 g7 I4 -saa(lp2585 -(g2579 +saa(lp2589 +(g2583 NS'2' S'C' -tp2586 -a(dp2587 +tp2590 +a(dp2591 g7 F2.5 -saa(lp2588 -(g2579 +saa(lp2592 +(g2583 NS'2' S'D' -tp2589 -a(dp2590 +tp2593 +a(dp2594 g7 I1 -saa(lp2591 -(g2579 +saa(lp2595 +(g2583 NS'2' S'E' -tp2592 -a(dp2593 +tp2596 +a(dp2597 g7 F2.5 -saa(lp2594 -(g2579 +saa(lp2598 +(g2583 NS'3' S'A' -tp2595 -a(dp2596 +tp2599 +a(dp2600 g7 I5 -saa(lp2597 -(g2579 +saa(lp2601 +(g2583 NS'3' S'B' -tp2598 -a(dp2599 +tp2602 +a(dp2603 g7 I8 -saa(lp2600 -(g2579 +saa(lp2604 +(g2583 NS'3' S'C' -tp2601 -a(dp2602 +tp2605 +a(dp2606 g7 I5 -saa(lp2603 -(g2579 +saa(lp2607 +(g2583 NS'3' S'D' -tp2604 -a(dp2605 +tp2608 +a(dp2609 g7 I2 -saa(lp2606 -(g2579 +saa(lp2610 +(g2583 NS'3' S'E' -tp2607 -a(dp2608 +tp2611 +a(dp2612 g7 I5 -saa(lp2609 -(g2579 +saa(lp2613 +(g2583 NS'4' S'A' -tp2610 -a(dp2611 +tp2614 +a(dp2615 g7 I10 -saa(lp2612 -(g2579 +saa(lp2616 +(g2583 NS'4' S'B' -tp2613 -a(dp2614 +tp2617 +a(dp2618 g7 I16 -saa(lp2615 -(g2579 +saa(lp2619 +(g2583 NS'4' S'C' -tp2616 -a(dp2617 +tp2620 +a(dp2621 g7 I10 -saa(lp2618 -(g2579 +saa(lp2622 +(g2583 NS'4' S'D' -tp2619 -a(dp2620 +tp2623 +a(dp2624 g7 I4 -saa(lp2621 -(g2579 +saa(lp2625 +(g2583 NS'4' S'E' -tp2622 -a(dp2623 +tp2626 +a(dp2627 g7 I10 -saa(lp2624 -(g2579 +saa(lp2628 +(g2583 NS'5' S'A' -tp2625 -a(dp2626 +tp2629 +a(dp2630 g7 I20 -saa(lp2627 -(g2579 +saa(lp2631 +(g2583 NS'5' S'B' -tp2628 -a(dp2629 +tp2632 +a(dp2633 g7 I32 -saa(lp2630 -(g2579 +saa(lp2634 +(g2583 NS'5' S'C' -tp2631 -a(dp2632 +tp2635 +a(dp2636 g7 I20 -saa(lp2633 -(g2579 +saa(lp2637 +(g2583 NS'5' S'D' -tp2634 -a(dp2635 +tp2638 +a(dp2639 g7 I8 -saa(lp2636 -(g2579 +saa(lp2640 +(g2583 NS'5' S'E' -tp2637 -a(dp2638 +tp2641 +a(dp2642 g7 I20 -saa(lp2639 -(g2579 +saa(lp2643 +(g2583 NS'6' S'A' -tp2640 -a(dp2641 +tp2644 +a(dp2645 g7 I40 -saa(lp2642 -(g2579 +saa(lp2646 +(g2583 NS'6' S'B' -tp2643 -a(dp2644 +tp2647 +a(dp2648 g7 I64 -saa(lp2645 -(g2579 +saa(lp2649 +(g2583 NS'6' S'C' -tp2646 -a(dp2647 +tp2650 +a(dp2651 g7 I40 -saa(lp2648 -(g2579 +saa(lp2652 +(g2583 NS'6' S'D' -tp2649 -a(dp2650 +tp2653 +a(dp2654 g7 I16 -saa(lp2651 -(g2579 +saa(lp2655 +(g2583 NS'6' S'E' -tp2652 -a(dp2653 +tp2656 +a(dp2657 g7 I40 -saa(lp2654 -(g2579 +saa(lp2658 +(g2583 NS'7' S'A' -tp2655 -a(dp2656 +tp2659 +a(dp2660 g7 I80 -saa(lp2657 -(g2579 +saa(lp2661 +(g2583 NS'7' S'B' -tp2658 -a(dp2659 +tp2662 +a(dp2663 g7 I128 -saa(lp2660 -(g2579 +saa(lp2664 +(g2583 NS'7' S'C' -tp2661 -a(dp2662 +tp2665 +a(dp2666 g7 I80 -saa(lp2663 -(g2579 +saa(lp2667 +(g2583 NS'7' S'D' -tp2664 -a(dp2665 +tp2668 +a(dp2669 g7 I32 -saa(lp2666 -(g2579 +saa(lp2670 +(g2583 NS'7' S'E' -tp2667 -a(dp2668 +tp2671 +a(dp2672 g7 I80 -saa(lp2669 -(g2579 +saa(lp2673 +(g2583 NS'8' S'A' -tp2670 -a(dp2671 +tp2674 +a(dp2675 g7 I160 -saa(lp2672 -(g2579 +saa(lp2676 +(g2583 NS'8' S'B' -tp2673 -a(dp2674 +tp2677 +a(dp2678 g7 I256 -saa(lp2675 -(g2579 +saa(lp2679 +(g2583 NS'8' S'C' -tp2676 -a(dp2677 +tp2680 +a(dp2681 g7 I160 -saa(lp2678 -(g2579 +saa(lp2682 +(g2583 NS'8' S'D' -tp2679 -a(dp2680 +tp2683 +a(dp2684 g7 I64 -saa(lp2681 -(g2579 +saa(lp2685 +(g2583 NS'8' S'E' -tp2682 -a(dp2683 -g7 -I160 -saa(lp2684 -(S'Torpedo Pylon' -p2685 -NS'1' -S'I' tp2686 a(dp2687 g7 -I2 +I160 saa(lp2688 -(g2685 +(S'Torpedo Pylon' +p2689 +NS'1' +S'I' +tp2690 +a(dp2691 +g7 +I2 +saa(lp2692 +(g2689 NS'2' S'I' -tp2689 -a(dp2690 -g7 -I4 -saa(lp2691 -(S'Xeno Scanner' -p2692 -NS'0' -S'E' tp2693 a(dp2694 g7 +I4 +saa(lp2695 +(S'Xeno Scanner' +p2696 +NS'0' +S'E' +tp2697 +a(dp2698 +g7 F1.3 -saatRp2695 +saatRp2699 . \ No newline at end of file diff --git a/outfitting.py b/outfitting.py index 7379f24c..74842601 100644 --- a/outfitting.py +++ b/outfitting.py @@ -28,6 +28,7 @@ weapon_map = { 'drunkmissilerack' : 'Pack-Hound Missile Rack', 'dumbfiremissilerack' : 'Missile Rack', ('dumbfiremissilerack', 'lasso') : 'Rocket Propelled FSD Disruptor', + 'flakmortar' : 'Remote Release Flak Launcher', 'minelauncher' : 'Mine Launcher', ('minelauncher','impulse') : 'Shock Mine Launcher', 'mininglaser' : 'Mining Laser', @@ -103,6 +104,8 @@ weaponrating_map = { 'hpt_drunkmissilerack_fixed_medium': 'B', 'hpt_dumbfiremissilerack_fixed_small': 'B', 'hpt_dumbfiremissilerack_fixed_medium': 'B', + 'hpt_flakmortar_fixed_medium': 'B', + 'hpt_flakmortar_turret_medium': 'B', 'hpt_minelauncher_fixed_small': 'I', 'hpt_minelauncher_fixed_medium': 'I', 'hpt_mininglaser_fixed_small': 'D',