diff --git a/core/assets-raw/sprites/blocks/drills/tungsten-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png similarity index 100% rename from core/assets-raw/sprites/blocks/drills/tungsten-drill-rotator.png rename to core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png diff --git a/core/assets-raw/sprites/blocks/drills/tungsten-drill-top.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/drills/tungsten-drill-top.png rename to core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png diff --git a/core/assets-raw/sprites/blocks/drills/tungsten-drill.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill.png similarity index 100% rename from core/assets-raw/sprites/blocks/drills/tungsten-drill.png rename to core/assets-raw/sprites/blocks/drills/mechanical-drill.png diff --git a/core/assets-raw/sprites/blocks/drills/carbide-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png similarity index 100% rename from core/assets-raw/sprites/blocks/drills/carbide-drill-rotator.png rename to core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png diff --git a/core/assets-raw/sprites/blocks/drills/carbide-drill-top.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/drills/carbide-drill-top.png rename to core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png diff --git a/core/assets-raw/sprites/blocks/drills/carbide-drill.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png similarity index 100% rename from core/assets-raw/sprites/blocks/drills/carbide-drill.png rename to core/assets-raw/sprites/blocks/drills/pneumatic-drill.png diff --git a/core/assets-raw/sprites/blocks/environment/copper1.png b/core/assets-raw/sprites/blocks/environment/copper1.png new file mode 100644 index 0000000000..0f49ead3db Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper2.png b/core/assets-raw/sprites/blocks/environment/copper2.png new file mode 100644 index 0000000000..092b81ebf1 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper3.png b/core/assets-raw/sprites/blocks/environment/copper3.png new file mode 100644 index 0000000000..f7cb6856f4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/tungsten1.png b/core/assets-raw/sprites/blocks/environment/tungsten1.png deleted file mode 100644 index e831275a95..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/tungsten1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/tungsten2.png b/core/assets-raw/sprites/blocks/environment/tungsten2.png deleted file mode 100644 index fb85738120..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/tungsten2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/tungsten3.png b/core/assets-raw/sprites/blocks/environment/tungsten3.png deleted file mode 100644 index 6c7b42a5b0..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/tungsten3.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png b/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png deleted file mode 100644 index 0bfb7563ce..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall.png b/core/assets-raw/sprites/blocks/walls/carbide-wall.png deleted file mode 100644 index ba7cabf436..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/carbide-wall.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall-large.png b/core/assets-raw/sprites/blocks/walls/composite-wall-large.png new file mode 100644 index 0000000000..9241ddaddd Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/composite-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall.png b/core/assets-raw/sprites/blocks/walls/composite-wall.png new file mode 100644 index 0000000000..9ecc08a3af Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/composite-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/copper-wall-large.png b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png new file mode 100644 index 0000000000..615235ae16 Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/copper-wall.png b/core/assets-raw/sprites/blocks/walls/copper-wall.png new file mode 100644 index 0000000000..333bb079e0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/copper-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door-large-open.png b/core/assets-raw/sprites/blocks/walls/door-large-open.png index d4f26329ec..2d9948806e 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door-large-open.png and b/core/assets-raw/sprites/blocks/walls/door-large-open.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door-large.png b/core/assets-raw/sprites/blocks/walls/door-large.png index d0a93cccbe..2109621448 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door-large.png and b/core/assets-raw/sprites/blocks/walls/door-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door-open.png b/core/assets-raw/sprites/blocks/walls/door-open.png index 0112c2cf03..e2d708c90f 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door-open.png and b/core/assets-raw/sprites/blocks/walls/door-open.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door.png b/core/assets-raw/sprites/blocks/walls/door.png index 84266f37da..4eeb67fe83 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door.png and b/core/assets-raw/sprites/blocks/walls/door.png differ diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png index ab909004d6..d80cf71f95 100644 Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall.png b/core/assets-raw/sprites/blocks/walls/thorium-wall.png index 4a4e8d83c1..23aca28884 100644 Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png deleted file mode 100644 index 28f37e4207..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/tungsten-wall.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall.png deleted file mode 100644 index 9d0971a89a..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/tungsten-wall.png and /dev/null differ diff --git a/core/assets-raw/sprites/items/item-carbide.png b/core/assets-raw/sprites/items/item-carbide.png deleted file mode 100644 index 44e95c280e..0000000000 Binary files a/core/assets-raw/sprites/items/item-carbide.png and /dev/null differ diff --git a/core/assets-raw/sprites/items/item-coal.png b/core/assets-raw/sprites/items/item-coal.png index 1da1774788..9d7bcb9a1a 100644 Binary files a/core/assets-raw/sprites/items/item-coal.png and b/core/assets-raw/sprites/items/item-coal.png differ diff --git a/core/assets-raw/sprites/items/item-copper.png b/core/assets-raw/sprites/items/item-copper.png new file mode 100644 index 0000000000..35faf93054 Binary files /dev/null and b/core/assets-raw/sprites/items/item-copper.png differ diff --git a/core/assets-raw/sprites/items/item-dense-alloy.png b/core/assets-raw/sprites/items/item-dense-alloy.png new file mode 100644 index 0000000000..11fab630b6 Binary files /dev/null and b/core/assets-raw/sprites/items/item-dense-alloy.png differ diff --git a/core/assets-raw/sprites/items/item-lead.png b/core/assets-raw/sprites/items/item-lead.png index e0bb050697..cee38cfdc2 100644 Binary files a/core/assets-raw/sprites/items/item-lead.png and b/core/assets-raw/sprites/items/item-lead.png differ diff --git a/core/assets-raw/sprites/items/item-surge-alloy.png b/core/assets-raw/sprites/items/item-surge-alloy.png index db7d97a9e7..85b131de76 100644 Binary files a/core/assets-raw/sprites/items/item-surge-alloy.png and b/core/assets-raw/sprites/items/item-surge-alloy.png differ diff --git a/core/assets-raw/sprites/items/item-thorium.png b/core/assets-raw/sprites/items/item-thorium.png index 3f4bc57bfe..4a5d0aa776 100644 Binary files a/core/assets-raw/sprites/items/item-thorium.png and b/core/assets-raw/sprites/items/item-thorium.png differ diff --git a/core/assets-raw/sprites/items/item-tungsten.png b/core/assets-raw/sprites/items/item-tungsten.png deleted file mode 100644 index f6af84f404..0000000000 Binary files a/core/assets-raw/sprites/items/item-tungsten.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 6f31aaff97..98faed9978 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -167,133 +167,133 @@ conveyor-4-3 index: -1 titanium-conveyor-0-1 rotate: false - xy: 943, 283 + xy: 943, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 943, 273 + xy: 953, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 953, 283 + xy: 963, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 943, 263 + xy: 943, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 953, 273 + xy: 953, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 963, 283 + xy: 963, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 943, 253 + xy: 973, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 953, 263 + xy: 943, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 963, 273 + xy: 953, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 973, 283 + xy: 963, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 943, 243 + xy: 973, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 953, 253 + xy: 983, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 963, 263 + xy: 943, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 973, 273 + xy: 953, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 983, 283 + xy: 963, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 943, 233 + xy: 973, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 953, 243 + xy: 983, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 963, 253 + xy: 943, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 973, 263 + xy: 953, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,21 +307,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 933, 277 + xy: 903, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 883, 217 + xy: 913, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 893, 227 + xy: 923, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -361,51 +361,44 @@ blast-drill-top orig: 24, 24 offset: 0, 0 index: -1 -carbide-drill - rotate: false - xy: 863, 321 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -carbide-drill-rotator - rotate: false - xy: 881, 321 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -carbide-drill-top - rotate: false - xy: 899, 321 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 laser-drill rotate: false - xy: 357, 117 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 375, 117 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -tungsten-drill-rotator +mechanical-drill-rotator rotate: false - xy: 375, 117 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 393, 117 + xy: 339, 117 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +mechanical-drill + rotate: false + xy: 357, 117 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +mechanical-drill-top + rotate: false + xy: 375, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -466,16 +459,23 @@ plasma-drill-top orig: 32, 32 offset: 0, 0 index: -1 -tungsten-drill +pneumatic-drill rotate: false - xy: 319, 99 + xy: 175, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -tungsten-drill-top +pneumatic-drill-rotator rotate: false - xy: 301, 81 + xy: 193, 99 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +pneumatic-drill-top + rotate: false + xy: 175, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -585,16 +585,37 @@ coal3 orig: 8, 8 offset: 0, 0 index: -1 +copper1 + rotate: false + xy: 853, 226 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +copper2 + rotate: false + xy: 863, 231 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +copper3 + rotate: false + xy: 853, 216 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 dirt2 rotate: false - xy: 863, 211 + xy: 853, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 853, 196 + xy: 863, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -608,98 +629,98 @@ dirtedge index: -1 generic-cliff-edge rotate: false - xy: 873, 251 + xy: 873, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 873, 251 + xy: 873, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 873, 241 + xy: 873, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 873, 241 + xy: 873, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 873, 231 + xy: 873, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 873, 231 + xy: 873, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 873, 221 + xy: 873, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 873, 221 + xy: 873, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 873, 191 + xy: 423, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 873, 181 + xy: 177, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 413, 7 + xy: 187, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 423, 7 + xy: 197, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 873, 211 + xy: 873, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 873, 201 + xy: 413, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -713,14 +734,14 @@ grassedge index: -1 ice2 rotate: false - xy: 187, 9 + xy: 217, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 197, 9 + xy: 227, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -734,35 +755,35 @@ iceedge index: -1 icerock2 rotate: false - xy: 207, 9 + xy: 237, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 217, 9 + xy: 247, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 217, 9 + xy: 247, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 227, 9 + xy: 257, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 227, 9 + xy: 257, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,56 +797,56 @@ lavaedge index: -1 lead1 rotate: false - xy: 459, 114 + xy: 469, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 449, 104 + xy: 469, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 459, 104 + xy: 427, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 438, 84 + xy: 448, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 428, 64 + xy: 438, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 438, 74 + xy: 448, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 448, 84 + xy: 458, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 438, 64 + xy: 448, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -846,21 +867,21 @@ oiledge index: -1 rock2 rotate: false - xy: 913, 227 + xy: 883, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 933, 247 + xy: 903, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 883, 187 + xy: 913, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -874,21 +895,21 @@ sandedge index: -1 shrubshadow rotate: false - xy: 923, 217 + xy: 913, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 933, 227 + xy: 923, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 903, 187 + xy: 933, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,42 +930,42 @@ spaceedge index: -1 stone-cliff-edge rotate: false - xy: 903, 177 + xy: 933, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 913, 177 + xy: 882, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 923, 177 + xy: 892, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 933, 177 + xy: 902, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 883, 177 + xy: 913, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 893, 177 + xy: 923, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -958,63 +979,42 @@ stoneedge index: -1 thorium1 rotate: false - xy: 882, 167 + xy: 912, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 892, 167 + xy: 922, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 902, 167 + xy: 932, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 912, 167 + xy: 943, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 922, 167 + xy: 943, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 932, 167 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -tungsten1 - rotate: false - xy: 943, 223 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -tungsten2 - rotate: false - xy: 953, 233 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -tungsten3 - rotate: false - xy: 963, 243 + xy: 953, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1112,14 +1112,14 @@ conduit-liquid index: -1 cross-1 rotate: false - xy: 853, 226 + xy: 863, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 949, 353 + xy: 899, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 873, 261 + xy: 873, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,14 +1154,14 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 903, 237 + xy: 933, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 913, 247 + xy: 883, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1175,28 +1175,28 @@ ripples index: -1 rubble-1-0 rotate: false - xy: 211, 99 + xy: 229, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 193, 81 + xy: 211, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 229, 99 + xy: 247, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 211, 81 + xy: 229, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1420,28 +1420,28 @@ conduit-top-6 index: -1 liquid-router rotate: false - xy: 457, 94 + xy: 428, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 467, 94 + xy: 438, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 428, 84 + xy: 428, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 428, 74 + xy: 438, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1469,70 +1469,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 903, 247 + xy: 933, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 913, 257 + xy: 883, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 923, 267 + xy: 893, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 923, 257 + xy: 893, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 933, 267 + xy: 903, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 883, 207 + xy: 913, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 893, 217 + xy: 923, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 903, 227 + xy: 933, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 913, 237 + xy: 883, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 923, 247 + xy: 893, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,7 +1637,7 @@ nuclear-reactor-lights index: -1 rtg-generator-top rotate: false - xy: 923, 237 + xy: 893, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1763,119 +1763,119 @@ block-icon-blast-mixer index: -1 centrifuge-liquid rotate: false - xy: 919, 339 + xy: 863, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 967, 353 + xy: 919, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 985, 353 + xy: 917, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 687, 249 + xy: 949, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 687, 231 + xy: 967, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 687, 213 + xy: 985, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 705, 249 + xy: 687, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 439, 104 + xy: 459, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 435, 54 + xy: 435, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 795, 188 + xy: 393, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 466, 184 + xy: 795, 188 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 463, 166 + xy: 466, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 175, 99 + xy: 463, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 193, 99 + xy: 211, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 933, 257 + xy: 903, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 883, 197 + xy: 913, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 903, 197 + xy: 933, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1896,7 +1896,7 @@ core-top index: -1 sortedunloader rotate: false - xy: 923, 197 + xy: 933, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1980,7 +1980,7 @@ cyclone index: -1 duo rotate: false - xy: 873, 271 + xy: 873, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,14 +2001,14 @@ spectre index: -1 hail rotate: false - xy: 177, 9 + xy: 207, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scatter rotate: false - xy: 177, 9 + xy: 207, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2022,14 +2022,14 @@ hail-heat index: -1 lancer rotate: false - xy: 321, 117 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 339, 117 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2057,49 +2057,49 @@ ripple-heat index: -1 salvo rotate: false - xy: 247, 99 + xy: 265, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 229, 81 + xy: 247, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 265, 99 + xy: 283, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 247, 81 + xy: 265, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scorch rotate: false - xy: 933, 237 + xy: 913, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 893, 187 + xy: 923, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 swarmer rotate: false - xy: 283, 99 + xy: 301, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2120,56 +2120,56 @@ wave-liquid index: -1 dagger-pad-top rotate: false - xy: 705, 231 + xy: 687, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top-open rotate: false - xy: 705, 213 + xy: 687, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top rotate: false - xy: 723, 218 + xy: 723, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top-open rotate: false - xy: 741, 236 + xy: 723, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top rotate: false - xy: 759, 254 + xy: 741, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top-open rotate: false - xy: 741, 218 + xy: 723, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top rotate: false - xy: 267, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top-open rotate: false - xy: 285, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2183,21 +2183,21 @@ mech-factory index: -1 dart-ship-factory-open rotate: false - xy: 723, 254 + xy: 705, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory-open rotate: false - xy: 723, 236 + xy: 705, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory-open rotate: false - xy: 303, 117 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2239,21 +2239,21 @@ titan-pad-top-open index: -1 reconstructor-open rotate: false - xy: 175, 81 + xy: 193, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 893, 207 + xy: 923, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 903, 217 + xy: 933, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2274,14 +2274,14 @@ titan-pad index: -1 door-large-open rotate: false - xy: 741, 254 + xy: 705, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 873, 281 + xy: 873, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2470,7 +2470,7 @@ shell-back index: -1 shot rotate: false - xy: 913, 207 + xy: 903, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,7 +2484,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 983, 273 + xy: 963, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2573,79 +2573,72 @@ bridge-conveyor orig: 8, 8 offset: 0, 0 index: -1 -block-icon-carbide-drill +block-icon-centrifuge rotate: false xy: 775, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-icon-carbide-wall - rotate: false - xy: 481, 174 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -carbide-wall - rotate: false - xy: 481, 174 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-carbide-wall-large - rotate: false - xy: 793, 278 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -carbide-wall-large - rotate: false - xy: 793, 278 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-centrifuge - rotate: false - xy: 427, 160 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 centrifuge rotate: false - xy: 427, 160 + xy: 775, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 491, 175 + xy: 481, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 491, 175 + xy: 481, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 445, 160 + xy: 793, 278 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 445, 160 + xy: 793, 278 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-composite-wall + rotate: false + xy: 491, 175 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +composite-wall + rotate: false + xy: 491, 175 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-composite-wall-large + rotate: false + xy: 427, 160 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +composite-wall-large + rotate: false + xy: 427, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2671,6 +2664,34 @@ conveyor-0-0 orig: 8, 8 offset: 0, 0 index: -1 +block-icon-copper-wall + rotate: false + xy: 521, 175 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +copper-wall + rotate: false + xy: 521, 175 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-copper-wall-large + rotate: false + xy: 445, 160 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +copper-wall-large + rotate: false + xy: 445, 160 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-core rotate: false xy: 203, 135 @@ -2729,42 +2750,42 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 521, 175 + xy: 531, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 521, 175 + xy: 531, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 531, 175 + xy: 481, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 531, 175 + xy: 481, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 531, 175 + xy: 481, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 531, 175 + xy: 481, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2813,14 +2834,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 481, 164 + xy: 491, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 481, 164 + xy: 491, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2841,14 +2862,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 491, 165 + xy: 501, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 491, 165 + xy: 501, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2876,21 +2897,21 @@ block-icon-drone-pad index: -1 block-icon-drop-point rotate: false - xy: 501, 165 + xy: 511, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 501, 165 + xy: 511, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 511, 165 + xy: 521, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2918,63 +2939,63 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 521, 165 + xy: 531, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 521, 165 + xy: 531, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 531, 165 + xy: 682, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 682, 184 + xy: 692, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 682, 184 + xy: 692, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 692, 185 + xy: 702, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 692, 185 + xy: 702, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 702, 185 + xy: 712, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 702, 185 + xy: 712, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2988,28 +3009,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 712, 185 + xy: 541, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 712, 185 + xy: 541, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 541, 175 + xy: 541, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 541, 175 + xy: 541, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3030,14 +3051,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 541, 165 + xy: 551, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 541, 165 + xy: 551, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3058,35 +3079,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 551, 172 + xy: 561, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 551, 172 + xy: 561, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 561, 172 + xy: 551, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 561, 172 + xy: 551, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 551, 162 + xy: 561, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3100,14 +3121,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 561, 162 + xy: 409, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 561, 162 + xy: 409, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3126,16 +3147,23 @@ mass-driver orig: 24, 24 offset: 0, 0 index: -1 +block-icon-mechanical-drill + rotate: false + xy: 841, 354 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-mechanical-pump rotate: false - xy: 409, 107 + xy: 409, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 409, 107 + xy: 409, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,28 +3177,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 409, 97 + xy: 407, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 409, 97 + xy: 407, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 407, 87 + xy: 408, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 407, 87 + xy: 408, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3198,14 +3226,14 @@ nuclear-reactor index: -1 block-icon-oil rotate: false - xy: 408, 77 + xy: 408, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 408, 77 + xy: 408, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3219,49 +3247,49 @@ block-icon-oil-extractor index: -1 block-icon-overflow-gate rotate: false - xy: 408, 67 + xy: 398, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 408, 67 + xy: 398, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 398, 63 + xy: 395, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 398, 63 + xy: 395, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 395, 53 + xy: 395, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 395, 53 + xy: 395, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 841, 354 + xy: 859, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3275,154 +3303,161 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 859, 375 + xy: 859, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 859, 375 + xy: 859, 357 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-pneumatic-drill + rotate: false + xy: 877, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 395, 43 + xy: 395, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 395, 43 + xy: 395, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 859, 357 + xy: 877, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 859, 357 + xy: 877, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 395, 33 + xy: 408, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 395, 33 + xy: 408, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 408, 57 + xy: 405, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 408, 57 + xy: 405, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 405, 47 + xy: 405, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 405, 37 + xy: 395, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 877, 375 + xy: 895, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 877, 375 + xy: 895, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 877, 357 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad rotate: false - xy: 877, 357 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad rotate: false - xy: 877, 357 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad rotate: false - xy: 877, 357 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad rotate: false - xy: 877, 357 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 877, 357 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 395, 23 + xy: 405, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 395, 23 + xy: 405, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3436,154 +3471,168 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 405, 27 + xy: 393, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 405, 27 + xy: 393, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 895, 375 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 895, 375 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +block-icon-router + rotate: false + xy: 405, 17 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +router + rotate: false + xy: 405, 17 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 block-icon-rtg-generator - rotate: false - xy: 393, 13 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -rtg-generator - rotate: false - xy: 393, 13 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-salvo - rotate: false - xy: 895, 357 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-sand - rotate: false - xy: 405, 17 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -sand1 - rotate: false - xy: 405, 17 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-scorch rotate: false xy: 417, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-separator +rtg-generator + rotate: false + xy: 417, 87 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-salvo + rotate: false + xy: 913, 357 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-sand rotate: false xy: 418, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +sand1 + rotate: false + xy: 418, 77 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-scorch + rotate: false + xy: 418, 67 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-separator + rotate: false + xy: 418, 57 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 separator rotate: false - xy: 418, 77 + xy: 418, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 418, 67 + xy: 415, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 418, 67 + xy: 415, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 913, 375 + xy: 931, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 913, 375 + xy: 931, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 418, 57 + xy: 415, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 418, 57 + xy: 415, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 415, 47 + xy: 415, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 415, 47 + xy: 415, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 415, 37 + xy: 415, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 415, 37 + xy: 415, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3604,42 +3653,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 415, 27 + xy: 425, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 415, 27 + xy: 425, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 415, 17 + xy: 425, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 415, 17 + xy: 425, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 425, 47 + xy: 425, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 425, 47 + xy: 425, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3651,93 +3700,79 @@ block-icon-spectre orig: 32, 32 offset: 0, 0 index: -1 -block-icon-splitter - rotate: false - xy: 425, 37 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -splitter - rotate: false - xy: 425, 37 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 block-icon-stone rotate: false - xy: 425, 27 + xy: 425, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 425, 27 + xy: 425, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 913, 357 + xy: 949, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 931, 363 + xy: 967, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 931, 363 + xy: 967, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 949, 371 + xy: 985, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 949, 371 + xy: 985, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 425, 17 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 425, 17 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 967, 371 + xy: 845, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 967, 371 + xy: 845, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3751,60 +3786,18 @@ block-icon-titan-pad index: -1 block-icon-titanium-conveyor rotate: false - xy: 813, 288 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 - rotate: false - xy: 813, 288 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -titanium-conveyor - rotate: false - xy: 813, 288 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-tungsten-drill - rotate: false - xy: 985, 371 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-tungsten-wall rotate: false xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -tungsten-wall - rotate: false - xy: 823, 288 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-tungsten-wall-large - rotate: false - xy: 845, 324 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -tungsten-wall-large - rotate: false - xy: 845, 324 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 block-icon-turbine-generator rotate: false xy: 865, 339 @@ -3891,112 +3884,112 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 863, 231 + xy: 853, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 853, 216 + xy: 863, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 863, 221 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 853, 206 + xy: 863, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 863, 201 + xy: 863, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 853, 186 + xy: 873, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 863, 191 + xy: 873, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 863, 181 + xy: 873, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 429, 114 + xy: 449, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 439, 114 + xy: 439, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 429, 104 + xy: 459, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 449, 114 + xy: 449, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 469, 104 + xy: 447, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 427, 94 + xy: 457, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 437, 94 + xy: 467, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 447, 94 + xy: 428, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4052,770 +4045,770 @@ mech-icon-tau-mech index: -1 metalfloor-cliff-edge rotate: false - xy: 448, 74 + xy: 458, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 458, 84 + xy: 458, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 448, 64 + xy: 468, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 458, 74 + xy: 468, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 458, 64 + xy: 468, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 468, 84 + xy: 435, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 468, 74 + xy: 435, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 468, 64 + xy: 445, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 435, 44 + xy: 445, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 445, 54 + xy: 455, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 435, 34 + xy: 435, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 445, 44 + xy: 445, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 455, 54 + xy: 455, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 435, 24 + xy: 465, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 445, 34 + xy: 445, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 455, 44 + xy: 455, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 465, 54 + xy: 465, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 445, 24 + xy: 455, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 455, 34 + xy: 465, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 465, 44 + xy: 465, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 455, 24 + xy: 435, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 465, 34 + xy: 445, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 465, 24 + xy: 455, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 435, 14 + xy: 465, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 445, 14 + xy: 433, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 - rotate: false - xy: 455, 14 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -ore-lead-blackstone1 - rotate: false - xy: 465, 14 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -ore-lead-blackstone2 - rotate: false - xy: 433, 4 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -ore-lead-blackstone3 rotate: false xy: 443, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-grass1 +ore-copper-blackstone1 rotate: false xy: 453, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-grass2 +ore-copper-blackstone2 rotate: false xy: 463, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-grass3 +ore-copper-blackstone3 rotate: false xy: 477, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-ice1 +ore-copper-grass1 rotate: false xy: 478, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-ice2 +ore-copper-grass2 rotate: false xy: 478, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-ice3 +ore-copper-grass3 rotate: false xy: 478, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-sand1 +ore-copper-ice1 rotate: false xy: 475, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-sand2 +ore-copper-ice2 rotate: false xy: 475, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-sand3 +ore-copper-ice3 rotate: false xy: 475, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-snow1 +ore-copper-sand1 rotate: false xy: 475, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-snow2 +ore-copper-sand2 rotate: false xy: 475, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-snow3 +ore-copper-sand3 rotate: false xy: 473, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-stone1 +ore-copper-snow1 rotate: false xy: 485, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-stone2 +ore-copper-snow2 rotate: false xy: 485, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-lead-stone3 +ore-copper-snow3 rotate: false xy: 485, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-blackstone1 +ore-copper-stone1 rotate: false xy: 485, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-blackstone2 +ore-copper-stone2 rotate: false xy: 485, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-blackstone3 +ore-copper-stone3 rotate: false xy: 483, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-grass1 +ore-lead-blackstone1 rotate: false xy: 722, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-grass2 +ore-lead-blackstone2 rotate: false xy: 732, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-grass3 +ore-lead-blackstone3 rotate: false xy: 742, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-ice1 +ore-lead-grass1 rotate: false xy: 752, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-ice2 +ore-lead-grass2 rotate: false xy: 762, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-ice3 +ore-lead-grass3 rotate: false xy: 772, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-sand1 +ore-lead-ice1 rotate: false xy: 782, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-sand2 +ore-lead-ice2 rotate: false xy: 792, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-sand3 +ore-lead-ice3 rotate: false xy: 802, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-snow1 +ore-lead-sand1 rotate: false xy: 812, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-snow2 +ore-lead-sand2 rotate: false xy: 822, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-snow3 +ore-lead-sand3 rotate: false xy: 832, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-stone1 +ore-lead-snow1 rotate: false xy: 842, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-stone2 +ore-lead-snow2 rotate: false xy: 852, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-thorium-stone3 +ore-lead-snow3 rotate: false xy: 862, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-blackstone1 +ore-lead-stone1 rotate: false xy: 872, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-blackstone2 +ore-lead-stone2 rotate: false xy: 879, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-blackstone3 +ore-lead-stone3 rotate: false xy: 889, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-grass1 +ore-thorium-blackstone1 rotate: false xy: 899, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-grass2 +ore-thorium-blackstone2 rotate: false xy: 909, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-grass3 +ore-thorium-blackstone3 rotate: false xy: 919, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-ice1 +ore-thorium-grass1 rotate: false xy: 929, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-ice2 +ore-thorium-grass2 rotate: false xy: 939, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-ice3 +ore-thorium-grass3 rotate: false xy: 949, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-sand1 +ore-thorium-ice1 rotate: false xy: 959, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-sand2 +ore-thorium-ice2 rotate: false xy: 969, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-sand3 +ore-thorium-ice3 rotate: false xy: 979, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-snow1 +ore-thorium-sand1 rotate: false xy: 989, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-snow2 +ore-thorium-sand2 rotate: false xy: 883, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-snow3 +ore-thorium-sand3 rotate: false xy: 883, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-stone1 +ore-thorium-snow1 rotate: false xy: 893, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-stone2 +ore-thorium-snow2 rotate: false xy: 883, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-titanium-stone3 +ore-thorium-snow3 rotate: false xy: 893, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-blackstone1 +ore-thorium-stone1 rotate: false xy: 903, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-blackstone2 +ore-thorium-stone2 rotate: false xy: 883, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-blackstone3 +ore-thorium-stone3 rotate: false xy: 893, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-grass1 +ore-titanium-blackstone1 rotate: false xy: 903, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-grass2 +ore-titanium-blackstone2 rotate: false xy: 913, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-grass3 +ore-titanium-blackstone3 rotate: false xy: 883, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-ice1 +ore-titanium-grass1 rotate: false xy: 893, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-ice2 +ore-titanium-grass2 rotate: false xy: 903, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-ice3 +ore-titanium-grass3 rotate: false xy: 913, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-sand1 +ore-titanium-ice1 rotate: false xy: 923, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-sand2 +ore-titanium-ice2 rotate: false xy: 883, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-sand3 +ore-titanium-ice3 rotate: false xy: 893, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-snow1 +ore-titanium-sand1 rotate: false xy: 903, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-snow2 +ore-titanium-sand2 rotate: false xy: 913, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-snow3 +ore-titanium-sand3 rotate: false xy: 923, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-stone1 +ore-titanium-snow1 rotate: false xy: 933, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-stone2 +ore-titanium-snow2 rotate: false xy: 883, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ore-tungsten-stone3 +ore-titanium-snow3 rotate: false xy: 893, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +ore-titanium-stone1 + rotate: false + xy: 903, 247 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +ore-titanium-stone2 + rotate: false + xy: 913, 257 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +ore-titanium-stone3 + rotate: false + xy: 923, 267 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 sand-cliff-edge - rotate: false - xy: 893, 197 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -sand-cliff-edge-1 - rotate: false - xy: 903, 207 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -sand-cliff-edge-2 - rotate: false - xy: 913, 217 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -sand-cliff-side rotate: false xy: 923, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +sand-cliff-edge-1 + rotate: false + xy: 933, 237 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +sand-cliff-edge-2 + rotate: false + xy: 893, 187 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +sand-cliff-side + rotate: false + xy: 903, 197 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 snow-cliff-edge - rotate: false - xy: 913, 197 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -snow-cliff-edge-1 - rotate: false - xy: 923, 207 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -snow-cliff-edge-2 - rotate: false - xy: 933, 217 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -snow-cliff-side rotate: false xy: 913, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -space-cliff-edge +snow-cliff-edge-1 + rotate: false + xy: 923, 197 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +snow-cliff-edge-2 rotate: false xy: 933, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -space-cliff-edge-1 +snow-cliff-side rotate: false xy: 923, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +space-cliff-edge + rotate: false + xy: 933, 187 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +space-cliff-edge-1 + rotate: false + xy: 883, 177 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 space-cliff-edge-2 rotate: false - xy: 933, 197 + xy: 893, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 933, 187 + xy: 903, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4836,112 +4829,112 @@ unit-icon-titan index: -1 item-biomatter rotate: false - xy: 257, 9 + xy: 287, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 267, 9 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-carbide - rotate: false - xy: 277, 9 + xy: 297, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal - rotate: false - xy: 287, 9 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-lead - rotate: false - xy: 297, 9 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-phase-matter rotate: false xy: 307, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-plastanium +item-copper rotate: false xy: 317, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-pyratite +item-dense-alloy rotate: false xy: 327, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-sand +item-lead rotate: false xy: 337, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-silicon +item-phase-matter rotate: false xy: 347, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-stone +item-plastanium rotate: false xy: 357, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-surge-alloy +item-pyratite rotate: false xy: 367, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-thorium +item-sand rotate: false xy: 377, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-titanium +item-silicon rotate: false xy: 419, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-tungsten +item-stone rotate: false xy: 419, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +item-surge-alloy + rotate: false + xy: 429, 114 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-thorium + rotate: false + xy: 439, 114 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-titanium + rotate: false + xy: 429, 104 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 liquid-icon rotate: false - xy: 469, 114 + xy: 437, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5251,7 +5244,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 917, 321 + xy: 881, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5293,14 +5286,14 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 759, 236 + xy: 741, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 759, 236 + xy: 741, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5335,7 +5328,7 @@ icon-arrow-up index: -1 icon-back rotate: false - xy: 759, 218 + xy: 759, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5349,14 +5342,14 @@ icon-ban index: -1 icon-break rotate: false - xy: 777, 254 + xy: 741, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 777, 236 + xy: 759, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5370,7 +5363,7 @@ icon-chat index: -1 icon-check rotate: false - xy: 777, 218 + xy: 759, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5447,14 +5440,14 @@ icon-egg index: -1 icon-elevation rotate: false - xy: 795, 260 + xy: 777, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 795, 242 + xy: 777, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5468,14 +5461,14 @@ icon-exit index: -1 icon-file rotate: false - xy: 795, 224 + xy: 777, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 687, 195 + xy: 795, 260 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5489,7 +5482,7 @@ icon-file-text index: -1 icon-fill rotate: false - xy: 705, 195 + xy: 795, 242 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5503,7 +5496,7 @@ icon-floppy index: -1 icon-floppy-16 rotate: false - xy: 723, 200 + xy: 795, 224 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5545,7 +5538,7 @@ icon-google-play index: -1 icon-grid rotate: false - xy: 741, 200 + xy: 687, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5601,14 +5594,14 @@ icon-item index: -1 icon-items-none rotate: false - xy: 237, 9 + xy: 267, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 759, 200 + xy: 705, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5636,28 +5629,28 @@ icon-load index: -1 icon-load-image rotate: false - xy: 777, 200 + xy: 723, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 795, 206 + xy: 741, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 456, 142 + xy: 759, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 456, 124 + xy: 777, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5685,7 +5678,7 @@ icon-menu index: -1 icon-menu-large rotate: false - xy: 951, 335 + xy: 795, 206 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5706,7 +5699,7 @@ icon-none index: -1 icon-nullitem rotate: false - xy: 247, 9 + xy: 277, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5720,7 +5713,7 @@ icon-pause index: -1 icon-pencil rotate: false - xy: 969, 335 + xy: 456, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5734,7 +5727,7 @@ icon-pencil-small index: -1 icon-pick rotate: false - xy: 987, 335 + xy: 456, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5783,7 +5776,7 @@ icon-quit index: -1 icon-redo rotate: false - xy: 951, 317 + xy: 951, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5804,7 +5797,7 @@ icon-rename index: -1 icon-resize rotate: false - xy: 969, 317 + xy: 969, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5846,14 +5839,14 @@ icon-save index: -1 icon-save-image rotate: false - xy: 987, 317 + xy: 987, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 177, 117 + xy: 951, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5867,7 +5860,7 @@ icon-settings index: -1 icon-terrain rotate: false - xy: 195, 117 + xy: 969, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5902,7 +5895,7 @@ icon-trash index: -1 icon-trash-16 rotate: false - xy: 213, 117 + xy: 987, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5923,7 +5916,7 @@ icon-tutorial index: -1 icon-undo rotate: false - xy: 231, 117 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5958,7 +5951,7 @@ icon-wiki index: -1 icon-zoom rotate: false - xy: 249, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6223,21 +6216,21 @@ power-cell index: -1 titan rotate: false - xy: 265, 81 + xy: 283, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 301, 99 + xy: 319, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 283, 81 + xy: 301, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index de70589648..40b272ac04 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/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java index a00170a550..d86efbfe9f 100644 --- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java +++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java @@ -43,7 +43,7 @@ public class BlockIndexer{ /** * Set of all ores that are being scanned. */ - private final ObjectSet scanOres = ObjectSet.with(Items.tungsten, Items.coal, Items.lead, Items.thorium, Items.titanium); + private final ObjectSet scanOres = ObjectSet.with(Items.copper, Items.coal, Items.lead, Items.thorium, Items.titanium); private final ObjectSet itemSet = new ObjectSet<>(); /** * Stores all ore quadtrants on the map. diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index 99ae32ccc2..bf90b204b3 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -10,10 +10,10 @@ import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.ContentList; public class AmmoTypes implements ContentList{ - public static AmmoType bulletCopper, bulletCarbide, bulletThorium, bulletSilicon, bulletPyratite, + public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite, shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, - artilleryCarbide, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, + artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid; @Override @@ -66,7 +66,7 @@ public class AmmoTypes implements ContentList{ inaccuracy = 5f; }}; - bulletCarbide = new AmmoType(Items.carbide, StandardBullets.carbide, 2){{ + bulletDense = new AmmoType(Items.densealloy, StandardBullets.dense, 2){{ shootEffect = ShootFx.shootSmall; smokeEffect = ShootFx.shootSmallSmoke; reloadMultiplier = 0.6f; @@ -132,7 +132,7 @@ public class AmmoTypes implements ContentList{ //artillery - artilleryCarbide = new AmmoType(Items.carbide, ArtilleryBullets.carbide, 2){{ + artilleryDense = new AmmoType(Items.densealloy, ArtilleryBullets.dense, 2){{ shootEffect = ShootFx.shootBig2; smokeEffect = ShootFx.shootBigSmoke2; }}; diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java index b2216ec587..e6736280f1 100644 --- a/core/src/io/anuke/mindustry/content/Items.java +++ b/core/src/io/anuke/mindustry/content/Items.java @@ -8,23 +8,28 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemType; public class Items implements ContentList{ - public static Item stone, copper, lead, coal, titanium, thorium, silicon, plastanium, phasematter, surgealloy, + public static Item stone, copper, lead, densealloy, coal, titanium, thorium, silicon, plastanium, phasematter, surgealloy, biomatter, sand, blastCompound, pyratite; @Override public void load(){ - copper = new Item("copper", Color.valueOf("8e85a2")){{ + copper = new Item("copper", Color.valueOf("d99d73")){{ type = ItemType.material; hardness = 1; cost = 0.6f; }}; - lead = new Item("lead", Color.valueOf("8e85a2")){{ + lead = new Item("lead", Color.valueOf("8c7fa9")){{ type = ItemType.material; hardness = 1; cost = 0.6f; }}; + densealloy = new Item("dense-alloy", Color.valueOf("b2c6d2")){{ + type = ItemType.material; + cost = 1.2f; + }}; + coal = new Item("coal", Color.valueOf("272727")){{ explosiveness = 0.2f; flammability = 0.5f; @@ -54,7 +59,7 @@ public class Items implements ContentList{ cost = 0.9f; }}; - plastanium = new Item("plastanium", Color.valueOf("e9ead3")){{ + plastanium = new Item("plastanium", Color.valueOf("cbd97f")){{ type = ItemType.material; flammability = 0.1f; explosiveness = 0.1f; @@ -66,7 +71,7 @@ public class Items implements ContentList{ cost = 1.5f; }}; - surgealloy = new Item("surge-alloy", Color.valueOf("b4d5c7")){{ + surgealloy = new Item("surge-alloy", Color.valueOf("f3e979")){{ type = ItemType.material; }}; diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 975b2b2b87..8c9fc3e221 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -17,8 +17,8 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.copperWall, new ItemStack(Items.copper, 12)); new Recipe(defense, DefenseBlocks.copperWallLarge, new ItemStack(Items.copper, 12 * 4)); - new Recipe(defense, DefenseBlocks.carbideWall, new ItemStack(Items.carbide, 12)); - new Recipe(defense, DefenseBlocks.carbideWallLarge, new ItemStack(Items.carbide, 12 * 4)); + new Recipe(defense, DefenseBlocks.compositeWall, new ItemStack(Items.densealloy, 12)); + new Recipe(defense, DefenseBlocks.compositeWallLarge, new ItemStack(Items.densealloy, 12 * 4)); new Recipe(defense, DefenseBlocks.thoriumWall, new ItemStack(Items.thorium, 12)); new Recipe(defense, DefenseBlocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4)); @@ -26,45 +26,45 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.phaseWall, new ItemStack(Items.phasematter, 12)); new Recipe(defense, DefenseBlocks.phaseWallLarge, new ItemStack(Items.phasematter, 12 * 4)); - new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.carbide, 12), new ItemStack(Items.silicon, 8)); - new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.carbide, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); + new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8)); + new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); //TURRETS new Recipe(weapon, TurretBlocks.duo, new ItemStack(Items.copper, 40)); - new Recipe(weapon, TurretBlocks.scorch, new ItemStack(Items.copper, 50), new ItemStack(Items.carbide, 20)); - new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.copper, 60), new ItemStack(Items.carbide, 35)); + new Recipe(weapon, TurretBlocks.scorch, new ItemStack(Items.copper, 50), new ItemStack(Items.densealloy, 20)); + new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 35)); new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 90)); - new Recipe(weapon, TurretBlocks.wave, new ItemStack(Items.carbide, 60), new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150)); - new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.carbide, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60)); - new Recipe(weapon, TurretBlocks.salvo, new ItemStack(Items.copper, 210), new ItemStack(Items.carbide, 190), new ItemStack(Items.thorium, 130)); - new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.carbide, 220), new ItemStack(Items.thorium, 120)); + new Recipe(weapon, TurretBlocks.wave, new ItemStack(Items.densealloy, 60), new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150)); + new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.densealloy, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60)); + new Recipe(weapon, TurretBlocks.salvo, new ItemStack(Items.copper, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130)); + new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120)); //DISTRIBUTION - new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.lead, 1)); - new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.lead, 2), new ItemStack(Items.titanium, 1)); - new Recipe(distribution, DistributionBlocks.phaseConveyor, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.carbide, 20)); + new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1)); + new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.copper, 2), new ItemStack(Items.titanium, 1)); + new Recipe(distribution, DistributionBlocks.phaseConveyor, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.densealloy, 20)); //starter lead transporation - new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.lead, 2)); - new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.lead, 6)); + new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.copper, 2)); + new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.copper, 6)); - //advanced carbide transporation - new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.carbide, 8), new ItemStack(Items.copper, 8)); - new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.carbide, 4), new ItemStack(Items.copper, 4)); - new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.carbide, 4), new ItemStack(Items.copper, 8)); - new Recipe(distribution, DistributionBlocks.bridgeConveyor, new ItemStack(Items.carbide, 8), new ItemStack(Items.copper, 8)); - new Recipe(distribution, DistributionBlocks.massDriver, new ItemStack(Items.carbide, 400), new ItemStack(Items.silicon, 300), new ItemStack(Items.lead, 400), new ItemStack(Items.thorium, 250)); + //advanced densealloy transporation + new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8)); + new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 4)); + new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 8)); + new Recipe(distribution, DistributionBlocks.bridgeConveyor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8)); + new Recipe(distribution, DistributionBlocks.massDriver, new ItemStack(Items.densealloy, 400), new ItemStack(Items.silicon, 300), new ItemStack(Items.lead, 400), new ItemStack(Items.thorium, 250)); //CRAFTING //smelting new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.copper, 70)); - new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.copper, 90), new ItemStack(Items.carbide, 60), new ItemStack(Items.lead, 50)); + new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.copper, 90), new ItemStack(Items.densealloy, 60), new ItemStack(Items.lead, 50)); new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50)); //advanced fabrication - new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 230), new ItemStack(Items.carbide, 120), new ItemStack(Items.titanium, 160)); + new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 230), new ItemStack(Items.densealloy, 120), new ItemStack(Items.titanium, 160)); new Recipe(crafting, CraftingBlocks.phaseWeaver, new ItemStack(Items.silicon, 260), new ItemStack(Items.lead, 240), new ItemStack(Items.thorium, 150)); //TODO implement alloy smelter @@ -73,66 +73,66 @@ public class Recipes implements ContentList{ //misc new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50)); new Recipe(crafting, CraftingBlocks.pyratiteMixer, new ItemStack(Items.copper, 100), new ItemStack(Items.lead, 50)); - new Recipe(crafting, CraftingBlocks.blastMixer, new ItemStack(Items.lead, 60), new ItemStack(Items.carbide, 40)); + new Recipe(crafting, CraftingBlocks.blastMixer, new ItemStack(Items.lead, 60), new ItemStack(Items.densealloy, 40)); new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 80), new ItemStack(Items.thorium, 90)); - new Recipe(crafting, CraftingBlocks.solidifier, new ItemStack(Items.carbide, 30), new ItemStack(Items.copper, 20)); - new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 70), new ItemStack(Items.carbide, 90)); - new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.carbide, 10), new ItemStack(Items.lead, 30)); + new Recipe(crafting, CraftingBlocks.solidifier, new ItemStack(Items.densealloy, 30), new ItemStack(Items.copper, 20)); + new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 70), new ItemStack(Items.densealloy, 90)); + new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 30)); //processing new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.lead, 70), new ItemStack(Items.silicon, 60)); - new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.copper, 60), new ItemStack(Items.carbide, 50)); - new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.copper, 130), new ItemStack(Items.carbide, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); + new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50)); + new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); //POWER new Recipe(power, PowerBlocks.powerNode, new ItemStack(Items.copper, 2), new ItemStack(Items.lead, 6)) .setDependencies(PowerBlocks.combustionGenerator); - new Recipe(power, PowerBlocks.powerNodeLarge, new ItemStack(Items.carbide, 10), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6)) + new Recipe(power, PowerBlocks.powerNodeLarge, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6)) .setDependencies(PowerBlocks.powerNode); new Recipe(power, PowerBlocks.battery, new ItemStack(Items.copper, 8), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 4)) .setDependencies(PowerBlocks.powerNode); - new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.carbide, 40), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 30)) + new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.densealloy, 40), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 30)) .setDependencies(PowerBlocks.powerNode); //generators - combustion new Recipe(power, PowerBlocks.combustionGenerator, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 30)); - new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.copper, 70), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60)); - new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.copper, 80), new ItemStack(Items.carbide, 70), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 70), new ItemStack(Items.thorium, 70)); + new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60)); + new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.copper, 80), new ItemStack(Items.densealloy, 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)); new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 290), new ItemStack(Items.phasematter, 30)); //generators - other - new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.carbide, 300), new ItemStack(Items.thorium, 300)); + new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.densealloy, 300), new ItemStack(Items.thorium, 300)); - //new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.carbide, 50)); - new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.carbide, 40), new ItemStack(Items.silicon, 50)); - new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.carbide, 500), new ItemStack(Items.thorium, 350)); + //new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.densealloy, 50)); + new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.densealloy, 40), new ItemStack(Items.silicon, 50)); + new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.densealloy, 500), new ItemStack(Items.thorium, 350)); //DRILLS, PRODUCERS new Recipe(production, ProductionBlocks.mechanicalDrill, new ItemStack(Items.copper, 50)); - new Recipe(production, ProductionBlocks.pneumaticDrill, new ItemStack(Items.copper, 60), new ItemStack(Items.carbide, 50)); - new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.copper, 70), new ItemStack(Items.carbide, 90), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); - new Recipe(production, ProductionBlocks.blastdrill, new ItemStack(Items.copper, 130), new ItemStack(Items.carbide, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 100), new ItemStack(Items.thorium, 60)); + new Recipe(production, ProductionBlocks.pneumaticDrill, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50)); + new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 90), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); + new Recipe(production, ProductionBlocks.blastdrill, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 100), new ItemStack(Items.thorium, 60)); - new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.copper, 50), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 40)); + new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.copper, 50), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 40)); new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.copper, 20), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 20)); - new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.copper, 300), new ItemStack(Items.carbide, 350), new ItemStack(Items.lead, 230), new ItemStack(Items.thorium, 230), new ItemStack(Items.silicon, 150)); + new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 350), new ItemStack(Items.lead, 230), new ItemStack(Items.thorium, 230), new ItemStack(Items.silicon, 150)); //UNITS //bodies new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setDesktop(); //dart is desktop only, because it's the starter mobile ship new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); - new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.carbide, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); + new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.densealloy, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); //new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 30)); //actual unit related stuff new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); - new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.carbide, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); + new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 80)).setMode(GameMode.noWaves); new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)).setMode(GameMode.noWaves); @@ -141,28 +141,28 @@ public class Recipes implements ContentList{ new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)).setMode(GameMode.noWaves); new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30)); - new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.carbide, 100), new ItemStack(Items.silicon, 200)).setMode(GameMode.noWaves); + new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)).setMode(GameMode.noWaves); //LIQUIDS new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter); new Recipe(liquid, LiquidBlocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1)); new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20)); - new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.carbide, 4), new ItemStack(Items.lead, 4)); - new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50), new ItemStack(Items.carbide, 20)); - new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.carbide, 4), new ItemStack(Items.lead, 4)); - new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.carbide, 8), new ItemStack(Items.lead, 8)); + new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4)); + new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50)); + new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4)); + new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.titanium, 8), new ItemStack(Items.lead, 8)); new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 20)).setDependencies(CraftingBlocks.smelter); new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.copper, 140), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 70)); new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.copper, 160), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 80), new ItemStack(Items.thorium, 70)); //DEBUG - new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.powerVoid, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.powerInfinite, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)).setDebug(); + new Recipe(units, DebugBlocks.itemSource).setDebug(); + new Recipe(units, DebugBlocks.itemVoid).setDebug(); + new Recipe(units, DebugBlocks.liquidSource).setDebug(); + new Recipe(units, DebugBlocks.powerVoid).setDebug(); + new Recipe(units, DebugBlocks.powerInfinite).setDebug(); } static void init(Object... objects){ diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index a61780afef..247582a11f 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -71,7 +71,7 @@ public class UnitTypes implements ContentList{ buildPower = 0.9f; minePower = 1.1f; healSpeed = 0.09f; - toMine = ObjectSet.with(Items.lead, Items.tungsten, Items.titanium); + toMine = ObjectSet.with(Items.lead, Items.copper, Items.titanium); }}; } diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 7909578967..f9b5d29477 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -19,7 +19,7 @@ public class Weapons implements ContentList{ reload = 15f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletLead; + ammo = AmmoTypes.bulletCopper; }}; missiles = new Weapon("missiles"){{ @@ -38,7 +38,7 @@ public class Weapons implements ContentList{ reload = 28f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletLead; + ammo = AmmoTypes.bulletCopper; }}; shockgun = new Weapon("shockgun"){{ @@ -79,7 +79,7 @@ public class Weapons implements ContentList{ reload = 12f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletCarbide; + ammo = AmmoTypes.bulletDense; }}; swarmer = new Weapon("swarmer"){{ diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java index ae7796c7c5..f7e04cfa32 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -5,7 +5,6 @@ import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.type.ContentList; -import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.production.*; @@ -19,26 +18,26 @@ public class CraftingBlocks extends BlockList implements ContentList{ public void load(){ smelter = new Smelter("smelter"){{ health = 70; - result = Items.carbide; + result = Items.densealloy; craftTime = 45f; burnDuration = 46f; useFlux = true; - consumes.items(new ItemStack[]{new ItemStack(Items.tungsten, 3)}); + consumes.items(new ItemStack[]{new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)}); consumes.item(Items.coal).optional(true); }}; arcsmelter = new PowerSmelter("arc-smelter"){{ health = 90; craftEffect = BlockFx.smeltsmoke; - result = Items.carbide; + result = Items.densealloy; craftTime = 30f; size = 2; useFlux = true; fluxNeeded = 2; - consumes.items(new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.tungsten, 2)}); + consumes.items(new ItemStack[]{new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)}); consumes.power(0.1f); }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index f4cb6ea39e..96b2542fde 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.world.blocks.defense.Door; import io.anuke.mindustry.world.blocks.defense.PhaseWall; public class DefenseBlocks extends BlockList implements ContentList{ - public static Block copperWall, copperWallLarge, carbideWall, carbideWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge, + public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge, phaseWall, phaseWallLarge; @Override @@ -25,11 +25,11 @@ public class DefenseBlocks extends BlockList implements ContentList{ size = 2; }}; - carbideWall = new Wall("carbide-wall"){{ + compositeWall = new Wall("composite-wall"){{ health = 110 * wallHealthMultiplier; }}; - carbideWallLarge = new Wall("carbide-wall-large"){{ + compositeWallLarge = new Wall("composite-wall-large"){{ health = 110 * wallHealthMultiplier * 4; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java b/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java index 4cb86032f8..bc2cbcfb2c 100644 --- a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java @@ -19,7 +19,7 @@ public class OreBlocks extends BlockList{ @Override public void load(){ - Item[] ores = {Items.tungsten, Items.lead, Items.coal, Items.titanium, Items.thorium}; + Item[] ores = {Items.copper, Items.lead, Items.coal, Items.titanium, Items.thorium}; for(Item item : ores){ ObjectMap map = new ObjectMap<>(); diff --git a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java index 8f51fe4c78..57b21777ba 100644 --- a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java @@ -23,7 +23,7 @@ public class ProductionBlocks extends BlockList implements ContentList{ drawMineItem = true; }}; - pneumaticDrill = new Drill("carbide-drill"){{ + pneumaticDrill = new Drill("pneumatic-drill"){{ tier = 3; drillTime = 240; size = 2; diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index e408d82719..6bf9652d62 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -19,7 +19,7 @@ public class TurretBlocks extends BlockList implements ContentList{ @Override public void load(){ duo = new DoubleTurret("duo"){{ - ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletPyratite, AmmoTypes.bulletSilicon}; + ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletSilicon}; reload = 25f; restitution = 0.03f; range = 90f; @@ -43,7 +43,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }};*/ hail = new ArtilleryTurret("hail"){{ - ammoTypes = new AmmoType[]{AmmoTypes.artilleryCarbide, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary}; + ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary}; reload = 100f; recoil = 2f; range = 200f; @@ -134,7 +134,7 @@ public class TurretBlocks extends BlockList implements ContentList{ salvo = new BurstTurret("salvo"){{ size = 2; range = 120f; - ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletCarbide, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon}; + ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon}; reload = 40f; restitution = 0.03f; ammoEjectBack = 3f; @@ -162,7 +162,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; ripple = new ArtilleryTurret("ripple"){{ - ammoTypes = new AmmoType[]{AmmoTypes.artilleryCarbide, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary, AmmoTypes.artilleryExplosive, AmmoTypes.artilleryPlastic}; + ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary, AmmoTypes.artilleryExplosive, AmmoTypes.artilleryPlastic}; size = 3; shots = 4; inaccuracy = 12f; @@ -191,7 +191,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; spectre = new ItemTurret("spectre"){{ - ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon}; + ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon}; reload = 25f; restitution = 0.03f; ammoUseEffect = ShootFx.shellEjectSmall; diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index 179b2b4642..06386a6f06 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -52,7 +52,7 @@ public class UnitBlocks extends BlockList implements ContentList{ produceTime = 1800; size = 2; consumes.power(0.05f); - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.tungsten, 15)}); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.copper, 15)}); }}; titanPad = new UnitPad("titan-pad"){{ diff --git a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java index 5898a70070..352a432442 100644 --- a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java @@ -8,12 +8,12 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentList; public class ArtilleryBullets extends BulletList implements ContentList{ - public static BulletType carbide, plastic, plasticFrag, homing, incindiary, explosive, surge; + public static BulletType dense, plastic, plasticFrag, homing, incindiary, explosive, surge; @Override public void load(){ - carbide = new ArtilleryBulletType(3f, 0, "shell"){ + dense = new ArtilleryBulletType(3f, 0, "shell"){ { hiteffect = BulletFx.flakExplosion; knockback = 0.8f; diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java index ac767484a7..84dfddb816 100644 --- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentList; public class StandardBullets extends BulletList implements ContentList{ - public static BulletType copper, carbide, thorium, homing, tracer; + public static BulletType copper, dense, thorium, homing, tracer; @Override public void load(){ @@ -18,7 +18,7 @@ public class StandardBullets extends BulletList implements ContentList{ } }; - carbide = new BasicBulletType(3.5f, 18, "bullet"){ + dense = new BasicBulletType(3.5f, 18, "bullet"){ { bulletWidth = 9f; bulletHeight = 12f; diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index bfc0d49b68..0fe9e701d8 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -2,7 +2,6 @@ package io.anuke.mindustry.core; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.Items; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.game.EventType.GameOverEvent; @@ -70,13 +69,6 @@ public class Logic extends Module{ } } - for(TeamData team : state.teams.getTeams(false)){ - for(Tile tile : team.cores){ - tile.entity.items.add(Items.tungsten, 2000); - tile.entity.items.add(Items.blastCompound, 2000); - } - } - Events.fire(PlayEvent.class); } diff --git a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java index 4ea154cae6..f5ee1996de 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java @@ -17,7 +17,7 @@ public class UnitDrops{ } if(dropTable == null){ - dropTable = new Item[]{Items.tungsten, Items.lead, Items.carbide}; + dropTable = new Item[]{Items.densealloy, Items.lead, Items.copper}; } for(int i = 0; i < 3; i++){ diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java index 2f8c6562cc..735c53cbfb 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java @@ -45,7 +45,7 @@ public class UnitType implements UnlockableContent{ public float carryWeight = 1f; public int ammoCapacity = 200; public int itemCapacity = 30; - public ObjectSet toMine = ObjectSet.with(Items.lead, Items.tungsten); + public ObjectSet toMine = ObjectSet.with(Items.lead, Items.copper); public float buildPower = 0.3f, minePower = 0.7f, healSpeed = 0.1f; public Weapon weapon = Weapons.blaster; public float weaponOffsetX, weaponOffsetY; diff --git a/core/src/io/anuke/mindustry/game/ContentDatabase.java b/core/src/io/anuke/mindustry/game/ContentDatabase.java index 64afe3e782..a325786546 100644 --- a/core/src/io/anuke/mindustry/game/ContentDatabase.java +++ b/core/src/io/anuke/mindustry/game/ContentDatabase.java @@ -8,6 +8,8 @@ import io.anuke.mindustry.game.EventType.UnlockEvent; import io.anuke.ucore.core.Events; import io.anuke.ucore.core.Settings; +import static io.anuke.mindustry.Vars.debug; + public class ContentDatabase{ /** Maps unlockable type names to a set of unlocked content.*/ private ObjectMap> unlocked = new ObjectMap<>(); @@ -16,6 +18,8 @@ public class ContentDatabase{ /** Returns whether or not this piece of content is unlocked yet.*/ public boolean isUnlocked(UnlockableContent content){ + if(debug) return true; + if(!unlocked.containsKey(content.getContentTypeName())){ unlocked.put(content.getContentTypeName(), new ObjectSet<>()); } diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index 0bcdbffee9..43beedba5e 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -147,21 +147,21 @@ public class Sectors{ sector.spawns = sector.missions.first().getWaves(sector); //add all ores for now since material differences aren't well handled yet - sector.ores.addAll(Items.tungsten, Items.coal, Items.lead, Items.thorium, Items.titanium); + sector.ores.addAll(Items.copper, Items.coal, Items.lead, Items.thorium, Items.titanium); //set starter items if(sector.difficulty > 12){ //now with titanium - sector.startingItems = Array.with(new ItemStack(Items.tungsten, 1900), new ItemStack(Items.lead, 600), new ItemStack(Items.carbide, 470), new ItemStack(Items.silicon, 460), new ItemStack(Items.titanium, 230)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 1900), new ItemStack(Items.lead, 500), new ItemStack(Items.densealloy, 470), new ItemStack(Items.silicon, 460), new ItemStack(Items.titanium, 230)); }else if(sector.difficulty > 8){ //just more resources - sector.startingItems = Array.with(new ItemStack(Items.tungsten, 1500), new ItemStack(Items.lead, 450), new ItemStack(Items.carbide, 340), new ItemStack(Items.silicon, 250)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 1500), new ItemStack(Items.lead, 400), new ItemStack(Items.densealloy, 340), new ItemStack(Items.silicon, 250)); }else if(sector.difficulty > 5){ //now with silicon - sector.startingItems = Array.with(new ItemStack(Items.tungsten, 950), new ItemStack(Items.lead, 350), new ItemStack(Items.carbide, 190), new ItemStack(Items.silicon, 140)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 950), new ItemStack(Items.lead, 300), new ItemStack(Items.densealloy, 190), new ItemStack(Items.silicon, 140)); }else if(sector.difficulty > 3){ //now with carbide - sector.startingItems = Array.with(new ItemStack(Items.tungsten, 700), new ItemStack(Items.lead, 250), new ItemStack(Items.carbide, 130)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 700), new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 130)); }else if(sector.difficulty > 1){ //more starter items for faster start - sector.startingItems = Array.with(new ItemStack(Items.tungsten, 500), new ItemStack(Items.lead, 180)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 500), new ItemStack(Items.lead, 100)); }else{ //base starting items to prevent grinding much - sector.startingItems = Array.with(new ItemStack(Items.tungsten, 170), new ItemStack(Items.lead, 70)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 170)); } } diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index 725072d6f3..d24a61aa79 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -3,7 +3,6 @@ package io.anuke.mindustry.maps.generation; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; -import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.DefenseBlocks; import io.anuke.mindustry.content.blocks.UnitBlocks; @@ -33,6 +32,7 @@ public class FortressGenerator{ if(structures != null) return; structures = new Structure[]{ + /* //tiny duo outpost new Structure(0.03f, Items.tungsten, "BAMADnR1bmdzdGVuLWRyaWxsAgADZHVvAQANdHVuZ3N0ZW4td2FsbAAAA2FpcgMFAQABAwEDAQMBAAEAAgMDAwIDAQABAAEBAQEBAQEA"), @@ -71,6 +71,7 @@ public class FortressGenerator{ //fabricator outpost new Structure(0.02f, Items.tungsten, "BgUADWNhcmJpZGUtZHJpbGwBABJ0aG9yaXVtLXdhbGwtbGFyZ2UCAAx0aG9yaXVtLXdhbGwEAANkdW8AAANhaXIDAA5mYWJyaWNhdG9yLXBhZAkJAAAAAAEDAAACAwEDAAAAAAAAAAACAwADAAMCAwADAAMCAgAAAQMAAAMCAAACAAMCAAABAwAAAAAAAAAAAAAEAgAAAAAAAgAAAgMCAAIBBAIFAAQCAgMCAgIDAQMAAAMCAAAEAgMCAAABAwAAAAAAAAAAAAACAQAAAAAAAgAAAAACAAEDAAECAQEDAAECAQAAAAAAAAAAAAACAwACAAAAAAAA"), + */ }; bases = new Structure[]{ @@ -185,8 +186,8 @@ public class FortressGenerator{ } Block fixBlock(Block result){ - if(result == UnitBlocks.dronePad) result = DefenseBlocks.tungstenWallLarge; - if(result == UnitBlocks.fabricatorPad) result = DefenseBlocks.tungstenWallLarge; + if(result == UnitBlocks.dronePad) result = DefenseBlocks.copperWallLarge; + if(result == UnitBlocks.fabricatorPad) result = DefenseBlocks.copperWallLarge; return result; } diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index 5a5b379141..973cea917f 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -147,7 +147,7 @@ public class WorldGenerator{ if(genOres){ Array baseOres = Array.with( - new OreEntry(Items.tungsten, 0.3f, seed), + new OreEntry(Items.copper, 0.3f, seed), new OreEntry(Items.coal, 0.284f, seed), new OreEntry(Items.lead, 0.28f, seed), new OreEntry(Items.titanium, 0.27f, seed), diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java index eb556afef1..1cb4a9501e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java @@ -2,7 +2,6 @@ package io.anuke.mindustry.world.blocks.distribution; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; -import io.anuke.mindustry.content.Items; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.gen.Call; @@ -119,7 +118,7 @@ public class Sorter extends Block implements SelectionTrait{ } public static class SorterEntity extends TileEntity{ - public Item sortItem = Items.tungsten; + public Item sortItem = Item.getByID(0); @Override public void write(DataOutputStream stream) throws IOException{