diff --git a/core/assets-raw/sprites/blocks/drills/drill-top.png b/core/assets-raw/sprites/blocks/drills/drill-top.png new file mode 100644 index 0000000000..dade4f64a3 Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/drill-top.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index c2eb5af812..1bd3cdc961 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -27,21 +27,21 @@ force-projector-top index: -1 mend-projector rotate: false - xy: 1544, 1597 + xy: 1610, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-icon-full rotate: false - xy: 1544, 1597 + xy: 1610, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1610, 1597 + xy: 1676, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -69,21 +69,21 @@ mender-top index: -1 overdrive-projector rotate: false - xy: 1742, 1593 + xy: 1808, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-icon-full rotate: false - xy: 1742, 1593 + xy: 1808, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1808, 1593 + xy: 1874, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -571,6 +571,20 @@ blast-drill-top orig: 128, 128 offset: 0, 0 index: -1 +drill-top + rotate: false + xy: 525, 54 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +turbine-generator-liquid + rotate: false + xy: 525, 54 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 laser-drill rotate: false xy: 685, 186 @@ -601,21 +615,21 @@ laser-drill-top index: -1 mechanical-drill rotate: false - xy: 1412, 1625 + xy: 1346, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1412, 1559 + xy: 1478, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1478, 1597 + xy: 1544, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -650,21 +664,21 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 1940, 1527 + xy: 1148, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 1214, 1493 + xy: 1280, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1280, 1493 + xy: 1346, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -734,28 +748,28 @@ place-arrow index: -1 rubble-1-0 rotate: false - xy: 1610, 1465 + xy: 1676, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 1676, 1465 + xy: 1742, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 1742, 1461 + xy: 1808, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 1808, 1461 + xy: 1874, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1091,14 +1105,14 @@ pulse-conduit-top-6 index: -1 rotary-pump rotate: false - xy: 1478, 1465 + xy: 1544, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rotary-pump-icon-full rotate: false - xy: 1478, 1465 + xy: 1544, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1161,14 +1175,14 @@ glaive-ship-pad-icon-full index: -1 javelin-ship-pad rotate: false - xy: 1214, 1625 + xy: 1148, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 javelin-ship-pad-icon-full rotate: false - xy: 1214, 1625 + xy: 1148, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1189,28 +1203,28 @@ omega-mech-pad-icon-full index: -1 tau-mech-pad rotate: false - xy: 1035, 1353 + xy: 913, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 tau-mech-pad-icon-full rotate: false - xy: 1035, 1353 + xy: 913, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 979, 1155 + xy: 913, 1089 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad-icon-full rotate: false - xy: 979, 1155 + xy: 913, 1089 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1357,14 +1371,14 @@ power-node-icon-full index: -1 power-node-large rotate: false - xy: 1346, 1493 + xy: 1412, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-node-large-icon-full rotate: false - xy: 1346, 1493 + xy: 1412, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1392,14 +1406,14 @@ power-void-icon-full index: -1 rtg-generator rotate: false - xy: 1544, 1465 + xy: 1610, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-icon-full rotate: false - xy: 1544, 1465 + xy: 1610, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1441,28 +1455,28 @@ solar-panel-large-icon-full index: -1 surge-tower rotate: false - xy: 1045, 1419 + xy: 913, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-tower-icon-full rotate: false - xy: 1045, 1419 + xy: 913, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 913, 1287 + xy: 979, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator-icon-full rotate: false - xy: 913, 1287 + xy: 979, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1497,19 +1511,12 @@ thorium-reactor-lights index: -1 turbine-generator rotate: false - xy: 913, 1089 + xy: 979, 1089 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-icon-full - rotate: false - xy: 913, 1089 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -turbine-generator-liquid rotate: false xy: 979, 1089 size: 64, 64 @@ -1616,14 +1623,14 @@ cultivator-top index: -1 graphite-press rotate: false - xy: 1148, 1625 + xy: 1214, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press-icon-full rotate: false - xy: 1148, 1625 + xy: 1214, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1672,28 +1679,28 @@ item-void-icon-full index: -1 kiln rotate: false - xy: 1148, 1559 + xy: 1280, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-icon-full rotate: false - xy: 1148, 1559 + xy: 1280, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 1280, 1625 + xy: 1214, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 1280, 1625 + xy: 1214, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1742,42 +1749,42 @@ multi-press-icon-full index: -1 phase-weaver rotate: false - xy: 1544, 1531 + xy: 1610, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 1610, 1531 + xy: 1676, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 1742, 1527 + xy: 1808, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 1808, 1527 + xy: 1874, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-icon-full rotate: false - xy: 1808, 1527 + xy: 1874, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1874, 1527 + xy: 1940, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1805,91 +1812,91 @@ pump-liquid index: -1 pyratite-mixer rotate: false - xy: 1412, 1493 + xy: 1478, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pyratite-mixer-icon-full rotate: false - xy: 1412, 1493 + xy: 1478, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1273, 1427 + xy: 1339, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-icon-full rotate: false - xy: 1273, 1427 + xy: 1339, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1339, 1427 + xy: 1405, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1405, 1427 + xy: 1471, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-icon-full rotate: false - xy: 1405, 1427 + xy: 1471, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1603, 1399 + xy: 1669, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1669, 1399 + xy: 1735, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1735, 1395 + xy: 1801, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1801, 1395 + xy: 1867, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1933, 1395 + xy: 979, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 979, 1419 + xy: 1045, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2050,7 +2057,7 @@ hail-heat index: -1 lancer-heat rotate: false - xy: 1346, 1625 + xy: 1280, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2071,21 +2078,21 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 1940, 1461 + xy: 723, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 789, 98 + xy: 855, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 855, 98 + xy: 921, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2204,7 +2211,7 @@ ghoul-factory index: -1 phantom-factory-top rotate: false - xy: 1940, 1593 + xy: 1478, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2232,7 +2239,7 @@ revenant-factory-top index: -1 spirit-factory-top rotate: false - xy: 1537, 1399 + xy: 1603, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2337,14 +2344,14 @@ phase-wall-icon-full index: -1 phase-wall-large rotate: false - xy: 1478, 1531 + xy: 1544, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-wall-large-icon-full rotate: false - xy: 1478, 1531 + xy: 1544, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2393,28 +2400,28 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 789, 32 + xy: 855, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 855, 32 + xy: 921, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 921, 32 + xy: 1141, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1141, 1427 + xy: 1207, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2477,14 +2484,14 @@ surge-wall-icon-full index: -1 surge-wall-large rotate: false - xy: 913, 1419 + xy: 903, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall-large-icon-full rotate: false - xy: 913, 1419 + xy: 903, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2505,14 +2512,14 @@ thorium-wall-icon-full index: -1 thorium-wall-large rotate: false - xy: 979, 1287 + xy: 913, 1221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall-large-icon-full rotate: false - xy: 979, 1287 + xy: 913, 1221 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2547,14 +2554,14 @@ titanium-wall-icon-full index: -1 titanium-wall-large rotate: false - xy: 913, 1155 + xy: 979, 1155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titanium-wall-large-icon-full rotate: false - xy: 913, 1155 + xy: 979, 1155 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3751,14 +3758,14 @@ item-titanium-xxlarge index: -1 lancer rotate: false - xy: 1214, 1559 + xy: 1346, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 1280, 1559 + xy: 1412, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3863,7 +3870,7 @@ mech-icon-trident-ship index: -1 mechanical-drill-icon-full rotate: false - xy: 1346, 1559 + xy: 1412, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4108,14 +4115,14 @@ pebbles-icon-full index: -1 phantom-factory-icon-full rotate: false - xy: 1874, 1593 + xy: 1940, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 1676, 1531 + xy: 1742, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4129,7 +4136,7 @@ pine-icon-full index: -1 pneumatic-drill-icon-full rotate: false - xy: 1148, 1493 + xy: 1214, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4220,14 +4227,14 @@ saltrocks-icon-full index: -1 salvo rotate: false - xy: 1874, 1461 + xy: 1940, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 723, 98 + xy: 789, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4262,14 +4269,14 @@ sandrocks-icon-full index: -1 scatter rotate: false - xy: 921, 98 + xy: 723, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-full rotate: false - xy: 723, 32 + xy: 789, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4290,7 +4297,7 @@ scorch-icon-full index: -1 scrap-wall-large-icon-full rotate: false - xy: 1207, 1427 + xy: 1273, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4381,7 +4388,7 @@ spectre-icon-full index: -1 spirit-factory-icon-full rotate: false - xy: 1471, 1399 + xy: 1537, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4409,7 +4416,7 @@ spore-pine-icon-full index: -1 spore-press-icon-full rotate: false - xy: 1867, 1395 + xy: 1933, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4430,14 +4437,14 @@ stone-icon-full index: -1 swarmer rotate: false - xy: 903, 1353 + xy: 969, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-full rotate: false - xy: 969, 1353 + xy: 1035, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4759,7 +4766,7 @@ omega-mech index: -1 omega-mech-armor rotate: false - xy: 1676, 1597 + xy: 1742, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4948,49 +4955,49 @@ eradicator-leg index: -1 eruptor rotate: false - xy: 525, 54 + xy: 591, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 591, 54 + xy: 657, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 657, 54 + xy: 1082, 1617 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 1082, 1617 + xy: 1082, 1551 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 1082, 1551 + xy: 1075, 1485 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1082, 1551 + xy: 1075, 1485 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 1075, 1485 + xy: 1148, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5046,14 +5053,14 @@ spirit index: -1 titan rotate: false - xy: 913, 1221 + xy: 979, 1221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 979, 1221 + xy: 913, 1155 size: 64, 64 orig: 64, 64 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 3f42a52387..f58f65dd4c 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/uiskin.json b/core/assets/sprites/uiskin.json index 5c0e25d6e1..9cd87765d0 100644 --- a/core/assets/sprites/uiskin.json +++ b/core/assets/sprites/uiskin.json @@ -64,7 +64,7 @@ default: { over: button-over, disabled: button-disabled, - font: default-font, + font: default, fontColor: white, disabledFontColor: gray, down: button-down, @@ -72,7 +72,7 @@ }, node: { disabled: button, - font: default-font, + font: default, fontColor: white, disabledFontColor: gray, up: button-over, @@ -80,33 +80,33 @@ }, right: { over: button-right-over, - font: default-font, + font: default, fontColor: white, disabledFontColor: gray, down: button-right-down, up: button-right }, wave: { - font: default-font, + font: default, fontColor: white, disabledFontColor: gray, up: button-edge-4 }, clear: { over: flat-over, - font: default-font, + font: default, fontColor: white, disabledFontColor: gray, down: flat-over, up: flat }, discord: { - font: default-font, + font: default, fontColor: white, up: discord-banner }, info: { - font: default-font, + font: default, fontColor: white, up: info-banner }, @@ -114,7 +114,7 @@ down: whiteui, up: pane, over: flat-down, - font: default-font, + font: default, fontColor: white, disabledFontColor: gray }, @@ -122,15 +122,15 @@ down: flat-over, up: none, over: flat-over, - font: default-font, + font: default, fontColor: white, disabledFontColor: gray }, empty: { - font: default-font + font: default }, clear-toggle: { - font: default-font, + font: default, fontColor: white, checked: flat-down, down: flat-down, @@ -140,7 +140,7 @@ disabledFontColor: gray }, clear-toggle-menu: { - font: default-font, + font: default, fontColor: white, checked: flat-down, down: flat-down, @@ -150,7 +150,7 @@ disabledFontColor: gray } toggle: { - font: default-font, + font: default, fontColor: white, checked: button-down, down: button-down, @@ -256,18 +256,18 @@ }, WindowStyle: { default: { - titleFont: default-font, + titleFont: default, titleFontColor: accent }, dialog: { stageBackground: dialogDim, - titleFont: default-font, + titleFont: default, background: window-empty, titleFontColor: accent }, fulldialog: { stageBackground: dark, - titleFont: default-font, + titleFont: default, background: window-empty, titleFontColor: accent } @@ -295,17 +295,17 @@ }, LabelStyle: { default: { - font: default-font, + font: default, fontColor: white }, small: { - font: default-font, + font: default, fontColor: white } }, TextFieldStyle: { default: { - font: default-font-chat, + font: chat, fontColor: white, disabledFontColor: gray, disabledBackground: underline-disabled, @@ -313,17 +313,17 @@ background: underline, invalidBackground: underline-red, cursor: cursor, - messageFont: default-font, + messageFont: default, messageFontColor: gray } textarea: { - font: default-font-chat, + font: chat, fontColor: white, disabledFontColor: gray, selection: selection, background: underline, cursor: cursor, - messageFont: default-font, + messageFont: default, messageFontColor: gray } }, @@ -335,7 +335,7 @@ checkboxOver: check-over, checkboxOnDisabled: check-on-disabled, checkboxOffDisabled: check-disabled, - font: default-font, + font: default, fontColor: white, disabledFontColor: gray, diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 4437af136a..81058d17da 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1501,11 +1501,11 @@ public class Blocks implements ContentList{ for(int i = 0; i < 7; i++){ Tmp.v1.trns(b.rot(), i * 8f); float sl = Mathf.clamp(b.fout() - 0.5f) * (80f - i * 10); - Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); - Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); + Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); + Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); } - Shapes.tri(b.x, b.y, 20f * b.fout(), (rayLength + 50), b.rot()); - Shapes.tri(b.x, b.y, 20f * b.fout(), 10f, b.rot() + 180f); + Drawf.tri(b.x, b.y, 20f * b.fout(), (rayLength + 50), b.rot()); + Drawf.tri(b.x, b.y, 20f * b.fout(), 10f, b.rot() + 180f); Draw.reset(); } }); diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java index b8164ee735..ce165451c0 100644 --- a/core/src/io/anuke/mindustry/content/Fx.java +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -11,7 +11,7 @@ import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.graphics.Shapes; +import io.anuke.mindustry.graphics.Drawf; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item.Icon; @@ -672,16 +672,16 @@ public class Fx implements ContentList{ shootSmall = new Effect(8, e -> { Draw.color(Pal.lighterOrange, Pal.lightOrange, e.fin()); float w = 1f + 5 * e.fout(); - Shapes.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); + Drawf.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); + Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); Draw.reset(); }); shootHeal = new Effect(8, e -> { Draw.color(Pal.heal); float w = 1f + 5 * e.fout(); - Shapes.tri(e.x, e.y, w, 17f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); + Drawf.tri(e.x, e.y, w, 17f * e.fout(), e.rotation); + Drawf.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); Draw.reset(); }); @@ -698,16 +698,16 @@ public class Fx implements ContentList{ shootBig = new Effect(9, e -> { Draw.color(Pal.lighterOrange, Pal.lightOrange, e.fin()); float w = 1.2f + 7 * e.fout(); - Shapes.tri(e.x, e.y, w, 25f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); + Drawf.tri(e.x, e.y, w, 25f * e.fout(), e.rotation); + Drawf.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); Draw.reset(); }); shootBig2 = new Effect(10, e -> { Draw.color(Pal.lightOrange, Color.GRAY, e.fin()); float w = 1.2f + 8 * e.fout(); - Shapes.tri(e.x, e.y, w, 29f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f); + Drawf.tri(e.x, e.y, w, 29f * e.fout(), e.rotation); + Drawf.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f); Draw.reset(); }); @@ -829,7 +829,7 @@ public class Fx implements ContentList{ Draw.color(Pal.lancerLaser); for(int i : Mathf.signs){ - Shapes.tri(e.x, e.y, 4f * e.fout(), 29f, e.rotation + 90f * i); + Drawf.tri(e.x, e.y, 4f * e.fout(), 29f, e.rotation + 90f * i); } Draw.reset(); @@ -867,7 +867,7 @@ public class Fx implements ContentList{ Draw.color(Pal.lancerLaser); Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { - Shapes.tri(e.x + x, e.y + y, e.fslope() * 3f + 1, e.fslope() * 3f + 1, Mathf.angle(x, y)); + Drawf.tri(e.x + x, e.y + y, e.fslope() * 3f + 1, e.fslope() * 3f + 1, Mathf.angle(x, y)); }); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 746c3d1c18..0db1e578aa 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -148,11 +148,11 @@ public class UI implements ApplicationListener{ incremental = true; }}; - skin.add("outlined-font", generator.generateFont(outlined)); - skin.add("default-font", generator.generateFont(param)); - skin.add("default-font-chat", generator.generateFont(param)); - skin.getFont("default-font").getData().markupEnabled = true; - skin.getFont("default-font").setOwnsTexture(false); + skin.add("outline", generator.generateFont(outlined)); + skin.add("default", generator.generateFont(param)); + skin.add("chat", generator.generateFont(param)); + skin.getFont("default").getData().markupEnabled = true; + skin.getFont("default").setOwnsTexture(false); } @Override diff --git a/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java b/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java index da2f0fcfc9..76a66396e1 100644 --- a/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java @@ -90,7 +90,7 @@ public interface MinerTrait extends Entity{ Draw.color(Color.LIGHT_GRAY, Color.WHITE, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl)); - Shapes.laser(Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f); + Drawf.laser(Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f); if(unit instanceof Player && ((Player)unit).isLocal){ Lines.stroke(1f, Pal.accent); diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index afd3b08734..4dabc652c4 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -372,7 +372,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ } public void drawName(){ - BitmapFont font = Core.scene.skin.getFont("default-font"); + BitmapFont font = Core.scene.skin.getFont("default"); GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new); final float nameHeight = 11; final float textHeight = 15; diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index 0b05836ec8..53397352f8 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -399,7 +399,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ (3f + Mathf.absin(Time.time(), 5f, 1f)) * itemtime); if(number){ - Core.scene.skin.getFont("outlined-font").draw(item.amount + "", + Core.scene.skin.getFont("outline").draw(item.amount + "", x + Angles.trnsx(rotation + 180f, backTrns), y + Angles.trnsy(rotation + 180f, backTrns) - 3, Pal.accent, 0.25f * itemtime, false, Align.center diff --git a/core/src/io/anuke/mindustry/graphics/Shapes.java b/core/src/io/anuke/mindustry/graphics/Drawf.java similarity index 54% rename from core/src/io/anuke/mindustry/graphics/Shapes.java rename to core/src/io/anuke/mindustry/graphics/Drawf.java index 3ab13f8c74..f455660d0f 100644 --- a/core/src/io/anuke/mindustry/graphics/Shapes.java +++ b/core/src/io/anuke/mindustry/graphics/Drawf.java @@ -1,11 +1,42 @@ package io.anuke.mindustry.graphics; -import io.anuke.arc.Core; +import io.anuke.arc.*; +import io.anuke.arc.graphics.*; import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Tmp; +import io.anuke.arc.math.*; +import io.anuke.arc.util.*; -public class Shapes{ +public class Drawf{ + + public static void dashCircle(float x, float y, float rad, Color color){ + Lines.stroke(3f, Pal.gray); + Lines.dashCircle(x, y, rad); + Lines.stroke(1f, color); + Lines.dashCircle(x, y, rad); + Draw.reset(); + } + + public static void circles(float x, float y, float rad, Color color){ + int vertices = 30; + Lines.stroke(3f, Pal.gray); + Lines.poly(x, y, vertices, rad); + Lines.stroke(1f, color); + Lines.poly(x, y, vertices, rad); + Draw.reset(); + } + + public static void arrow(float x, float y, float x2, float y2, float length, float radius){ + float angle = Angles.angle(x, y, x2, y2); + float space = 2f; + Tmp.v1.set(x2, y2).sub(x, y).limit(length); + float vx = Tmp.v1.x + x, vy = Tmp.v1.y + y; + + Draw.color(Pal.gray); + Fill.poly(vx, vy, 3, radius + space, angle); + Draw.color(Pal.accent); + Fill.poly(vx, vy, 3, radius, angle); + Draw.color(); + } public static void laser(TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2, float scale){ laser(line, edge, x, y, x2, y2, Mathf.angle(x2 - x, y2 - y), scale); diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index bccb17ebb7..4c313567cc 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -105,7 +105,7 @@ public class OverlayRenderer{ Draw.reset(); - //draw selected block bars and info + //draw selected block if(input.block == null && !Core.scene.hasMouse()){ Vector2 vec = Core.input.mouseWorld(input.getMouseX(), input.getMouseY()); Tile tile = world.ltileWorld(vec.x, vec.y); @@ -115,6 +115,7 @@ public class OverlayRenderer{ } } + //draw selection overlay when dropping item if(input.isDroppingItem()){ Vector2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY()); float size = 8; @@ -125,9 +126,12 @@ public class OverlayRenderer{ Tile tile = world.ltileWorld(v.x, v.y); if(tile != null && tile.interactable(player.getTeam()) && tile.block().acceptStack(player.item().item, player.item().amount, tile, player) > 0){ - Draw.color(Pal.place); - Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1 + Mathf.absin(Time.time(), 5f, 1f)); - Draw.color(); + Lines.stroke(3f, Pal.gray); + Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 3 + Mathf.absin(Time.time(), 5f, 1f)); + Lines.stroke(1f, Pal.place); + Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 2 + Mathf.absin(Time.time(), 5f, 1f)); + Draw.reset(); + } } } diff --git a/core/src/io/anuke/mindustry/ui/Bar.java b/core/src/io/anuke/mindustry/ui/Bar.java index 4e9a87659d..1fbe5b02f4 100644 --- a/core/src/io/anuke/mindustry/ui/Bar.java +++ b/core/src/io/anuke/mindustry/ui/Bar.java @@ -71,7 +71,7 @@ public class Bar extends Element{ Draw.color(); - BitmapFont font = Core.scene.skin.getFont("default-font"); + BitmapFont font = Core.scene.skin.getFont("default"); GlyphLayout lay = Pools.obtain(GlyphLayout.class, GlyphLayout::new); lay.setText(font, name); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index d76a25a981..f67a9b2fec 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -190,7 +190,7 @@ public class FileChooser extends FloatingDialog{ GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new); - layout.setText(Core.scene.skin.getFont("default-font"), navigation.getText()); + layout.setText(Core.scene.skin.getFont("default"), navigation.getText()); if(layout.width < navigation.getWidth()){ navigation.setCursorPosition(0); diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java index 28b1eff9ba..2f37bb994f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java @@ -50,7 +50,7 @@ public class ChatFragment extends Table{ super(); setFillParent(true); - font = scene.skin.getFont("default-font"); + font = scene.skin.getFont("default"); visible(() -> { if(!Net.active() && messages.size > 0){ @@ -106,7 +106,7 @@ public class ChatFragment extends Table{ chatfield = new TextField("", new TextField.TextFieldStyle(scene.skin.get(TextField.TextFieldStyle.class))); chatfield.setFilter((field, c) -> field.getText().length() < Vars.maxTextLength); chatfield.getStyle().background = null; - chatfield.getStyle().font = scene.skin.getFont("default-font-chat"); + chatfield.getStyle().font = scene.skin.getFont("chat"); chatfield.getStyle().fontColor = Color.WHITE; chatfield.setStyle(chatfield.getStyle()); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index de5923a99b..c25fdbe63e 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -228,7 +228,7 @@ public class Block extends BlockStorage{ if(renderer.pixelator.enabled()) return; Color color = valid ? Pal.accent : Pal.remove; - BitmapFont font = Core.scene.skin.getFont("outlined-font"); + BitmapFont font = Core.scene.skin.getFont("outline"); GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new); boolean ints = font.usesIntegerPositions(); font.setUseIntegerPositions(false); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index 887762ba9b..87237fafc1 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -9,7 +9,7 @@ import io.anuke.arc.util.*; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Pal; +import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.meta.*; @@ -101,9 +101,7 @@ public class MendProjector extends Block{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - Draw.color(Pal.accent); - Lines.dashCircle(x * tilesize, y * tilesize, range); - Draw.color(); + Drawf.dashCircle(x * tilesize, y * tilesize, range, Pal.accent); } @Override @@ -111,9 +109,7 @@ public class MendProjector extends Block{ MendEntity entity = tile.entity(); float realRange = range + entity.phaseHeat * phaseRangeBoost; - Draw.color(color); - Lines.dashCircle(tile.drawx(), tile.drawy(), realRange); - Draw.color(); + Drawf.dashCircle(tile.drawx(), tile.drawy(), realRange, color); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index 956560ddf2..3140255a30 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -7,7 +7,7 @@ import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Pal; +import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.meta.*; @@ -52,9 +52,7 @@ public class OverdriveProjector extends Block{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - Draw.color(Pal.accent); - Lines.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range); - Draw.color(); + Drawf.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range, Pal.accent); } @Override @@ -114,9 +112,7 @@ public class OverdriveProjector extends Block{ OverdriveEntity entity = tile.entity(); float realRange = range + entity.phaseHeat * phaseRangeBoost; - Draw.color(color); - Lines.dashCircle(tile.drawx(), tile.drawy(), realRange); - Draw.color(); + Drawf.dashCircle(tile.drawx(), tile.drawy(), realRange, color); } @Override @@ -128,9 +124,7 @@ public class OverdriveProjector extends Block{ Draw.color(color, phase, entity.phaseHeat); Draw.alpha(entity.heat * Mathf.absin(Time.time(), 10f, 1f) * 0.5f); - //Draw.blend(Blending.additive); Draw.rect(topRegion, tile.drawx(), tile.drawy()); - //Draw.blend(); Draw.alpha(1f); Lines.stroke((2f * f + 0.2f) * entity.heat); Lines.square(tile.drawx(), tile.drawy(), (1f - f) * 8f); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 77ec838ba6..38352190c7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -18,8 +18,7 @@ import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Pal; +import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.*; @@ -130,16 +129,12 @@ public abstract class Turret extends Block{ @Override public void drawSelect(Tile tile){ - Draw.color(tile.getTeam().color); - Lines.dashCircle(tile.drawx(), tile.drawy(), range); - Draw.reset(); + Drawf.dashCircle(tile.drawx(), tile.drawy(), range, tile.getTeam().color); } @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - Lines.stroke(1f, Pal.placing); - Lines.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range); - Draw.color(); + Drawf.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range, Pal.placing); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 73657741da..461f294c8f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -1,28 +1,22 @@ package io.anuke.mindustry.world.blocks.distribution; -import io.anuke.annotations.Annotations.Loc; -import io.anuke.annotations.Annotations.Remote; -import io.anuke.arc.Core; -import io.anuke.arc.collection.OrderedSet; +import io.anuke.annotations.Annotations.*; +import io.anuke.arc.*; +import io.anuke.arc.collection.*; import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Time; -import io.anuke.arc.util.pooling.Pool.Poolable; -import io.anuke.arc.util.pooling.Pools; -import io.anuke.mindustry.content.Bullets; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.Effects.Effect; -import io.anuke.mindustry.entities.bullet.Bullet; -import io.anuke.mindustry.entities.type.Player; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import io.anuke.arc.math.*; +import io.anuke.arc.util.*; +import io.anuke.arc.util.pooling.Pool.*; +import io.anuke.arc.util.pooling.*; +import io.anuke.mindustry.content.*; +import io.anuke.mindustry.entities.*; +import io.anuke.mindustry.entities.Effects.*; +import io.anuke.mindustry.entities.bullet.*; +import io.anuke.mindustry.entities.type.*; +import io.anuke.mindustry.gen.*; +import io.anuke.mindustry.graphics.*; +import io.anuke.mindustry.type.*; +import io.anuke.mindustry.world.*; import java.io.*; @@ -167,9 +161,7 @@ public class MassDriver extends Block{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - Draw.color(Pal.accent); - Lines.dashCircle(x * tilesize, y*tilesize, range); - Draw.color(); + Drawf.dashCircle(x * tilesize, y*tilesize, range, Pal.accent); } @Override @@ -178,21 +170,17 @@ public class MassDriver extends Block{ Draw.color(Pal.accent); Lines.stroke(1f); - Lines.poly(tile.drawx(), tile.drawy(), 20, (tile.block().size / 2f + 1) * tilesize + sin); + Drawf.circles(tile.drawx(), tile.drawy(), (tile.block().size / 2f + 1) * tilesize + sin - 2f, Pal.accent); MassDriverEntity entity = tile.entity(); if(linkValid(tile)){ Tile target = world.tile(entity.link); - - Draw.color(Pal.place); - Lines.poly(target.drawx(), target.drawy(), 20, (target.block().size / 2f + 1) * tilesize + sin); - Draw.reset(); + Drawf.circles(target.drawx(), target.drawy(), (target.block().size / 2f + 1) * tilesize + sin - 2f, Pal.place); + Drawf.arrow(tile.drawx(), tile.drawy(), target.drawx(), target.drawy(), size * tilesize + sin, 4f + sin); } - Draw.color(Pal.accent); - Lines.dashCircle(tile.drawx(), tile.drawy(), range); - Draw.color(); + Drawf.dashCircle(tile.drawx(), tile.drawy(), range, Pal.accent); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 03b23b0568..1167643ced 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -257,7 +257,7 @@ public class PowerNode extends PowerBlock{ y2 += t2.y; Draw.color(Pal.powerLight, Color.WHITE, Mathf.absin(Time.time(), 8f, 0.3f) + 0.2f); - Shapes.laser(laser, laserEnd, x1, y1, x2, y2, 0.6f); + Drawf.laser(laser, laserEnd, x1, y1, x2, y2, 0.6f); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index 50fc1c3e56..089eb784c7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -113,7 +113,7 @@ public class Drill extends Block{ if(entity.dominantItem != null && drawMineItem){ Draw.color(entity.dominantItem.color); - Fill.square(tile.drawx(), tile.drawy(), 1f); + Draw.rect("drill-top", tile.drawx(), tile.drawy(), 1f); Draw.color(); } } @@ -152,6 +152,19 @@ public class Drill extends Block{ } } + @Override + public void drawSelect(Tile tile){ + DrillEntity entity = tile.entity(); + + if(entity.dominantItem != null){ + float dx = tile.drawx() - size * tilesize/2f, dy = tile.drawy() + size * tilesize/2f; + Draw.mixcol(Color.DARK_GRAY, 1f); + Draw.rect(entity.dominantItem.icon(Item.Icon.large), dx, dy); + Draw.reset(); + Draw.rect(entity.dominantItem.icon(Item.Icon.medium), dx, dy); + } + } + @Override public void setStats(){ super.setStats(); diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java index a1fae03e22..28c700caee 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java @@ -55,9 +55,7 @@ public class RepairPoint extends Block{ @Override public void drawSelect(Tile tile){ - Draw.color(Pal.accent); - Lines.dashCircle(tile.drawx(), tile.drawy(), repairRadius); - Draw.color(); + Drawf.dashCircle(tile.drawx(), tile.drawy(), repairRadius, Pal.accent); } @Override @@ -82,7 +80,7 @@ public class RepairPoint extends Block{ float len = 5f; Draw.color(Color.valueOf("e8ffd7")); - Shapes.laser(laser, laserEnd, + Drawf.laser(laser, laserEnd, tile.drawx() + Angles.trnsx(ang, len), tile.drawy() + Angles.trnsy(ang, len), entity.target.x, entity.target.y, entity.strength); Draw.color();