Sprite reorganization, new power and tier-based pumps

Browse Source

...

This commit is contained in:

Anuken

2018-06-15 15:53:43 -04:00

parent 604f315a83

commit ffbb6bb40b

95 changed files with 862 additions and 817 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

core/assets-raw/sprites/blocks/distribution/conduittunnel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 228 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyortunnel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 246 B

0

core/assets-raw/sprites/blocks/production/irondrill-rotator.png → core/assets-raw/sprites/blocks/drills/irondrill-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 174 B

0

core/assets-raw/sprites/blocks/production/irondrill-top.png → core/assets-raw/sprites/blocks/drills/irondrill-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 188 B After Width:  |  Height:  |  Size: 188 B

0

core/assets-raw/sprites/blocks/production/irondrill.png → core/assets-raw/sprites/blocks/drills/irondrill.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 188 B After Width:  |  Height:  |  Size: 188 B

0

core/assets-raw/sprites/blocks/production/laserdrill-rotator.png → core/assets-raw/sprites/blocks/drills/laserdrill-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 261 B

0

core/assets-raw/sprites/blocks/production/laserdrill-top.png → core/assets-raw/sprites/blocks/drills/laserdrill-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 286 B After Width:  |  Height:  |  Size: 286 B

0

core/assets-raw/sprites/blocks/production/laserdrill.png → core/assets-raw/sprites/blocks/drills/laserdrill.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 327 B After Width:  |  Height:  |  Size: 327 B

0

core/assets-raw/sprites/blocks/production/nucleardrill-rim.png → core/assets-raw/sprites/blocks/drills/nucleardrill-rim.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 219 B

0

core/assets-raw/sprites/blocks/production/nucleardrill-rotator.png → core/assets-raw/sprites/blocks/drills/nucleardrill-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 298 B After Width:  |  Height:  |  Size: 298 B

0

core/assets-raw/sprites/blocks/production/nucleardrill-top.png → core/assets-raw/sprites/blocks/drills/nucleardrill-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 289 B After Width:  |  Height:  |  Size: 289 B

0

core/assets-raw/sprites/blocks/production/nucleardrill.png → core/assets-raw/sprites/blocks/drills/nucleardrill.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 574 B After Width:  |  Height:  |  Size: 574 B

0

core/assets-raw/sprites/blocks/production/oilextractor-liquid.png → core/assets-raw/sprites/blocks/drills/oilextractor-liquid.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 239 B After Width:  |  Height:  |  Size: 239 B

0

core/assets-raw/sprites/blocks/production/oilextractor-rotator.png → core/assets-raw/sprites/blocks/drills/oilextractor-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 341 B After Width:  |  Height:  |  Size: 341 B

0

core/assets-raw/sprites/blocks/production/oilextractor-top.png → core/assets-raw/sprites/blocks/drills/oilextractor-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  Size: 379 B

0

core/assets-raw/sprites/blocks/production/oilextractor.png → core/assets-raw/sprites/blocks/drills/oilextractor.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 473 B After Width:  |  Height:  |  Size: 473 B

0

core/assets-raw/sprites/blocks/production/plasmadrill-rim.png → core/assets-raw/sprites/blocks/drills/plasmadrill-rim.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 461 B After Width:  |  Height:  |  Size: 461 B

0

core/assets-raw/sprites/blocks/production/plasmadrill-rotator.png → core/assets-raw/sprites/blocks/drills/plasmadrill-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 354 B After Width:  |  Height:  |  Size: 354 B

0

core/assets-raw/sprites/blocks/production/plasmadrill-top.png → core/assets-raw/sprites/blocks/drills/plasmadrill-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 296 B After Width:  |  Height:  |  Size: 296 B

0

core/assets-raw/sprites/blocks/production/plasmadrill.png → core/assets-raw/sprites/blocks/drills/plasmadrill.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 678 B After Width:  |  Height:  |  Size: 678 B

0

