diff --git a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png index 1c848f5161..8f774bef86 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png and b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png index 1dc95b52bb..6fe78e5277 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png and b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png differ diff --git a/core/assets-raw/sprites/blocks/power/thermal-generator.png b/core/assets-raw/sprites/blocks/power/thermal-generator.png index 388654a481..10347e1bc4 100644 Binary files a/core/assets-raw/sprites/blocks/power/thermal-generator.png and b/core/assets-raw/sprites/blocks/power/thermal-generator.png differ diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png b/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png new file mode 100644 index 0000000000..812083edcb Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad-top.png b/core/assets-raw/sprites/blocks/units/dagger-pad-top.png new file mode 100644 index 0000000000..5fbc8a10d5 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/dagger-pad-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad.png b/core/assets-raw/sprites/blocks/units/dagger-pad.png new file mode 100644 index 0000000000..f6c0760212 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/dagger-pad.png differ diff --git a/core/assets-raw/sprites/blocks/units/interceptor-factory-top-open.png b/core/assets-raw/sprites/blocks/units/interceptor-factory-top-open.png deleted file mode 100644 index 430debd381..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/interceptor-factory-top-open.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png b/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png new file mode 100644 index 0000000000..50fc9d3746 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png b/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png index 856d732cdd..e716019aa3 100644 Binary files a/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png and b/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/monsoon-pad.png b/core/assets-raw/sprites/blocks/units/monsoon-pad.png index 2ac3a6f45f..fe6b8fa3ea 100644 Binary files a/core/assets-raw/sprites/blocks/units/monsoon-pad.png and b/core/assets-raw/sprites/blocks/units/monsoon-pad.png differ diff --git a/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png b/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png new file mode 100644 index 0000000000..56cb95da79 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/titan-pad-top.png b/core/assets-raw/sprites/blocks/units/titan-pad-top.png new file mode 100644 index 0000000000..13539369f0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/titan-pad-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/titan-pad.png b/core/assets-raw/sprites/blocks/units/titan-pad.png new file mode 100644 index 0000000000..cdc1dd92c7 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/titan-pad.png differ diff --git a/core/assets-raw/sprites/units/scout-base.png b/core/assets-raw/sprites/units/dagger-base.png similarity index 100% rename from core/assets-raw/sprites/units/scout-base.png rename to core/assets-raw/sprites/units/dagger-base.png diff --git a/core/assets-raw/sprites/units/scout-leg.png b/core/assets-raw/sprites/units/dagger-leg.png similarity index 100% rename from core/assets-raw/sprites/units/scout-leg.png rename to core/assets-raw/sprites/units/dagger-leg.png diff --git a/core/assets-raw/sprites/units/scout.png b/core/assets-raw/sprites/units/dagger.png similarity index 100% rename from core/assets-raw/sprites/units/scout.png rename to core/assets-raw/sprites/units/dagger.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 595749e1b8..0f1077b6ad 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -526,6 +526,9 @@ block.command-center.name=Command Center block.mass-driver.name=Mass Driver block.blast-drill.name=Blast Drill block.thermal-pump.name=Thermal Pump +block.dagger-pad.name=Dagger Pad +block.titan-pad.name=Titan Pad +block.thermal-generator.name=Thermal Generator unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 7d908d0b06..be2ce57e94 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,322 +13,322 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 504, 129 + xy: 833, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 514, 139 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 524, 149 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 574, 146 + xy: 853, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 574, 136 + xy: 853, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 574, 126 + xy: 863, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 574, 116 + xy: 853, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 851, 290 + xy: 863, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 861, 287 + xy: 873, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 871, 287 + xy: 853, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 881, 287 + xy: 863, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 891, 287 + xy: 873, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 901, 287 + xy: 883, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 911, 287 + xy: 853, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 921, 287 + xy: 863, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 931, 287 + xy: 873, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 995, 285 + xy: 883, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 574, 186 + xy: 893, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 574, 176 + xy: 853, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 581, 166 + xy: 863, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 581, 156 + xy: 873, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 584, 146 + xy: 883, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 961, 283 + xy: 514, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 971, 283 + xy: 524, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 981, 283 + xy: 514, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 941, 273 + xy: 524, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 951, 273 + xy: 524, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 961, 273 + xy: 534, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 971, 273 + xy: 534, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 981, 273 + xy: 534, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 939, 263 + xy: 544, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 939, 253 + xy: 544, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 949, 263 + xy: 544, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 939, 243 + xy: 554, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 949, 253 + xy: 554, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 959, 263 + xy: 554, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 939, 233 + xy: 479, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 949, 243 + xy: 489, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 959, 253 + xy: 499, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 969, 263 + xy: 509, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 939, 223 + xy: 519, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mass-driver-turret rotate: false - xy: 711, 342 + xy: 737, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 909, 247 + xy: 267, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 919, 257 + xy: 267, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 929, 267 + xy: 277, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 warp-gate-top rotate: false - xy: 715, 290 + xy: 767, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -363,70 +363,70 @@ blast-drill-top index: -1 carbide-drill rotate: false - xy: 514, 129 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 524, 139 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 534, 149 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 463, 166 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 741, 188 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 723, 182 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 767, 316 + xy: 789, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 789, 368 + xy: 789, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 789, 342 + xy: 793, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 793, 316 + xy: 807, 394 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -461,49 +461,49 @@ plasma-drill-top index: -1 tungsten-drill rotate: false - xy: 939, 213 + xy: 483, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 949, 223 + xy: 483, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 959, 233 + xy: 493, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 337, 81 + xy: 265, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 373, 99 + xy: 301, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 355, 81 + xy: 283, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 391, 99 + xy: 319, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -552,7 +552,7 @@ blackstone2 index: -1 blackstone3 rotate: false - xy: 995, 307 + xy: 1015, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,553 +566,553 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 524, 129 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 534, 139 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 534, 129 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 409, 87 + xy: 883, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 761, 288 + xy: 893, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 213, 19 + xy: 398, 73 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 841, 288 + xy: 903, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 841, 288 + xy: 903, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 759, 278 + xy: 913, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 759, 278 + xy: 913, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 759, 268 + xy: 923, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 759, 268 + xy: 923, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 769, 278 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 769, 278 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 779, 278 + xy: 883, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 759, 248 + xy: 893, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 769, 258 + xy: 903, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 779, 268 + xy: 913, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 759, 258 + xy: 863, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 769, 268 + xy: 873, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 283, 19 + xy: 891, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 759, 238 + xy: 933, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 769, 248 + xy: 873, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 311, 19 + xy: 919, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 779, 258 + xy: 883, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 789, 268 + xy: 893, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 789, 268 + xy: 893, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 799, 278 + xy: 903, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 799, 278 + xy: 903, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 353, 19 + xy: 877, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 759, 188 + xy: 933, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 769, 208 + xy: 933, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 779, 218 + xy: 853, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 799, 228 + xy: 873, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 809, 238 + xy: 883, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 819, 248 + xy: 893, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 829, 258 + xy: 903, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 839, 268 + xy: 913, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 1005, 325 + xy: 961, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 741, 174 + xy: 989, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 929, 247 + xy: 386, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 899, 207 + xy: 406, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 909, 217 + xy: 416, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 191, 5 + xy: 961, 289 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 929, 217 + xy: 327, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 919, 197 + xy: 1003, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 929, 207 + xy: 1013, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 233, 5 + xy: 989, 289 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 247, 5 + xy: 411, 87 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 859, 177 + xy: 474, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 869, 177 + xy: 484, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 879, 177 + xy: 494, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 889, 177 + xy: 484, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 849, 181 + xy: 474, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 845, 171 + xy: 484, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 261, 5 + xy: 412, 73 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 899, 177 + xy: 494, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 909, 177 + xy: 504, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 919, 177 + xy: 494, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 929, 177 + xy: 504, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 941, 283 + xy: 514, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 951, 283 + xy: 504, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 959, 243 + xy: 539, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 969, 253 + xy: 549, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 979, 263 + xy: 559, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 969, 243 + xy: 493, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 979, 253 + xy: 503, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 939, 203 + xy: 503, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 949, 213 + xy: 513, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 289, 5 + xy: 199, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 546, 199 + xy: 1005, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 484, 189 + xy: 1015, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 484, 189 + xy: 1015, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 484, 129 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 484, 129 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 494, 139 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 504, 149 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 554, 136 + xy: 863, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 584, 136 + xy: 893, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1126,7 +1126,7 @@ cross-2 index: -1 cross-3 rotate: false - xy: 583, 204 + xy: 609, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 831, 288 + xy: 893, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,70 +1154,70 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 869, 197 + xy: 277, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 879, 207 + xy: 287, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 971, 293 + xy: 319, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 211, 81 + xy: 466, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 247, 99 + xy: 463, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 229, 81 + xy: 175, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 265, 99 + xy: 193, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 815, 342 + xy: 819, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 815, 342 + xy: 819, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 983, 293 + xy: 331, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1259,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 995, 295 + xy: 331, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 1007, 299 + xy: 343, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1294,245 +1294,245 @@ shadow-rounded-2 index: -1 bridge-conduit-arrow rotate: false - xy: 494, 129 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 504, 139 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 514, 149 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 504, 119 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 514, 119 + xy: 843, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 524, 119 + xy: 843, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 534, 119 + xy: 843, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 544, 146 + xy: 843, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 544, 136 + xy: 843, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 554, 146 + xy: 843, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 544, 126 + xy: 853, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 564, 146 + xy: 873, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 554, 126 + xy: 883, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 564, 136 + xy: 893, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 564, 126 + xy: 903, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 544, 116 + xy: 913, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 554, 116 + xy: 923, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 564, 116 + xy: 933, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 839, 278 + xy: 913, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 769, 198 + xy: 923, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 779, 208 + xy: 933, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 789, 218 + xy: 863, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 661, 230 + xy: 661, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 661, 204 + xy: 711, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 711, 368 + xy: 711, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 879, 217 + xy: 247, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 889, 227 + xy: 257, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 899, 237 + xy: 257, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 889, 217 + xy: 287, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 899, 227 + xy: 297, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 909, 237 + xy: 297, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 919, 247 + xy: 307, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 929, 257 + xy: 307, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 879, 197 + xy: 317, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 889, 207 + xy: 317, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,28 +1623,28 @@ fusion-reactor-top index: -1 nuclear-reactor-center rotate: false - xy: 715, 316 + xy: 741, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclear-reactor-lights rotate: false - xy: 741, 316 + xy: 767, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 889, 197 + xy: 396, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 319, 81 + xy: 247, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1693,70 +1693,70 @@ block-icon-arc-smelter index: -1 arc-smelter-top rotate: false - xy: 761, 298 + xy: 813, 298 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 761, 298 + xy: 813, 298 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 779, 298 + xy: 427, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 797, 298 + xy: 445, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 815, 298 + xy: 831, 298 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 427, 178 + xy: 159, 5 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 445, 178 + xy: 679, 285 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 159, 5 + xy: 697, 285 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 833, 298 + xy: 685, 267 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 833, 298 + xy: 685, 267 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1812,119 +1812,119 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 759, 198 + xy: 923, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 839, 258 + xy: 973, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 175, 99 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 193, 99 + xy: 339, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 175, 81 + xy: 357, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 211, 99 + xy: 375, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 193, 81 + xy: 393, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 899, 217 + xy: 473, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 909, 227 + xy: 473, 92 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 909, 197 + xy: 331, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core-open rotate: false - xy: 609, 230 + xy: 635, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-top rotate: false - xy: 635, 230 + xy: 583, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 889, 187 + xy: 521, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 526, 199 + xy: 1005, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 536, 199 + xy: 1015, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 679, 285 + xy: 703, 267 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 697, 285 + xy: 721, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1973,42 +1973,42 @@ arc-heat index: -1 cyclone rotate: false - xy: 609, 204 + xy: 635, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 821, 288 + xy: 883, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 635, 204 + xy: 661, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 635, 204 + xy: 661, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 789, 278 + xy: 923, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scatter rotate: false - xy: 789, 278 + xy: 923, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2022,14 +2022,14 @@ hail-heat index: -1 lancer rotate: false - xy: 393, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 466, 184 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2043,203 +2043,238 @@ meltdown index: -1 ripple rotate: false - xy: 807, 394 + xy: 815, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 815, 368 + xy: 815, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 247, 81 + xy: 175, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 283, 99 + xy: 211, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 265, 81 + xy: 193, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 301, 99 + xy: 229, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scorch rotate: false - xy: 919, 217 + xy: 321, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 929, 227 + xy: 321, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 swarmer rotate: false - xy: 283, 81 + xy: 211, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 373, 81 + xy: 301, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 391, 81 + xy: 337, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -drone-pad-top - rotate: false - xy: 687, 213 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -drone-pad-top-open - rotate: false - xy: 705, 249 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -fabricator-pad-top - rotate: false - xy: 705, 231 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -fabricator-pad-top-open - rotate: false - xy: 705, 213 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -interceptor-factory-top-open - rotate: false - xy: 339, 117 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -interceptor-pad-top - rotate: false - xy: 357, 117 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -mech-factory - rotate: false - xy: 737, 368 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dart-ship-factory-open +dagger-pad-top rotate: false xy: 985, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -delta-mech-factory-open +dagger-pad-top-open rotate: false xy: 687, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -javelin-ship-factory-open +drone-pad-top rotate: false - xy: 375, 117 + xy: 705, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -monsoon-pad +drone-pad-top-open + rotate: false + xy: 705, 213 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +fabricator-pad-top + rotate: false + xy: 723, 254 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +fabricator-pad-top-open + rotate: false + xy: 723, 236 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +interceptor-pad-top + rotate: false + xy: 177, 117 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +interceptor-pad-top-open + rotate: false + xy: 195, 117 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +mech-factory rotate: false xy: 737, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -monsoon-pad-top - rotate: false - xy: 763, 368 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -monsoon-pad-top-open - rotate: false - xy: 763, 342 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -reconstructor-open - rotate: false - xy: 229, 99 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -repair-point-turret - rotate: false - xy: 919, 237 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -ship-factory - rotate: false - xy: 819, 316 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -door-large-open +dart-ship-factory-open rotate: false xy: 687, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +delta-mech-factory-open + rotate: false + xy: 687, 213 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +javelin-ship-factory-open + rotate: false + xy: 213, 117 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +monsoon-pad + rotate: false + xy: 763, 368 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +monsoon-pad-top + rotate: false + xy: 763, 342 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titan-pad-top + rotate: false + xy: 763, 342 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +monsoon-pad-top-open + rotate: false + xy: 715, 316 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titan-pad-top-open + rotate: false + xy: 715, 316 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +reconstructor-open + rotate: false + xy: 795, 188 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +repair-point-turret + rotate: false + xy: 376, 51 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +ship-factory + rotate: false + xy: 715, 290 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titan-pad + rotate: false + xy: 741, 290 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +door-large-open + rotate: false + xy: 705, 249 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 door-open rotate: false - xy: 811, 288 + xy: 873, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2274,56 +2309,56 @@ bullet index: -1 bullet-back rotate: false - xy: 404, 70 + xy: 343, 44 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 395, 43 + xy: 845, 318 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 clear rotate: false - xy: 551, 176 + xy: 566, 287 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 command-attack rotate: false - xy: 474, 119 + xy: 841, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 484, 119 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 494, 119 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 851, 281 + xy: 425, 87 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 241, 19 + xy: 849, 296 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2365,14 +2400,14 @@ minelaser-end index: -1 missile rotate: false - xy: 399, 54 + xy: 486, 198 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 399, 43 + xy: 497, 198 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2414,21 +2449,21 @@ scorch5 index: -1 shell rotate: false - xy: 395, 32 + xy: 508, 198 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 395, 21 + xy: 519, 198 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 919, 207 + xy: 327, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2442,56 +2477,56 @@ transfer index: -1 transfer-arrow rotate: false - xy: 949, 233 + xy: 529, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 741, 296 + xy: 793, 296 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blackstone-cliff-edge rotate: false - xy: 486, 199 + xy: 1015, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 496, 199 + xy: 1015, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 506, 199 + xy: 1005, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 516, 199 + xy: 1015, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 685, 267 + xy: 739, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 703, 267 + xy: 757, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2505,126 +2540,126 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 494, 189 + xy: 1005, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 494, 189 + xy: 1005, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 504, 189 + xy: 1015, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 504, 189 + xy: 1015, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 514, 189 + xy: 1015, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 524, 189 + xy: 1015, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 524, 189 + xy: 1015, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall-large rotate: false - xy: 721, 272 + xy: 775, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 carbide-wall-large rotate: false - xy: 721, 272 + xy: 775, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 427, 160 + xy: 793, 278 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 427, 160 + xy: 793, 278 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 534, 189 + xy: 1015, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 534, 189 + xy: 1015, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 445, 160 + xy: 427, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 445, 160 + xy: 427, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 544, 189 + xy: 530, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 556, 196 + xy: 540, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 556, 196 + xy: 540, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2645,14 +2680,14 @@ core index: -1 block-icon-cryofluidmixer rotate: false - xy: 420, 142 + xy: 445, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 438, 142 + xy: 420, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2664,6 +2699,13 @@ block-icon-cyclone orig: 24, 24 offset: 0, 0 index: -1 +block-icon-dagger-pad + rotate: false + xy: 438, 142 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-dart-ship-factory rotate: false xy: 853, 393 @@ -2680,42 +2722,42 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 566, 196 + xy: 484, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 566, 196 + xy: 484, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 484, 179 + xy: 494, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 484, 179 + xy: 494, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 484, 179 + xy: 494, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 484, 179 + xy: 494, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2764,14 +2806,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 494, 179 + xy: 504, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 494, 179 + xy: 504, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2792,14 +2834,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 504, 179 + xy: 514, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 504, 179 + xy: 514, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2827,21 +2869,21 @@ block-icon-drone-pad index: -1 block-icon-drop-point rotate: false - xy: 514, 179 + xy: 524, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 514, 179 + xy: 524, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 524, 179 + xy: 534, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2869,63 +2911,63 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 534, 179 + xy: 544, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 534, 179 + xy: 544, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 544, 179 + xy: 484, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 554, 186 + xy: 494, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 554, 186 + xy: 494, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 564, 186 + xy: 504, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 564, 186 + xy: 504, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 481, 169 + xy: 514, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 481, 169 + xy: 514, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2939,28 +2981,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 491, 169 + xy: 524, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 491, 169 + xy: 524, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 501, 169 + xy: 534, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 501, 169 + xy: 534, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2981,14 +3023,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 511, 169 + xy: 544, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 511, 169 + xy: 544, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3009,35 +3051,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 521, 169 + xy: 481, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 521, 169 + xy: 481, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 531, 169 + xy: 491, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 531, 169 + xy: 491, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 541, 169 + xy: 501, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3051,14 +3093,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 554, 176 + xy: 511, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 554, 176 + xy: 511, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3079,14 +3121,14 @@ mass-driver index: -1 block-icon-mechanical-pump rotate: false - xy: 564, 176 + xy: 521, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 564, 176 + xy: 521, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3100,28 +3142,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 755, 178 + xy: 531, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 755, 178 + xy: 531, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 363, 9 + xy: 541, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 363, 9 + xy: 541, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,14 +3191,14 @@ nuclear-reactor index: -1 block-icon-oil rotate: false - xy: 373, 11 + xy: 551, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 373, 11 + xy: 551, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3170,42 +3212,42 @@ block-icon-oil-extractor index: -1 block-icon-overflow-gate rotate: false - xy: 373, 1 + xy: 356, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 373, 1 + xy: 356, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 383, 11 + xy: 366, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 383, 11 + xy: 366, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 383, 1 + xy: 376, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 383, 1 + xy: 376, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3240,14 +3282,14 @@ plastanium-compressor index: -1 block-icon-power-node rotate: false - xy: 393, 11 + xy: 386, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 393, 11 + xy: 386, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3268,42 +3310,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 393, 1 + xy: 396, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 393, 1 + xy: 396, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 1007, 289 + xy: 406, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1007, 289 + xy: 406, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 406, 33 + xy: 416, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 406, 23 + xy: 426, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3329,6 +3371,13 @@ block-icon-reconstructor orig: 16, 16 offset: 0, 0 index: -1 +dagger-pad + rotate: false + xy: 877, 375 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 drone-pad rotate: false xy: 877, 375 @@ -3359,28 +3408,28 @@ reconstructor index: -1 block-icon-repair-point rotate: false - xy: 551, 166 + xy: 355, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 551, 166 + xy: 355, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupply-point rotate: false - xy: 561, 166 + xy: 365, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 561, 166 + xy: 365, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3394,14 +3443,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 755, 168 + xy: 354, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 755, 168 + xy: 354, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3422,14 +3471,14 @@ rotary-pump index: -1 block-icon-rtg-generator rotate: false - xy: 403, 11 + xy: 364, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 403, 11 + xy: 364, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3443,49 +3492,49 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 403, 1 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 403, 1 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 481, 159 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 491, 159 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 491, 159 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 501, 159 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 501, 159 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3506,42 +3555,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 511, 159 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 511, 159 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 521, 159 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 521, 159 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 531, 159 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 531, 159 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3562,42 +3611,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 541, 159 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 541, 159 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 551, 156 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 551, 156 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 561, 156 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 561, 156 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3611,28 +3660,28 @@ block-icon-spectre index: -1 block-icon-splitter rotate: false - xy: 571, 166 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 571, 166 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 571, 156 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 571, 156 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3674,14 +3723,14 @@ thermal-pump index: -1 block-icon-thorium-wall rotate: false - xy: 474, 149 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 474, 149 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3700,44 +3749,51 @@ thorium-wall-large orig: 16, 16 offset: 0, 0 index: -1 +block-icon-titan-pad + rotate: false + xy: 624, 256 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 block-icon-titanium-conveyor rotate: false - xy: 474, 139 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 474, 139 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 474, 139 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 484, 149 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 474, 129 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 474, 129 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3772,56 +3828,56 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 484, 139 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 484, 139 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-vault rotate: false - xy: 624, 256 + xy: 650, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault rotate: false - xy: 624, 256 + xy: 650, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-warp-gate rotate: false - xy: 650, 256 + xy: 583, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 warp-gate rotate: false - xy: 650, 256 + xy: 583, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-water rotate: false - xy: 494, 149 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 494, 149 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3842,1057 +3898,1057 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 584, 126 + xy: 903, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 584, 116 + xy: 853, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 409, 107 + xy: 863, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 409, 97 + xy: 873, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 771, 288 + xy: 903, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 781, 288 + xy: 913, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 791, 288 + xy: 853, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 801, 288 + xy: 863, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 799, 248 + xy: 933, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 809, 258 + xy: 913, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 819, 268 + xy: 923, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 829, 278 + xy: 933, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 799, 238 + xy: 873, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 809, 248 + xy: 883, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 819, 258 + xy: 893, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 829, 268 + xy: 903, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 367, 21 + xy: 891, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 381, 21 + xy: 905, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 1003, 367 + xy: 919, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 1003, 353 + xy: 933, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 1003, 353 + xy: 933, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 1005, 339 + xy: 947, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 1005, 339 + xy: 947, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 769, 188 + xy: 923, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 765, 178 + xy: 933, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 779, 198 + xy: 943, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 789, 208 + xy: 953, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 799, 218 + xy: 943, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 809, 228 + xy: 963, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 819, 238 + xy: 943, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 829, 248 + xy: 953, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 765, 168 + xy: 943, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 779, 188 + xy: 953, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 775, 178 + xy: 963, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 789, 198 + xy: 983, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 799, 208 + xy: 993, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 809, 218 + xy: 943, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 819, 228 + xy: 953, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 829, 238 + xy: 963, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 839, 248 + xy: 973, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 775, 168 + xy: 943, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 789, 188 + xy: 953, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 785, 178 + xy: 963, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 799, 198 + xy: 973, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 809, 208 + xy: 983, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 819, 218 + xy: 943, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 829, 228 + xy: 953, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 839, 238 + xy: 963, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 785, 168 + xy: 973, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 799, 188 + xy: 983, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 795, 178 + xy: 993, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 809, 198 + xy: 1003, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 819, 208 + xy: 943, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 829, 218 + xy: 953, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 839, 228 + xy: 963, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 795, 168 + xy: 973, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 809, 188 + xy: 983, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 805, 178 + xy: 993, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 819, 198 + xy: 1003, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 829, 208 + xy: 1013, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 839, 218 + xy: 943, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 805, 168 + xy: 953, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 819, 188 + xy: 963, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 815, 178 + xy: 973, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 829, 198 + xy: 983, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 839, 208 + xy: 993, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 815, 168 + xy: 1003, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 829, 188 + xy: 1013, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 825, 178 + xy: 943, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 839, 198 + xy: 953, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 825, 168 + xy: 963, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 839, 188 + xy: 973, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 835, 178 + xy: 983, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 835, 168 + xy: 993, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 849, 271 + xy: 1003, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 849, 261 + xy: 1013, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 849, 251 + xy: 953, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 849, 241 + xy: 963, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 849, 231 + xy: 973, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 849, 221 + xy: 983, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 849, 211 + xy: 993, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 849, 201 + xy: 1003, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 849, 191 + xy: 1013, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 861, 277 + xy: 963, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 871, 277 + xy: 973, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 881, 277 + xy: 983, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 891, 277 + xy: 993, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 901, 277 + xy: 1003, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 911, 277 + xy: 1013, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 921, 277 + xy: 973, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 931, 277 + xy: 983, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 859, 267 + xy: 993, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 859, 257 + xy: 1003, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 869, 267 + xy: 1013, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 859, 247 + xy: 983, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 869, 257 + xy: 993, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 879, 267 + xy: 1003, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 859, 237 + xy: 1013, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 869, 247 + xy: 993, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 879, 257 + xy: 1003, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 889, 267 + xy: 1013, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 859, 227 + xy: 1013, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 869, 237 + xy: 943, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone1 rotate: false - xy: 879, 247 + xy: 953, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone2 rotate: false - xy: 889, 257 + xy: 963, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone3 rotate: false - xy: 899, 267 + xy: 973, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass1 rotate: false - xy: 859, 217 + xy: 983, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass2 rotate: false - xy: 869, 227 + xy: 993, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass3 rotate: false - xy: 879, 237 + xy: 1003, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice1 rotate: false - xy: 889, 247 + xy: 1013, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice2 rotate: false - xy: 899, 257 + xy: 177, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice3 rotate: false - xy: 909, 267 + xy: 187, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand1 rotate: false - xy: 859, 207 + xy: 197, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand2 rotate: false - xy: 869, 217 + xy: 207, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand3 rotate: false - xy: 879, 227 + xy: 217, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow1 rotate: false - xy: 889, 237 + xy: 217, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow2 rotate: false - xy: 899, 247 + xy: 227, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow3 rotate: false - xy: 909, 257 + xy: 227, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone1 rotate: false - xy: 919, 267 + xy: 237, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone2 rotate: false - xy: 859, 197 + xy: 237, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone3 rotate: false - xy: 869, 207 + xy: 247, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 919, 227 + xy: 426, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 929, 237 + xy: 436, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 899, 197 + xy: 436, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 909, 207 + xy: 331, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 929, 197 + xy: 481, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 859, 187 + xy: 491, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 869, 187 + xy: 501, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 879, 187 + xy: 511, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 899, 187 + xy: 531, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 909, 187 + xy: 541, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 919, 187 + xy: 551, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 929, 187 + xy: 474, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -unit-icon-scout +unit-icon-dagger rotate: false - xy: 275, 5 + xy: 185, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 355, 99 + xy: 283, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 779, 248 + xy: 933, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 789, 258 + xy: 883, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 799, 268 + xy: 893, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 809, 278 + xy: 903, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 759, 218 + xy: 913, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 769, 228 + xy: 923, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 779, 238 + xy: 933, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 789, 248 + xy: 893, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 799, 258 + xy: 903, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 809, 268 + xy: 913, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 819, 278 + xy: 923, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 759, 208 + xy: 933, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 769, 218 + xy: 903, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 779, 228 + xy: 913, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 789, 238 + xy: 923, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 789, 228 + xy: 863, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4932,7 +4988,7 @@ tau-mech-base orig: 12, 12 offset: 0, 0 index: -1 -scout-base +dagger-base rotate: false xy: 85, 1 size: 12, 12 @@ -4960,7 +5016,7 @@ tau-mech-leg orig: 12, 12 offset: 0, 0 index: -1 -scout-leg +dagger-leg rotate: false xy: 99, 1 size: 12, 12 @@ -4969,63 +5025,63 @@ scout-leg index: -1 delta-mech rotate: false - xy: 185, 19 + xy: 370, 71 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 199, 19 + xy: 384, 73 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 177, 5 + xy: 947, 289 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 177, 5 + xy: 947, 289 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 381, 35 + xy: 356, 69 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 297, 19 + xy: 905, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 297, 19 + xy: 905, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 339, 19 + xy: 863, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 339, 19 + xy: 863, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5138,7 +5194,7 @@ button-map-over index: -1 button-select rotate: false - xy: 583, 230 + xy: 609, 230 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -5209,21 +5265,21 @@ controller-cursor index: -1 icon-about rotate: false - xy: 180, 65 + xy: 319, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 196, 65 + xy: 355, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 212, 65 + xy: 335, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5244,231 +5300,231 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 723, 254 + xy: 741, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 723, 254 + xy: 741, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 1003, 381 + xy: 213, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 303, 7 + xy: 225, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 315, 7 + xy: 237, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 327, 7 + xy: 249, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 723, 236 + xy: 723, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 228, 65 + xy: 371, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 723, 218 + xy: 741, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 687, 195 + xy: 759, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 339, 7 + xy: 261, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 705, 195 + xy: 741, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 351, 7 + xy: 273, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 851, 312 + xy: 285, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 851, 300 + xy: 297, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 244, 65 + xy: 387, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 260, 65 + xy: 403, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 863, 309 + xy: 1003, 381 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 276, 65 + xy: 419, 108 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 292, 65 + xy: 435, 108 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 308, 65 + xy: 451, 108 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 324, 65 + xy: 180, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 723, 200 + xy: 759, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 456, 142 + xy: 759, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 340, 65 + xy: 196, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 456, 124 + xy: 777, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 951, 335 + xy: 777, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 356, 65 + xy: 212, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 969, 335 + xy: 777, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 372, 65 + xy: 228, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 987, 335 + xy: 795, 260 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 388, 65 + xy: 244, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 175, 49 + xy: 260, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5482,441 +5538,441 @@ icon-generated index: -1 icon-github rotate: false - xy: 191, 49 + xy: 276, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 175, 33 + xy: 292, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 951, 317 + xy: 795, 242 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 875, 309 + xy: 1003, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 887, 309 + xy: 1003, 357 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 207, 49 + xy: 175, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 191, 33 + xy: 191, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 899, 309 + xy: 1003, 305 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 223, 49 + xy: 175, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 911, 309 + xy: 1003, 293 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 759, 228 + xy: 913, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 969, 317 + xy: 795, 224 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 207, 33 + xy: 207, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 923, 309 + xy: 309, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 239, 49 + xy: 191, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 987, 317 + xy: 687, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 741, 278 + xy: 705, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 741, 260 + xy: 723, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 741, 242 + xy: 741, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 935, 309 + xy: 467, 112 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 223, 33 + xy: 223, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 863, 297 + xy: 1003, 281 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 741, 224 + xy: 759, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 875, 297 + xy: 723, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 887, 297 + xy: 735, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 769, 238 + xy: 923, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 899, 297 + xy: 747, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 741, 206 + xy: 777, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 255, 49 + xy: 207, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 177, 117 + xy: 795, 206 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 911, 297 + xy: 759, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 239, 33 + xy: 239, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 923, 297 + xy: 771, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 935, 297 + xy: 783, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 947, 305 + xy: 425, 96 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 271, 49 + xy: 223, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 195, 117 + xy: 456, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 255, 33 + xy: 255, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 287, 49 + xy: 239, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 213, 117 + xy: 456, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 271, 33 + xy: 271, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 303, 49 + xy: 255, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 287, 33 + xy: 287, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 319, 49 + xy: 271, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 303, 33 + xy: 287, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 231, 117 + xy: 951, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 249, 117 + xy: 969, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 959, 305 + xy: 437, 96 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 267, 117 + xy: 987, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 335, 49 + xy: 308, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 971, 305 + xy: 449, 96 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 983, 305 + xy: 426, 75 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 319, 33 + xy: 303, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 285, 117 + xy: 951, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 351, 49 + xy: 303, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 335, 33 + xy: 324, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 303, 117 + xy: 969, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 947, 293 + xy: 461, 96 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 367, 49 + xy: 340, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 959, 293 + xy: 319, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 351, 33 + xy: 351, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 321, 117 + xy: 987, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 383, 49 + xy: 367, 85 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6002,7 +6058,7 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 566, 287 + xy: 177, 166 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6102,16 +6158,23 @@ window-empty orig: 27, 61 offset: 0, 0 index: -1 +dagger + rotate: false + xy: 397, 87 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 drone rotate: false - xy: 227, 19 + xy: 849, 310 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 227, 19 + xy: 849, 310 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6132,14 +6195,14 @@ unit-icon-fabricator index: -1 interceptor rotate: false - xy: 325, 19 + xy: 933, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 325, 19 + xy: 933, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6158,30 +6221,23 @@ unit-icon-monsoon orig: 18, 18 offset: 0, 0 index: -1 -scout - rotate: false - xy: 205, 5 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 titan rotate: false - xy: 319, 99 + xy: 247, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 301, 81 + xy: 229, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 337, 99 + xy: 265, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6195,35 +6251,35 @@ blaster-equip index: -1 chain-blaster-equip rotate: false - xy: 367, 35 + xy: 383, 87 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 255, 19 + xy: 863, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 269, 19 + xy: 877, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 1005, 311 + xy: 975, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 219, 5 + xy: 975, 289 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 8f5c8650dd..b057b476c4 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index c3194bc9ab..bd5fbeb93d 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -95,6 +95,7 @@ public class Recipes implements ContentList{ //generators - combustion new Recipe(power, PowerBlocks.combustionGenerator, new ItemStack(Items.tungsten, 50), new ItemStack(Items.lead, 30)); new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.tungsten, 70), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60)); + new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.tungsten, 80), new ItemStack(Items.carbide, 70), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 70), new ItemStack(Items.thorium, 70)); //generators - solar new Recipe(power, PowerBlocks.solarPanel, new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 30)); @@ -132,9 +133,13 @@ public class Recipes implements ContentList{ //actual unit related stuff new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.tungsten, 50), new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 130)); - new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.carbide, 70), new ItemStack(Items.thorium, 100), new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 300)); - new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.carbide, 70), new ItemStack(Items.thorium, 100), new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 300)); - new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.carbide, 70), new ItemStack(Items.thorium, 100), new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 300)); + new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.carbide, 70), new ItemStack(Items.thorium, 60), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 200)); + + new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 70)); + new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 180)); + + new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 40), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)); + new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.plastanium, 70), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)); new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 30)); new Recipe(units, UnitBlocks.resupplyPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 30)); diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index 2b5a91a3d6..c53c66468c 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.game.Content; import io.anuke.mindustry.type.ContentList; public class UnitTypes implements ContentList{ - public static UnitType drone, scout, interceptor, monsoon, titan, fabricator; + public static UnitType drone, dagger, interceptor, monsoon, titan, fabricator; @Override public void load(){ @@ -23,7 +23,7 @@ public class UnitTypes implements ContentList{ health = 45; }}; - scout = new UnitType("scout", Scout.class, Scout::new){{ + dagger = new UnitType("dagger", Dagger.class, Dagger::new){{ maxVelocity = 1.1f; speed = 0.2f; drag = 0.4f; @@ -55,6 +55,7 @@ public class UnitTypes implements ContentList{ drag = 0.01f; isFlying = true; weapon = Weapons.bomber; + ammoCapacity = 50; }}; fabricator = new UnitType("fabricator", Fabricator.class, Fabricator::new){{ diff --git a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java index 1c79d24a5f..e5e5d97480 100644 --- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java @@ -22,6 +22,7 @@ public class LiquidBlocks extends BlockList implements ContentList{ pumpAmount = 0.25f; consumes.power(0.015f); liquidCapacity = 30f; + powerCapacity = 20f; hasPower = true; size = 2; tier = 1; @@ -32,6 +33,8 @@ public class LiquidBlocks extends BlockList implements ContentList{ pumpAmount = 0.55f; consumes.power(0.03f); liquidCapacity = 40f; + hasPower = true; + powerCapacity = 20f; size = 2; tier = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java index 6492072ba5..5acbcb02fa 100644 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java @@ -21,9 +21,8 @@ public class PowerBlocks extends BlockList implements ContentList{ thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{ maxLiquidGenerate = 0.5f; - powerPerLiquid = 0.08f; powerCapacity = 40f; - powerPerLiquid = 0.25f; + powerPerLiquid = 0.55f; generateEffect = BlockFx.redgeneratespark; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index ca5a83e2cf..231036f9cd 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.world.blocks.units.*; public class UnitBlocks extends BlockList implements ContentList{ public static Block resupplyPoint, repairPoint, dronePad, - fabricatorPad, interceptorPad, monsoonPad, scoutPad, titanPad, + fabricatorPad, interceptorPad, monsoonPad, daggerPad, titanPad, dropPoint, reconstructor, overdriveProjector, shieldProjector, commandCenter; @Override @@ -24,7 +24,7 @@ public class UnitBlocks extends BlockList implements ContentList{ fabricatorPad = new UnitPad("fabricator-pad"){{ type = UnitTypes.fabricator; - produceTime = 1600; + produceTime = 1400; size = 2; consumes.power(0.2f); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)}); @@ -32,10 +32,10 @@ public class UnitBlocks extends BlockList implements ContentList{ interceptorPad = new UnitPad("interceptor-pad"){{ type = UnitTypes.interceptor; - produceTime = 1300; + produceTime = 800; size = 2; - consumes.power(0.1f); - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 40)}); + consumes.power(0.08f); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.titanium, 10)}); }}; monsoonPad = new UnitPad("monsoon-pad"){{ @@ -44,7 +44,24 @@ public class UnitBlocks extends BlockList implements ContentList{ size = 3; consumes.power(0.14f); shadow = "shadow-round-3"; - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 50), new ItemStack(Items.plastanium, 50)}); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)}); + }}; + + daggerPad = new UnitPad("dagger-pad"){{ + type = UnitTypes.dagger; + produceTime = 600; + size = 2; + consumes.power(0.06f); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.tungsten, 20)}); + }}; + + titanPad = new UnitPad("titan-pad"){{ + type = UnitTypes.titan; + produceTime = 1300; + size = 3; + consumes.power(0.15f); + shadow = "shadow-round-3"; + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.tungsten, 30), new ItemStack(Items.thorium, 30)}); }}; resupplyPoint = new ResupplyPoint("resupply-point"){{ diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java index 9a6b29db93..608712e366 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java @@ -43,7 +43,7 @@ public class UnitType implements UnlockableContent{ public float retreatPercent = 0.2f; public float armor = 0f; public float carryWeight = 1f; - public int ammoCapacity = 100; + public int ammoCapacity = 220; public int itemCapacity = 30; public ObjectSet toMine = ObjectSet.with(Items.lead, Items.tungsten); public float buildPower = 0.3f, minePower = 0.7f, healSpeed = 0.1f; diff --git a/core/src/io/anuke/mindustry/entities/units/types/Scout.java b/core/src/io/anuke/mindustry/entities/units/types/Dagger.java similarity index 72% rename from core/src/io/anuke/mindustry/entities/units/types/Scout.java rename to core/src/io/anuke/mindustry/entities/units/types/Dagger.java index bdfdbe4f89..aab1b4161b 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Scout.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Dagger.java @@ -2,6 +2,6 @@ package io.anuke.mindustry.entities.units.types; import io.anuke.mindustry.entities.units.GroundUnit; -public class Scout extends GroundUnit{ +public class Dagger extends GroundUnit{ } diff --git a/core/src/io/anuke/mindustry/game/TeamInfo.java b/core/src/io/anuke/mindustry/game/TeamInfo.java index 8559fde11d..8ddb84624d 100644 --- a/core/src/io/anuke/mindustry/game/TeamInfo.java +++ b/core/src/io/anuke/mindustry/game/TeamInfo.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.game; +import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.ObjectMap; import com.badlogic.gdx.utils.ObjectSet; import io.anuke.mindustry.world.Tile; @@ -130,7 +131,7 @@ public class TeamInfo{ } public class TeamData{ - public final ThreadArray cores = new ThreadArray<>(); + public final Array cores = new ThreadArray<>(); public final Team team; public final boolean ally; diff --git a/core/src/io/anuke/mindustry/game/Waves.java b/core/src/io/anuke/mindustry/game/Waves.java index 5ec33ba7ef..7267e88d6d 100644 --- a/core/src/io/anuke/mindustry/game/Waves.java +++ b/core/src/io/anuke/mindustry/game/Waves.java @@ -11,7 +11,7 @@ public class Waves{ public static Array getSpawns(){ return Array.with( - new SpawnGroup(UnitTypes.scout){{ + new SpawnGroup(UnitTypes.dagger){{ end = 8; unitScaling = 2; }}, @@ -21,7 +21,7 @@ public class Waves{ end = 14; }}, - new SpawnGroup(UnitTypes.scout){{ + new SpawnGroup(UnitTypes.dagger){{ begin = 11; unitScaling = 2; spacing = 2; @@ -36,7 +36,7 @@ public class Waves{ end = 30; }}, - new SpawnGroup(UnitTypes.scout){{ + new SpawnGroup(UnitTypes.dagger){{ begin = 10; unitScaling = 2; unitAmount = 1; @@ -79,7 +79,7 @@ public class Waves{ max = 7; }}, - new SpawnGroup(UnitTypes.scout){{ + new SpawnGroup(UnitTypes.dagger){{ begin = 82; spacing = 3; unitAmount = 4; @@ -89,7 +89,7 @@ public class Waves{ ammoItem = Items.silicon; }}, - new SpawnGroup(UnitTypes.scout){{ + new SpawnGroup(UnitTypes.dagger){{ begin = 41; spacing = 5; unitAmount = 1; @@ -99,7 +99,7 @@ public class Waves{ max = 10; }}, - new SpawnGroup(UnitTypes.scout){{ + new SpawnGroup(UnitTypes.dagger){{ begin = 35; spacing = 3; unitAmount = 4; @@ -109,7 +109,7 @@ public class Waves{ end = 60; }}, - new SpawnGroup(UnitTypes.scout){{ + new SpawnGroup(UnitTypes.dagger){{ begin = 42; spacing = 3; unitAmount = 4; diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index c3e629e459..db0ead142f 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -13,13 +13,16 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret; import io.anuke.mindustry.world.blocks.defense.turrets.PowerTurret; -import io.anuke.mindustry.world.blocks.defense.turrets.Turret; +import io.anuke.mindustry.world.blocks.units.ResupplyPoint; +import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.world; public class FortressGenerator{ private final static int minCoreDst = 60; + private static Structure[] structures; + private static Structure[] bases; private int enemyX, enemyY, coreX, coreY; private Team team; @@ -40,9 +43,15 @@ public class FortressGenerator{ //more advanced duo outpost new Structure(0.04f, Items.lead, "BwYADnR1bmdzdGVuLWRyaWxsAwADZHVvBAAIc3BsaXR0ZXIBAA10dW5nc3Rlbi13YWxsAgATdHVuZ3N0ZW4td2FsbC1sYXJnZQAAA2FpcgUACGNvbnZleW9yCQkAAAAAAQEBAQEBAQEBAgAAAAAAAAICAAEDAAQDAwACAgAAAAABAgACAAABAgUCAQEAAAAAAQABAgMAAQIBAgUCAQEBAQMAAQABAgQCBQMFAwYCBQEFAQQDAQABAgMAAQEBAQUAAQMBAwMAAQABAwICAAMBAQUAAQMCAgADAQMAAAAAAAIDAAQDAwAAAwADAAAAAAAAAQIBAwEDAQMBAwAAAAA="), + //tungsten duo and drone outpost + new Structure(0.02f, Items.tungsten, "BgEADXR1bmdzdGVuLXdhbGwEAA1jYXJiaWRlLWRyaWxsAwADZHVvAgATdHVuZ3N0ZW4td2FsbC1sYXJnZQAAA2FpcgUACWRyb25lLXBhZAUHAAAAAAEDAQMCAgAAAAAAAAAAAQADAAADAAMBAgAAAAABAAQBBQAAAAECAAAAAAEAAwAAAAAAAQIAAAAAAQABAQEBAQEBAg=="), + //lead storage new Structure(0.02f, Items.lead, vaults), + //mini dagger outpost + new Structure(0.02f, Items.lead, "CwIADXR1bmdzdGVuLXdhbGwGAAhjb252ZXlvcgUAA2R1bwgACmRhZ2dlci1wYWQBABN0dW5nc3Rlbi13YWxsLWxhcmdlBwAIc3BsaXR0ZXIDAA5yZXN1cHBseS1wb2ludAoADHJlcGFpci1wb2ludAkADnR1bmdzdGVuLWRyaWxsAAADYWlyBAALc29sYXItcGFuZWwHCQAAAAABAAABAgECAQIBAAAAAAEAAAMAAwADAwEEAAIBAgICAgAAAAAFAwYDBwMCAQIBBQECAgAAAAAIAAAACQMGAQYBBwMCAgAAAAAAAAAAAQMAAAIDBQECAgEAAAAKAQQBAAAAAAIBAgECAgAAAAACAQIBAgEAAAAAAAAAAA=="), + //salvo outpost new Structure(0.02f, Items.tungsten, "BAIABXNhbHZvAwANY2FyYmlkZS1kcmlsbAAAA2FpcgEADGNhcmJpZGUtd2FsbAcHAAAAAAEDAQMBAwEDAAABAwEDAQMCAAAAAQMAAAEAAgAAAAAAAAABAwEDAQAAAAAAAwACAAAAAQIBAAEBAgAAAAAAAAABAgAAAQEAAAAAAQEBAQEBAAABAQEBAQEBAQAAAAA="), @@ -52,15 +61,50 @@ public class FortressGenerator{ //titanium storage new Structure(0.02f, Items.titanium, vaults), + //2x interceptor outpost + new Structure(0.02f, Items.lead, "CgMAEXNvbGFyLXBhbmVsLWxhcmdlBgADZHVvAgAPaW50ZXJjZXB0b3ItcGFkBAASY2FyYmlkZS13YWxsLWxhcmdlBwAOcmVzdXBwbHktcG9pbnQAAANhaXIFAAtzb2xhci1wYW5lbAEADGNhcmJpZGUtd2FsbAkAC2Rpc3RyaWJ1dG9yCAALbGFzZXItZHJpbGwKCAEAAQMBAwEDAQMBAwECAAABAAIDAAAAAAAAAAABAgAAAQAAAAAAAAADAQAAAQIBAgQDAAAFAAAAAAAAAAYCAQMAAAAABwAIAAAACQAAAAECBAMAAAEAAAAAAAABAAABAgAAAAAFAAAAAAAAAAYCAQIBAAIDAAAAAAMBAAABAgECAQAAAAAAAAAAAAAAAQIAAAEAAQEBAQEBAQEBAQEBAAA="), + //coal laser outpost new Structure(0.03f, null, "BgEADHRob3JpdW0td2FsbAMABmxhbmNlcgUAFGNvbWJ1c3Rpb24tZ2VuZXJhdG9yBAANY2FyYmlkZS1kcmlsbAAAA2FpcgIAC3NvbGFyLXBhbmVsBwcAAAEAAQABAQEBAQEBAAAAAQACAgMAAAACAAEAAAABAAICAAAAAAIAAQAAAAEAAQAEAQUAAQABAAAAAQACAAMBAAMCAAEAAAABAAIAAAMAAwIAAQAAAAEAAQABAwEDAQABAA=="), //ultimate laser outpost new Structure(0.02f, null, "BgMABmxhbmNlcgIAEmNhcmJpZGUtd2FsbC1sYXJnZQUAEXNvbGFyLXBhbmVsLWxhcmdlAAADYWlyBAALc29sYXItcGFuZWwBAAxjYXJiaWRlLXdhbGwPDwAAAAAAAAAAAAABAwIDAAABAwAAAAAAAAAAAAAAAAAAAAACAwAAAgMAAAAAAAACAwAAAgMAAAAAAAAAAAAAAQMAAAAAAAAAAAMDAAAAAAAAAAAAAAIDAAAAAAAAAgMAAAMDAAAEAwAAAAADAwAAAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIDAAAAAAAAAgMAAAMDAAAAAAUDAAAAAAAAAAAEAwAAAAABAwEDAAAAAAAAAAAAAAAAAAAAAAUDAAADAwAAAgMAAAIDAAADAwAAAAAAAAAABAMAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAFAwAAAAAAAAAAAwMAAAIDAAABAwEDAgMAAAQDAAAAAAAAAAAFAwAAAAAAAAAAAAAAAAAAAAAAAAMDAAADAwAAAAAAAAAAAwMAAAIDAAAAAAAAAgMAAAAAAAAAAAAAAwMAAAQDAAAAAAAAAAAAAAAAAAAAAAIDAAACAwAAAAAAAAIDAAACAwAAAQMAAAAAAAABAwAAAAAAAAAAAgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEDAAAAAAEDAAAAAAAAAAAAAA=="), + //fabricator outpost + new Structure(0.02f, Items.tungsten, "BgUADWNhcmJpZGUtZHJpbGwBABJ0aG9yaXVtLXdhbGwtbGFyZ2UCAAx0aG9yaXVtLXdhbGwEAANkdW8AAANhaXIDAA5mYWJyaWNhdG9yLXBhZAkJAAAAAAEDAAACAwEDAAAAAAAAAAACAwADAAMCAwADAAMCAgAAAQMAAAMCAAACAAMCAAABAwAAAAAAAAAAAAAEAgAAAAAAAgAAAgMCAAIBBAIFAAQCAgMCAgIDAQMAAAMCAAAEAgMCAAABAwAAAAAAAAAAAAACAQAAAAAAAgAAAAACAAEDAAECAQEDAAECAQAAAAAAAAAAAAACAwACAAAAAAAA"), + //coal storage new Structure(0.02f, Items.coal, vaults), }; + + bases = new Structure[]{ + //primitive 4-spawner base + new Structure("CAQADXR1bmdzdGVuLXdhbGwFAANkdW8HAARjb3JlAQAKZGFnZ2VyLXBhZAYACHVubG9hZGVyAgAMcmVwYWlyLXBvaW50AAADYWlyAwALc29sYXItcGFuZWwJBwAAAQMAAAIDAQMAAAAAAAAAAAAAAwIAAAAAAAAEAAQBBAEEAQQBBAEEAgQABQIAAAAAAAAFAgQCBAAGAwAABwAAAAYDBAAEAAUCAAAAAAAABQIEAAQABAMEAwQDBAMEAAQAAAABAwAAAwIBAwAAAAAAAAAAAAACAwAAAAAAAA=="), + + //more advanced base, 8 spawners + new Structure("CQIADXR1bmdzdGVuLXdhbGwGAANkdW8IAARjb3JlAQAKZGFnZ2VyLXBhZAcACHVubG9hZGVyBAATdHVuZ3N0ZW4td2FsbC1sYXJnZQUADHJlcGFpci1wb2ludAAAA2FpcgMAC3NvbGFyLXBhbmVsCwsAAAAAAQEAAAAAAAAAAAEBAAAAAAAAAAAAAAAAAAACAwMAAgMAAAAAAAAAAAEBAAAEAAAAAgMFAAIDBAAAAAEBAAAAAAAAAAAAAAYABwIGAAAAAAAAAAAAAAACAAIABgAAAAAAAAAGAAICAgAAAAAAAwAFAAcCAAAIAAAABwIFAAMAAAAAAAIAAgAGAAAAAAAAAAYAAgICAAAAAQEAAAQAAAAGAAcCBgAEAAAAAQEAAAAAAAAAAAAAAgEFAAIBAAAAAAAAAAAAAAAAAQEAAAIDAwACAwEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), + + //rather advanced flyer base, no ground units, drones + new Structure("DQIADXR1bmdzdGVuLXdhbGwHAAhjb252ZXlvcgMAA2R1bwwABGNvcmULAAh1bmxvYWRlcgEAE3R1bmdzdGVuLXdhbGwtbGFyZ2UGAA9pbnRlcmNlcHRvci1wYWQFAAhzcGxpdHRlcgoADHJlcGFpci1wb2ludAQABXNhbHZvAAADYWlyCAAJZHJvbmUtcGFkCQALc29sYXItcGFuZWwREQAAAAAAAAAAAAAAAAEAAAACAgEAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAgAAAAAAAwAAAAAAAgABAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAADAAUAAwAEAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAAAAAAAAgMHAgIDAAAAAAYAAAABAAAAAAAAAAAAAAAAAAAAAgMHAgcDBQEHAQcCAgMAAAAAAAAAAAAAAAACAAQAAAACAwgAAAAJAAcCCQAIAAAAAgMEAAAAAgAAAAEAAAAAAAAABwMAAAAACgMLAgoDAAAAAAcBAAAAAAEAAAAAAAAAAwACAwcCCQAKAwAAAAAAAAoDCQAHAgIDAwAAAAAAAgADAAUABwMFAAcDCwIAAAwAAAALAwcBBQIHAQUAAwACAAEAAAADAAIDBwAJAAoDAAAAAAAACgMJAAcAAgMDAAEAAAAAAAAABAAAAAcDCAAAAAoDCwMKAwgAAAAHAQQAAAAAAAAAAAACAAAAAAACAwAAAAAJAAcACQAAAAAAAgMAAAAAAgAAAAAAAQAAAAYAAAACAwcABwMFAgcBBwACAwYAAAABAAAAAAAAAAAAAAAAAAAABAAAAAIDBwACAwQAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAADAAUDAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAAADAAEAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAA"), + + //advanced carbide base with fabricators, drones + new Structure("Ew4ADXR1bmdzdGVuLXdhbGwHABFzb2xhci1wYW5lbC1sYXJnZRAACGNvbnZleW9yDAADZHVvEgAEY29yZQMACmRhZ2dlci1wYWQRAAh1bmxvYWRlcgkAD2ludGVyY2VwdG9yLXBhZA8ACHNwbGl0dGVyBgAGbGFuY2VyDQARdGl0YW5pdW0tY29udmV5b3IBABJjYXJiaWRlLXdhbGwtbGFyZ2ULAAxyZXBhaXItcG9pbnQIAAVzYWx2bwAAA2FpcgUACXRpdGFuLXBhZAoAC3NvbGFyLXBhbmVsAgAMY2FyYmlkZS13YWxsBAAOZmFicmljYXRvci1wYWQTFQAAAAAAAAAAAAAAAAAAAQMAAwAAAAAAAAEDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAAAAAAIBAAEAAQAAAAAAAAABAAECAQAAAAACAgAAAAAAAAAAAAAAAAICAwAAAAICBAAAAAAABQAAAAQAAAACAAMAAAACAgAAAAAAAAAAAAAAAAICAAAAAAICAAAAAAAAAAAAAAAAAAACAAAAAAACAgAAAAAAAAAAAAAAAAEAAAABAAAABgAAAAAAAAAAAAYAAAABAAAAAQAAAAAAAAAAAAIAAQIAAAAAAAAAAAAAAAMAAwAABwAAAAAAAAAAAAAAAAAAAAECAAACAAIAAAAAAAEAAAAIAAAACQAAAAAAAAAAAAkAAAAIAAAAAQAAAAAAAAACAAIACAMAAAAAAAAAAAAAAAAAAAoACwAKAAAAAAAAAAAAAAAAAAgDAAACAAIAAAAAAAIADAMMAw0CDgAMAAAAAAAAAAwADgANAgwBDAECAAAAAAACAAIAAgMPAw0DDwAPAw8AEAMRAgAAEgAAABECEAEPAA8DDwANAQ8DAgMCAAIACAMAAAIADAMMAw0ADgAMAAAAAAAAAAwADgANAAwBDAECAAgDAAACAAIAAAAAAAEAAAAIAAAACQAAAAoACwAKAAkAAAAIAAAAAQAAAAAAAAACAAIAAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECAAACAAIAAAIAAAEAAAABAAAABgAAAAAABwAAAAYAAAABAAAAAQAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAwAAAAICBAAAAAAAAAAAAAQAAAACAAMAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAICAAAAAAAABQAAAAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAICAQMAAwAAAAAAAAEDAAMCAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAA=="), + + //lots of titans and daggers + new Structure("DAcACHNwbGl0dGVyBgADZHVvCwAEY29yZQMACmRhZ2dlci1wYWQKAAh1bmxvYWRlcggAEXRpdGFuaXVtLWNvbnZleW9yAgASY2FyYmlkZS13YWxsLWxhcmdlBQAFc2Fsdm8AAANhaXIEAAl0aXRhbi1wYWQBAAxjYXJiaWRlLXdhbGwJAAtkaXN0cmlidXRvchMTAAAAAAECAAAAAAAAAAAAAAECAAABAgAAAAAAAAAAAAABAgAAAAAAAAIDAAAAAAAAAAAAAAAAAQIBAAECAAAAAAAAAAAAAAIDAAAAAAECAAAAAAAAAAAAAAMAAAABAgEAAQIDAAAAAAAAAAAAAAAAAAECAAAAAAAAAAAAAAAAAAMAAAECAQABAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAFAwAABgAHAAYABQMAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAgCAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAwAACQAAAAYDCAIGAwkAAAAFAwAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAABCgMKAAoDAAAAAAAAAAAAAAAAAAAAAAECAQMBAwEDBgABAAYDCgMAAAAAAAAKAwYDAQAGAAEBAQEBAQECAAABAwEDAQMHAAgDCAMKAAAACwAAAAoACAEIAQcAAQEBAQEBAAABAgEDAQMBAwYAAQAGAwoDAAAAAAAACgMGAwEABgABAQEBAQEBAgAAAAADAAAABQMAAAkAAAAKAwoACgMJAAAABQMAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYDCAAGAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAwAAAQMIAAEDBQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAGAAcABgAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAECAQABAAMAAAAAAAAAAAAAAAAAAAABAgIDAAAAAAAAAAAAAAAAAQIBAAEAAAAAAAADAAMAAwIDAAABAgAAAAAAAAAAAAAAAAAAAAABAgEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAECAAAAAAAAAAAAAAECAAABAgAAAAAAAAAAAAABAgAAAAA="), + + //superfortress + new Structure("EwwAEXNvbGFyLXBhbmVsLWxhcmdlDgADZHVvEgAEY29yZQMACmRhZ2dlci1wYWQQAAttb25zb29uLXBhZBEACHVubG9hZGVyCgAPaW50ZXJjZXB0b3ItcGFkCQAGbGFuY2VyDwARdGl0YW5pdW0tY29udmV5b3ICABJjYXJiaWRlLXdhbGwtbGFyZ2UGAA5yZXN1cHBseS1wb2ludAQADHJlcGFpci1wb2ludAsABXNhbHZvAAADYWlyCAAJZHJvbmUtcGFkBwAJdGl0YW4tcGFkBQALc29sYXItcGFuZWwBAAxjYXJiaWRlLXdhbGwNAAtkaXN0cmlidXRvch8fAAAAAAAAAAAAAAAAAAABAwAAAAAAAAAAAAACAgAAAQICAgAAAAAAAAAAAAAAAAECAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEDAAAAAAAAAAAAAAAAAAABAgAAAAAAAAAAAAAAAAAAAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAAAAAAAAAAADAgAABAEFAQYBBQEEAQMCAAAAAAAAAAACAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECAAAAAAAABwIAAAAAAAAIAgAABQEIAgAAAAAAAAAABwIAAAAAAAABAgAAAAAAAAAAAAAAAAAAAAAAAAICAAAJAgAAAAAAAAAACgMAAAAAAAABAAAAAAAKAwAAAAAAAAAACQIAAAICAAAAAAAAAAAAAAAAAAAAAAECAAAAAAAAAAAAAAAAAAAAAAAACwAAAAEACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAECAAAAAAAAAAAAAAICAAAJAgAACQIAAAAADAAAAAsAAAAAAAAAAQAAAAAACwAAAAAADAAAAAkCAAAJAgAAAgIAAAAAAAABAwEDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAOAg0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAAAAA4CAAAAAAsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwIAAAAADAAAAAAADAAAAAAAAAABAQ8CDwIPAgEAAAAAAAAADAAAAAAADAAAAAAABwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBDwIPAg8CAQABAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAgAACgMAAAsAAAALAAAAAQIAAAAAAAAPAg8CDwIAAAAAAAABAQsAAAALAAAACgMAAAMCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgAAEAIAAA8CDwIPAgAAEAIAAAEAAAIAAAAAAAAAAAAAAAAAAAAAAAACAgAABAEIAgAACwEAAA0AAAABAQEBAAAAAAAAEQARABEAAAAAAAAAAQABAA0AAAALAQAACAIAAAQBAgIAAAAAAAAFAQAAAAAAAAAAAAAAAA8DDwMPAw8DEQMAAAAAAAARAw8BDwEPAQ8BAAAAAAAAAAAAAAAABQEAAAAAAQMBAwYBBQEBAQEBAQEOAg4CDwMPAw8DDwMRAAAAEgAAABEADwEPAQ8BDwEOAQ4BAQEBAQEBBQEGAQEBAQECAgAABQEIAgAACwEAAA0AAAAPAw8DDwMPAxEDAAAAAAAAEQMPAQ8BDwEPAQ0AAAALAQAACAIAAAUBAgIAAAAAAAAEAQAAAAAAAAAAAAAAAAECAQIAAAAAAAARAxEAEQMAAAAAAAABAwEDAAAAAAAAAAAAAAAABAEAAAAAAAAAAAMCAAAKAwAACwAAAAsAAAABAgAAEAIAAA8ADwAPAAAAEAIAAAEACwAAAAsAAAAKAwAAAwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECAAAAAAAADwAPAA8AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEPAA8ADwABAwEDAQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwIAAAAADAAAAAAADAAAAAsAAAABAQ8ADwAPAAEDCwAAAAAADAAAAAAADAIAAAAABwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAOAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEDAQMCAgAACQIAAAkCAAAAAAAAAAALAAAAAAAAAA4AAAAAAAsAAAAAAAAAAAAJAgAACQIAAAICAAABAQEBAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAALAQAAAQILAQAAAAAAAAAADAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgICAAAJAgAAAAAAAAAACgMAAAAAAAABAgAAAAAKAwAAAAAAAAAACQIAAAICAAABAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAIAAAECCAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECAgIAAAAABwIAAAMCAAAAAAAABQEAAAAAAwIAAAAABwIAAAICAAABAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBBQEGAQUBBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAgIAAAEAAgIAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAA="), + + //welcome to drone hell + new Structure("CwcAEXNvbGFyLXBhbmVsLWxhcmdlCQAMdGhvcml1bS13YWxsCgAEY29yZQUACmRhZ2dlci1wYWQDAAZsYW5jZXIBABJjYXJiaWRlLXdhbGwtbGFyZ2UGAAxyZXBhaXItcG9pbnQAAANhaXIIAAlkcm9uZS1wYWQEAAtzb2xhci1wYW5lbAIADGNhcmJpZGUtd2FsbBERAQMAAAEAAAACAwIDAAAAAAICAAAAAAIBAgEBAwAAAQMAAAAAAAAAAAAAAwAAAAAAAAACAgADAAMDAAAAAAAAAAAAAAABAAAABAEEAwAAAAAFAwAABgEFAwAAAAAAAAQBBAEBAwAAAAAAAAQDAAAAAAAAAAAAAAQCAAAAAAAAAAAAAAQBAAAAAAIAAwAAAAAABwMAAAgBAAAJAAgBAAAAAAcDAAADAAAAAgACAAAAAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAAAAAAAAIAAAAAAAUDAAAIAQAACQMJAwkDCQMJAwgBAAAFAwAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAACQIAAAAAAAAAAAAAAAACAwIDBgEEAgkBCQEJAAAACgAAAAkCCQEJAQQCBgECAQIBAAAAAAUDAAAIAQAACQAAAAAAAAAJAggBAAAFAwAAAAAAAAAAAAAAAAAAAAEAAAkACQEJAQkBCQEAAAAAAAAAAAAAAAACAAMAAAAAAAAAAAAIAQAACQIIAQAAAAAAAAAAAwAAAAIAAgAAAAAAAAAHAwAAAAAAAAkCAAAAAAAABwMAAAAAAAACAAEDAAAEAAAAAAAAAAUDAAAEAgUDAAAAAAAAAAAEAAEDAAAAAAAABAAEAAMAAAAAAAAABgEAAAAAAwAAAAQABAAAAAAAAQMAAAEDAAAAAAAAAAAAAAIAAAAAAAAAAAABAwAAAQMAAAAAAAAAAAAAAgMCAwAAAAACAAAAAAACAQIBAAAAAAAAAAA="), + + //welcome to bomber/interceptor hell + new Structure("DgUACHNwbGl0dGVyBgAEaGFpbAIAEnRob3JpdW0td2FsbC1sYXJnZQEADHRob3JpdW0td2FsbAQAA2R1bw0ABGNvcmULAAttb25zb29uLXBhZAwACHVubG9hZGVyCgAPaW50ZXJjZXB0b3ItcGFkCAARdGl0YW5pdW0tY29udmV5b3IDAAVzYWx2bwkABnJpcHBsZQAAA2FpcgcAC2Rpc3RyaWJ1dG9yGRkAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAgIAAAEAAgMAAAIDAAACAwAAAwIAAAQBAwIAAAIDAAACAwAAAgMAAAEAAgIAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAEBAQEAAAAAAAAGAQYBAwIAAAcAAAAIAgcAAAADAgAABgEGAQAAAAAAAAEBAQEAAAAAAgIAAAAACQEAAAoCAAAAAAAAAAAAAAgCAAAAAAAAAAAKAgAAAAAJAQAAAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgCCAIIAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAAAGAAoCAAAKAwAAAAALAwAACAIIAggCAAALAwAACgMAAAoCAAAGAAICAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAIAggCCAIAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAACAgAAAwIAAAAAAAAAAAAAAAAAAAgCCAIIAgAAAAAAAAAAAAAAAAMCAAACAgAAAAABAAAAAAAAAAAAAAALAwAAAAALAwAACAIIAggCAAALAwAAAAALAwAAAAAAAAAAAAABAAEAAwIAAAcAAAAAAAAAAAAAAAAAAAAMAwwBDAIAAAAAAAAAAAAAAAAHBQAAAwIAAAEAAQAAAAAAAAAAAAgDCAMIAwgDCAMMAQAAAAAAAAwCCAEIAQgBCAEIAQAAAAAAAAAAAQABAAQBBQAIAwgDCAMIAwgDCAMIAwwDAAANAAAADAMIAQgBCAEIAQgBCAEIAQUABAEBAAEAAwIAAAcAAAAIAwgDCAMIAwgDDAIAAAAAAAAMAwgBCAEIAQgBCAEHAAAAAwIAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAwCDAMMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAIAAAADAgAAAAALAwAAAAALAwAACAAIAAgAAAALAwAAAAALAwAAAwIAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAgACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAKAgAACgMAAAAAAAAAAAgACAAIAAAAAAAAAAoDAAAKAgAABgACAAAAAAAAAAAAAAEGAAAAAAAAAAAAAAALAwAACAAIAAgAAAALAwAAAAAAAAAAAAAGAAAAAAAAAAAAAgAAAAAAAAAAAAoCAAAAAAAAAAAIAAgACAAAAAAAAAAKAgAAAAAAAAAAAgAAAAAAAAAAAAAAAAAJAQAAAAAAAAMCAAAHBQAACAAHAAAAAwIAAAAAAAAAAAkBAAAAAAAAAAAAAAEBAQEAAAAAAAAGAQYBAAAAAAAAAAAIAAAAAAAAAAAABgMGAwAAAAAAAAEBAQEAAAAAAgMAAAEAAgMAAwIDAAACAwAAAwIAAAUAAwIAAAIBAAACAQAAAgEAAAEDAgMAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABAEAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAA=="), + + //welcome to unit hell + new Structure("DQoACHNwbGl0dGVyBAAMdGhvcml1bS13YWxsDAAEY29yZQEACmRhZ2dlci1wYWQHAAttb25zb29uLXBhZAsACHVubG9hZGVyCAAPaW50ZXJjZXB0b3ItcGFkBQARdGl0YW5pdW0tY29udmV5b3IJAAxyZXBhaXItcG9pbnQDAAVzYWx2bwAAA2FpcgIACXRpdGFuLXBhZAYAC3NvbGFyLXBhbmVsFRUAAAAAAAAAAAAAAAABAQAAAQEAAAAAAQEAAAEBAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAIBAAAAAAAAAAAAAAAAAAADAQAABAAEAAAABAAEAAMBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQMGAAAABgAFAQAAAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAcDAAAIAwAABQIJAAAACQAFAggDAAAAAAcDAAAAAAIBAAAAAAAAAAAAAAAAAAAAAAAABQIKAAACCgAFAgAAAAAAAAAAAAAAAAAAAAABAQAAAwEAAAgDAAAAAAAAAAAFAgACBQIAAAAAAAAIAwAAAwEAAAEBAAAAAAAAAAAAAAAAAAAAAAcDAAAFAgACBQIAAAcDAAAAAAAAAAAAAAAAAAABAQAABAMFAgUDBQMAAAAAAAALAQACCwEAAAAAAAAFAQUBBQIEAQEBAAAAAAAABAMGAAkACgAFAwUDCwIAAAAAAAALAQUBBQEKAAkABgAEAQAAAAAAAAAAAAAAAAAAAAMAAwADAAIAAAwAAAAAAgABAAEAAQAAAAAAAAAAAAABAQAABAMGAAkACgAFAwUDCwAAAAAAAAALAgUBBQEKAAkABgAEAQEBAAAAAAAABAMFAAUDBQMAAAAAAAALAQABCwAAAAAAAAAFAQUBBQAEAQAAAAABAQAAAwEAAAgDAAAAAAcDAAAFAAAABQAAAAcDAAAIAwAAAwEAAAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAwAABQAKAAAACgAFAAgDAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAcDAAAAAAAABQAJAAAACQAFAAAAAAAAAAcDAAAAAAIBAAAAAAAAAAAAAAAAAAADAQAABQMGAAAABgAFAQMBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAIBAAEBAQAAAQEAAAAAAQEAAAEBAAAAAAIBAAAAAAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=") + }; } public void generate(Generation gen, Team team, int coreX, int coreY, int enemyX, int enemyY){ @@ -78,18 +122,31 @@ public class FortressGenerator{ void genOutposts(){ int padding = 10; - int maxDifficulty = 10; - float baseChance = 0.75f; + int maxDifficulty = 13; + float baseChance = 0.4f; Array selected = new Array<>(); Array used = new Array<>(); Rectangle rect = new Rectangle(); + Structure base = bases[Mathf.clamp((int)(bases.length * (float)gen.sector.difficulty / maxDifficulty) + gen.random.range(2), 0, bases.length-1)]; int maxIndex = (int)(1 + ((float)gen.sector.difficulty / maxDifficulty * (structures.length-2))); - for(int i = maxIndex/3; i < maxIndex; i++){ + for(int i = maxIndex/2; i < maxIndex; i++){ selected.add(structures[i]); } + used.add(new Rectangle(enemyX - base.width()/2, enemyY - base.height()/2, base.width(), base.height())); + int elev = gen.tiles[enemyX][enemyY].getElevation(); + for(int x = 0; x < base.width(); x++){ + for(int y = 0; y < base.height(); y++){ + Tile tile = gen.tiles[enemyX - base.width()/2 + x][enemyY - base.height()/2 + y]; + StructBlock block = base.layout[x][y]; + tile.setElevation(elev); + tile.setRotation(block.rotation); + tile.setBlock(block.block, team); + } + } + for(Structure struct : selected){ for(int x = padding; x < gen.width - padding; x++){ loop: @@ -115,9 +172,7 @@ public class FortressGenerator{ tile.setRotation(block.rotation); tile.setBlock(block.block, team); - if(block.block instanceof Turret){ - fillTurret(tile); - } + fill(tile); } } } @@ -127,14 +182,17 @@ public class FortressGenerator{ } } - void fillTurret(Tile tile){ + void fill(Tile tile){ Block block = tile.block(); + if(block instanceof PowerTurret){ tile.entity.power.amount = block.powerCapacity; }else if(block instanceof ItemTurret){ ItemTurret turret = (ItemTurret)block; AmmoType[] type = turret.getAmmoTypes(); block.handleStack(type[0].item, block.acceptStack(type[0].item, 1000, tile, null), tile, null); + }else if(block instanceof ResupplyPoint){ + tile.entity.items.add(Items.lead, tile.block().itemCapacity); } } @@ -148,5 +206,19 @@ public class FortressGenerator{ this.layout = StructureFormat.read(encoding); this.chance = chance; } + + public Structure(String encoding){ + this.ore = null; + this.layout = StructureFormat.read(encoding); + this.chance = 0; + } + + int width(){ + return layout.length; + } + + int height(){ + return layout[0].length; + } } } diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index fac76176f5..c54b72432e 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -248,10 +248,12 @@ public class WorldGenerator{ int lerpDst = 20; lerpDst *= lerpDst; + float minDst = Float.MAX_VALUE; if(detailed && spawnpoints != null){ for(GridPoint2 p : spawnpoints){ float dst = Vector2.dst2(p.x, p.y, localX, localY); + minDst = Math.min(minDst, dst); if(dst < lerpDst){ float targetElevation = Math.max(0.86f, (float)elevationOf(sectorX * sectorSize + p.x + Short.MAX_VALUE, sectorY * sectorSize + p.y + Short.MAX_VALUE, true)); @@ -273,7 +275,7 @@ public class WorldGenerator{ }else if(temp + ridge/2f < 0.8 || elevation < 1.3){ floor = Blocks.blackstone; - if(iceridge > 0.25){ + if(iceridge > 0.25 && minDst > lerpDst/1.5f){ elevation ++; } }else{ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index ee3857e25f..5b8b8f4825 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -88,6 +88,11 @@ public abstract class Turret extends Block{ turretIcon = true; } + @Override + public boolean outputsItems(){ + return false; + } + @Override public void init(){ super.init(); diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java index 994d819977..36b249ff71 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java @@ -26,6 +26,7 @@ public class SortedUnloader extends Unloader implements SelectionTrait{ @Remote(targets = Loc.both, called = Loc.both, forward = true) public static void setSortedUnloaderItem(Player player, Tile tile, Item item){ SortedUnloaderEntity entity = tile.entity(); + entity.items.clear(); entity.sortItem = item; } @@ -35,7 +36,7 @@ public class SortedUnloader extends Unloader implements SelectionTrait{ if(entity.items.total() == 0 && entity.timer.get(timerUnload, speed)){ tile.allNearby(other -> { - if(other.block() instanceof StorageBlock && entity.items.total() == 0 && + if(other.getTeam() == tile.getTeam() && other.block() instanceof StorageBlock && entity.items.total() == 0 && ((entity.sortItem == null && other.entity.items.total() > 0) || ((StorageBlock) other.block()).hasItem(other, entity.sortItem))){ offloadNear(tile, ((StorageBlock) other.block()).removeItem(other, entity.sortItem)); } diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java index 6e7d32403c..ab7c951836 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java @@ -22,7 +22,7 @@ public class Unloader extends Block{ public void update(Tile tile){ if(tile.entity.items.total() == 0 && tile.entity.timer.get(timerUnload, speed)){ tile.allNearby(other -> { - if(other.block() instanceof StorageBlock && tile.entity.items.total() == 0 && + if(other.getTeam() == tile.getTeam() && other.block() instanceof StorageBlock && tile.entity.items.total() == 0 && ((StorageBlock) other.block()).hasItem(other, null)){ offloadNear(tile, ((StorageBlock) other.block()).removeItem(other, null)); } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java index 2a6cf6eceb..71a8852cbc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java @@ -9,6 +9,7 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.UnitType; +import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; @@ -39,7 +40,6 @@ public class UnitPad extends Block{ protected float produceTime = 1000f; protected float openDuration = 50f; protected float launchVelocity = 0f; - protected String unitRegion; public UnitPad(String name){ super(name); @@ -109,7 +109,7 @@ public class UnitPad extends Block{ @Override public void draw(Tile tile){ UnitFactoryEntity entity = tile.entity(); - TextureRegion region = Draw.region(unitRegion == null ? type.name : unitRegion); + TextureRegion region = type.iconRegion; Draw.rect(name(), tile.drawx(), tile.drawy()); @@ -135,7 +135,7 @@ public class UnitPad extends Block{ Draw.reset(); - Draw.rect(name + (entity.open ? "-top-open" : "-top"), tile.drawx(), tile.drawy()); + Draw.rect(name + (entity.open || entity.hasSpawned ? "-top-open" : "-top"), tile.drawx(), tile.drawy()); } @Override @@ -157,21 +157,22 @@ public class UnitPad extends Block{ } } - /* - if(!entity.hasSpawned){ - for(BaseUnit unit : unitGroups[tile.getTeamID()].all()){ - if(unit.getType() == type && unit.getSpawner() == null){ - entity.hasSpawned = true; - unit.setSpawner(tile); - break; - } + boolean isEnemy = tile.getTeam() == Team.red; + + if(!isEnemy){ + //player-made spawners have default behavior + + if(!entity.hasSpawned && hasRequirements(entity.items, entity.buildTime / produceTime) && + entity.cons.valid() && !entity.open){ + + entity.buildTime += Timers.delta(); + entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f); + }else{ + if(!entity.open) entity.speedScl = Mathf.lerpDelta(entity.speedScl, 0f, 0.05f); } - }*/ - - if(!entity.hasSpawned && hasRequirements(entity.items, entity.buildTime / produceTime) && - entity.cons.valid() && !entity.open){ - - entity.buildTime += Timers.delta(); + }else if(!entity.hasSpawned){ + //otherwise, it's an enemy, cheat by not requiring resources + entity.buildTime += Timers.delta() / 4f; entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f); }else{ if(!entity.open) entity.speedScl = Mathf.lerpDelta(entity.speedScl, 0f, 0.05f); diff --git a/core/src/io/anuke/mindustry/world/modules/InventoryModule.java b/core/src/io/anuke/mindustry/world/modules/InventoryModule.java index 85a349f334..40e8873fcc 100644 --- a/core/src/io/anuke/mindustry/world/modules/InventoryModule.java +++ b/core/src/io/anuke/mindustry/world/modules/InventoryModule.java @@ -92,6 +92,8 @@ public class InventoryModule extends BlockModule{ } public void remove(Item item, int amount){ + amount = Math.min(amount, items[item.id]); + items[item.id] -= amount; total -= amount; }