core/assets-raw/sprites/blocks/production/reinforceddrill-rotator.png → core/assets-raw/sprites/blocks/drills/reinforceddrill-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 192 B After Width:  |  Height:  |  Size: 192 B

0

core/assets-raw/sprites/blocks/production/reinforceddrill-top.png → core/assets-raw/sprites/blocks/drills/reinforceddrill-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 196 B After Width:  |  Height:  |  Size: 196 B

0

core/assets-raw/sprites/blocks/production/reinforceddrill.png → core/assets-raw/sprites/blocks/drills/reinforceddrill.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 228 B After Width:  |  Height:  |  Size: 228 B

0

core/assets-raw/sprites/blocks/production/steeldrill-rotator.png → core/assets-raw/sprites/blocks/drills/steeldrill-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 174 B

0

core/assets-raw/sprites/blocks/production/steeldrill-top.png → core/assets-raw/sprites/blocks/drills/steeldrill-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 196 B After Width:  |  Height:  |  Size: 196 B

0

core/assets-raw/sprites/blocks/production/steeldrill.png → core/assets-raw/sprites/blocks/drills/steeldrill.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 233 B

0

core/assets-raw/sprites/blocks/production/titaniumdrill-rotator.png → core/assets-raw/sprites/blocks/drills/titaniumdrill-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 174 B

0

core/assets-raw/sprites/blocks/production/titaniumdrill-top.png → core/assets-raw/sprites/blocks/drills/titaniumdrill-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 196 B After Width:  |  Height:  |  Size: 196 B

0

core/assets-raw/sprites/blocks/production/titaniumdrill.png → core/assets-raw/sprites/blocks/drills/titaniumdrill.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 260 B

0

core/assets-raw/sprites/blocks/production/waterextractor-liquid.png → core/assets-raw/sprites/blocks/drills/waterextractor-liquid.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 192 B After Width:  |  Height:  |  Size: 192 B

0

core/assets-raw/sprites/blocks/production/waterextractor-rotator.png → core/assets-raw/sprites/blocks/drills/waterextractor-rotator.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 256 B

0

core/assets-raw/sprites/blocks/production/waterextractor-top.png → core/assets-raw/sprites/blocks/drills/waterextractor-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 338 B After Width:  |  Height:  |  Size: 338 B

0

core/assets-raw/sprites/blocks/production/waterextractor.png → core/assets-raw/sprites/blocks/drills/waterextractor.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 298 B After Width:  |  Height:  |  Size: 298 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconduit-arrow.png → core/assets-raw/sprites/blocks/liquid/bridgeconduit-arrow.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 160 B After Width:  |  Height:  |  Size: 160 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconduit-bridge.png → core/assets-raw/sprites/blocks/liquid/bridgeconduit-bridge.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 181 B After Width:  |  Height:  |  Size: 181 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconduit-end.png → core/assets-raw/sprites/blocks/liquid/bridgeconduit-end.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 185 B After Width:  |  Height:  |  Size: 185 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconduit.png → core/assets-raw/sprites/blocks/liquid/bridgeconduit.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 238 B After Width:  |  Height:  |  Size: 238 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconveyor-arrow.png → core/assets-raw/sprites/blocks/liquid/bridgeconveyor-arrow.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 160 B After Width:  |  Height:  |  Size: 160 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconveyor-bridge.png → core/assets-raw/sprites/blocks/liquid/bridgeconveyor-bridge.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 177 B After Width:  |  Height:  |  Size: 177 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconveyor-end.png → core/assets-raw/sprites/blocks/liquid/bridgeconveyor-end.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 178 B After Width:  |  Height:  |  Size: 178 B

0

core/assets-raw/sprites/blocks/distribution/bridgeconveyor.png → core/assets-raw/sprites/blocks/liquid/bridgeconveyor.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 227 B After Width:  |  Height:  |  Size: 227 B

0

core/assets-raw/sprites/blocks/distribution/conduit-bottom.png → core/assets-raw/sprites/blocks/liquid/conduit-bottom.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 199 B After Width:  |  Height:  |  Size: 199 B

0

core/assets-raw/sprites/blocks/distribution/conduit-top.png → core/assets-raw/sprites/blocks/liquid/conduit-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 191 B After Width:  |  Height:  |  Size: 191 B

0

core/assets-raw/sprites/blocks/distribution/laserconduit-arrow.png → core/assets-raw/sprites/blocks/liquid/laserconduit-arrow.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 161 B After Width:  |  Height:  |  Size: 161 B

0

core/assets-raw/sprites/blocks/distribution/laserconduit-bridge.png → core/assets-raw/sprites/blocks/liquid/laserconduit-bridge.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 168 B

0

core/assets-raw/sprites/blocks/distribution/laserconduit-end.png → core/assets-raw/sprites/blocks/liquid/laserconduit-end.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 154 B After Width:  |  Height:  |  Size: 154 B

0

core/assets-raw/sprites/blocks/distribution/laserconduit.png → core/assets-raw/sprites/blocks/liquid/laserconduit.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 286 B After Width:  |  Height:  |  Size: 286 B

0

core/assets-raw/sprites/blocks/distribution/liquidjunction.png → core/assets-raw/sprites/blocks/liquid/liquidjunction.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 235 B After Width:  |  Height:  |  Size: 235 B

0

core/assets-raw/sprites/blocks/distribution/liquidrouter-bottom.png → core/assets-raw/sprites/blocks/liquid/liquidrouter-bottom.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 225 B After Width:  |  Height:  |  Size: 225 B

0

core/assets-raw/sprites/blocks/distribution/liquidrouter-liquid.png → core/assets-raw/sprites/blocks/liquid/liquidrouter-liquid.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 169 B After Width:  |  Height:  |  Size: 169 B

0

core/assets-raw/sprites/blocks/distribution/liquidrouter-top.png → core/assets-raw/sprites/blocks/liquid/liquidrouter-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 168 B

0

core/assets-raw/sprites/blocks/distribution/liquidrouter.png → core/assets-raw/sprites/blocks/liquid/liquidrouter.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 256 B

0

core/assets-raw/sprites/blocks/distribution/liquidtank-bottom.png → core/assets-raw/sprites/blocks/liquid/liquidtank-bottom.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 613 B After Width:  |  Height:  |  Size: 613 B

0

core/assets-raw/sprites/blocks/distribution/liquidtank-liquid.png → core/assets-raw/sprites/blocks/liquid/liquidtank-liquid.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 196 B After Width:  |  Height:  |  Size: 196 B

0

core/assets-raw/sprites/blocks/distribution/liquidtank-top.png → core/assets-raw/sprites/blocks/liquid/liquidtank-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 188 B After Width:  |  Height:  |  Size: 188 B

0

core/assets-raw/sprites/blocks/production/pump.png → core/assets-raw/sprites/blocks/liquid/mechanical-pump.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 285 B After Width:  |  Height:  |  Size: 285 B

0

core/assets-raw/sprites/blocks/distribution/pulseconduit-bottom.png → core/assets-raw/sprites/blocks/liquid/pulseconduit-bottom.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 219 B

0

core/assets-raw/sprites/blocks/distribution/pulseconduit-top.png → core/assets-raw/sprites/blocks/liquid/pulseconduit-top.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 267 B After Width:  |  Height:  |  Size: 267 B

BIN

core/assets-raw/sprites/blocks/liquid/rotary-pump.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 339 B

BIN

core/assets-raw/sprites/blocks/liquid/thermal-pump.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 323 B

BIN

core/assets-raw/sprites/blocks/production/fluxpump.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 313 B

BIN

core/assets-raw/sprites/blocks/production/stonedrill.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 246 B

BIN

core/assets-raw/sprites/blocks/turrets/scatter-heat.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 196 B

BIN

core/assets-raw/sprites/blocks/turrets/turrets/scatter-heat.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 171 B After Width:  |  Height:  |  Size: 196 B