diff --git a/core/assets-raw/fontgen/config.json b/core/assets-raw/fontgen/config.json index 4f1803a429..b0e68d3757 100644 --- a/core/assets-raw/fontgen/config.json +++ b/core/assets-raw/fontgen/config.json @@ -488,20 +488,6 @@ "discord-logo-white" ] }, - { - "uid": "0bdc0ffef9e3926bd1bc07029cdbd444", - "css": "terrain", - "code": 59416, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M343.1 49.2Q363.6 29.1 384 29.1 404.4 29.1 424.9 49.2 445.3 69.3 465.7 89.4 486.2 109.5 506.6 129.6 527 149.7 547.5 169.8 567.9 189.9 588.3 210.1 608.8 230.2 629.2 230.2 649.6 230.2 670.1 210.1 690.5 189.9 711 189.9 731.4 189.9 751.8 210.1 772.3 230.2 792.7 250.3 813.1 270.4 833.6 290.5 854 310.6 874.4 330.7 894.9 350.8 915.3 370.9 935.7 391 956.2 411.1 976.6 431.2 986.8 461.4 997 491.6 997 531.8 997 572 997 612.2 997 652.4 997 692.6 997 732.9 997 773.1 997 813.3 997 853.5 997 893.7 986.8 923.9 976.6 954 946 964.1 915.3 974.2 874.4 974.2 833.6 974.2 792.7 974.2 751.8 974.2 711 974.2 670.1 974.2 629.2 974.2 588.3 974.2 547.5 974.2 506.6 974.2 465.7 974.2 424.9 974.2 384 974.2 343.1 974.2 302.2 974.2 261.4 974.2 220.5 974.2 179.6 974.2 138.8 974.2 97.9 974.2 67.2 964.1 36.6 954 26.4 923.9 16.2 893.7 16.2 853.5 16.2 813.3 16.2 773.1 16.2 732.9 16.2 692.6 16.2 652.4 16.2 612.2 16.2 572 16.2 531.8 16.2 491.6 16.2 451.3 16.2 411.1 26.4 381 36.6 350.8 57 330.7 77.5 310.6 97.9 290.5 118.3 270.4 138.8 250.3 159.2 230.2 179.6 210.1 200.1 189.9 220.5 169.8 240.9 149.7 261.4 129.6 281.8 109.5 302.2 89.4 322.7 69.3 343.1 49.2M792.7 893.7Q833.6 893.7 864.2 883.7 894.9 873.6 905.1 843.4 915.3 813.3 915.3 773.1 915.3 732.9 915.3 692.6 915.3 652.4 915.3 612.2 915.3 572 905.1 541.8 894.9 511.7 874.4 491.6 854 471.5 833.6 451.3 813.1 431.2 792.7 411.1 772.3 391 751.8 370.9 731.4 350.8 711 350.8 690.5 350.8 670.1 370.9 649.6 391 629.2 391 608.8 391 588.3 370.9 567.9 350.8 547.5 330.7 527 310.6 506.6 290.5 486.2 270.4 465.7 250.3 445.3 230.2 424.9 210.1 404.4 189.9 384 189.9 363.6 189.9 343.1 210.1 322.7 230.2 302.2 250.3 281.8 270.4 261.4 290.5 240.9 310.6 220.5 330.7 200.1 350.8 179.6 370.9 159.2 391 138.8 411.1 118.3 431.2 108.1 461.4 97.9 491.6 97.9 531.8 97.9 572 97.9 612.2 97.9 652.4 97.9 692.6 97.9 732.9 97.9 773.1 97.9 813.3 108.1 843.4 118.3 873.6 149 883.7 179.6 893.7 220.5 893.7 261.4 893.7 302.2 893.7 343.1 893.7 384 893.7 424.9 893.7 465.7 893.7 506.6 893.7 547.5 893.7 588.3 893.7 629.2 893.7 670.1 893.7 711 893.7 751.8 893.7 792.7 893.7", - "width": 1021 - }, - "search": [ - "terrain" - ] - }, { "uid": "777bee87001d4219672e09caa12e1c78", "css": "crafting", @@ -628,12 +614,6 @@ "save" ] }, - { - "uid": "a6b6f85116fc55e4a7c83d66973035a7", - "css": "exit", - "code": 61485, - "src": "mfglabs" - }, { "uid": "dd6df3b754e8d0dbf09d9b24088f0442", "css": "box", @@ -787,6 +767,34 @@ "search": [ "host" ] + }, + { + "uid": "496a07ca2bfa65f351c24b819fae0362", + "css": "exit", + "code": 59416, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M208.3 0C180.6 0 156.2 3.5 135.4 10.4 114.6 17.4 97.2 27.8 83.3 41.7L41.7 83.3C27.8 97.2 17.4 114.6 10.4 135.4 3.5 156.2 0 180.6 0 208.3V291.7 375 458.3 541.7 625 708.3 791.7C0 819.4 3.5 843.7 10.4 864.6 17.4 885.4 27.8 902.8 41.7 916.7L83.3 958.3C97.2 972.2 114.6 982.6 135.4 989.6 156.2 996.5 180.6 1000 208.3 1000H291.7 375 458.3 541.7 625 708.3C736.1 1000 760.4 996.5 781.3 989.6 802.1 982.6 819.4 972.2 833.3 958.3L875 916.7C888.9 902.8 895.8 888.9 895.8 875 895.8 861.1 885.4 850.7 864.6 843.7 843.8 836.8 819.4 833.3 791.7 833.3H708.3 625 541.7 458.3 375 291.7C263.9 833.3 239.6 829.9 218.7 822.9 197.9 816 184 802.1 177.1 781.2 170.1 760.4 166.7 736.1 166.7 708.3V625 541.7 458.3 375 291.7C166.7 263.9 170.1 239.6 177.1 218.7 184 197.9 197.9 184 218.7 177.1 239.6 170.1 263.9 166.7 291.7 166.7H375 458.3 541.7 625 708.3 791.7C819.4 166.7 843.8 163.2 864.6 156.2 885.4 149.3 895.8 138.9 895.8 125 895.8 111.1 888.9 97.2 875 83.3L833.3 41.7C819.4 27.8 802.1 17.4 781.3 10.4 760.4 3.5 736.1 0 708.3 0H625 541.7 458.3 375 291.7ZM791.7 270.8C777.8 270.8 767.4 281.2 760.4 302.1L739.6 364.6C732.6 385.4 718.8 399.3 697.9 406.2 677.1 413.2 652.8 416.7 625 416.7H541.7 458.3C430.6 416.7 406.2 420.1 385.4 427.1 364.6 434 350.7 447.9 343.7 468.7 336.8 489.6 336.8 510.4 343.7 531.2 350.7 552.1 364.6 566 385.4 572.9 406.2 579.9 430.6 583.3 458.3 583.3H541.7 625C652.8 583.3 677.1 586.8 697.9 593.7 718.8 600.7 732.6 614.6 739.6 635.4L760.4 697.9C767.4 718.7 777.8 729.2 791.7 729.2 805.6 729.2 819.4 722.2 833.3 708.3L875 666.7 916.7 625 958.3 583.3C972.2 569.4 982.6 552.1 989.6 531.2 996.5 510.4 996.5 489.6 989.6 468.7 982.6 447.9 972.2 430.6 958.3 416.7L916.7 375 875 333.3 833.3 291.7C819.4 277.8 805.6 270.8 791.7 270.8Z", + "width": 995 + }, + "search": [ + "exit" + ] + }, + { + "uid": "06a8fb7f89285292492baf4e4f3657be", + "css": "terrain", + "code": 59475, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M340.4 21.3Q361.7 0 383 0 404.3 0 425.5 21.3 446.8 42.6 468.1 63.8 489.4 85.1 510.6 106.4 531.9 127.7 553.2 148.9 574.5 170.2 595.7 191.5 617 212.8 638.3 212.8 659.6 212.8 680.9 191.5 702.1 170.2 723.4 170.2 744.7 170.2 766 191.5 787.2 212.8 808.5 234 829.8 255.3 851.1 276.6 872.3 297.9 893.6 319.1 914.9 340.4 936.2 361.7 957.4 383 978.7 404.3 1000 425.5 1010.6 457.4 1021.3 489.4 1021.3 531.9 1021.3 574.5 1021.3 617 1021.3 659.6 1021.3 702.1 1021.3 744.7 1021.3 787.2 1021.3 829.8 1021.3 872.3 1021.3 914.9 1010.6 946.8 1000 978.7 968.1 989.4 936.2 1000 893.6 1000 851.1 1000 808.5 1000 766 1000 723.4 1000 680.9 1000 638.3 1000 595.7 1000 553.2 1000 510.6 1000 468.1 1000 425.5 1000 383 1000 340.4 1000 297.9 1000 255.3 1000 212.8 1000 170.2 1000 127.7 1000 85.1 1000 53.2 989.4 21.3 978.7 10.6 946.8 0 914.9 0 872.3 0 829.8 0 787.2 0 744.7 0 702.1 0 659.6 0 617 0 574.5 0 531.9 0 489.4 0 446.8 0 404.3 10.6 372.3 21.3 340.4 42.6 319.1 63.8 297.9 85.1 276.6 106.4 255.3 127.7 234 148.9 212.8 170.2 191.5 191.5 170.2 212.8 148.9 234 127.7 255.3 106.4 276.6 85.1 297.9 63.8 319.1 42.6 340.4 21.3M808.5 914.9Q851.1 914.9 883 904.3 914.9 893.6 925.5 861.7 936.2 829.8 936.2 787.2 936.2 744.7 936.2 702.1 936.2 659.6 936.2 617 936.2 574.5 925.5 542.6 914.9 510.6 893.6 489.4 872.3 468.1 851.1 446.8 829.8 425.5 808.5 404.3 787.2 383 766 361.7 744.7 340.4 723.4 340.4 702.1 340.4 680.9 361.7 659.6 383 638.3 383 617 383 595.7 361.7 574.5 340.4 553.2 319.1 531.9 297.9 510.6 276.6 489.4 255.3 468.1 234 446.8 212.8 425.5 191.5 404.3 170.2 383 170.2 361.7 170.2 340.4 191.5 319.1 212.8 297.9 234 276.6 255.3 255.3 276.6 234 297.9 212.8 319.1 191.5 340.4 170.2 361.7 148.9 383 127.7 404.3 106.4 425.5 95.7 457.4 85.1 489.4 85.1 531.9 85.1 574.5 85.1 617 85.1 659.6 85.1 702.1 85.1 744.7 85.1 787.2 85.1 829.8 95.7 861.7 106.4 893.6 138.3 904.3 170.2 914.9 212.8 914.9 255.3 914.9 297.9 914.9 340.4 914.9 383 914.9 425.5 914.9 468.1 914.9 510.6 914.9 553.2 914.9 595.7 914.9 638.3 914.9 680.9 914.9 723.4 914.9 766 914.9 808.5 914.9", + "width": 1021 + }, + "search": [ + "terrain" + ] } ] } \ No newline at end of file diff --git a/core/assets-raw/fontgen/icons/exit.svg b/core/assets-raw/fontgen/icons/exit.svg new file mode 100644 index 0000000000..2a9a6ddc8f --- /dev/null +++ b/core/assets-raw/fontgen/icons/exit.svg @@ -0,0 +1,63 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/core/assets-raw/fontgen/icons/terrain.svg b/core/assets-raw/fontgen/icons/terrain.svg index efaa8a3889..acb45bd0de 100644 --- a/core/assets-raw/fontgen/icons/terrain.svg +++ b/core/assets-raw/fontgen/icons/terrain.svg @@ -43,20 +43,20 @@ inkscape:window-height="1318" id="namedview4" showgrid="false" - inkscape:zoom="52.678571" - inkscape:cx="6.3777292" - inkscape:cy="4.2601204" + inkscape:zoom="37.249375" + inkscape:cx="-0.42986742" + inkscape:cy="6.6173436" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="g842" /> + inkscape:current-layer="g18" /> diff --git a/core/assets/fonts/font.ttf b/core/assets/fonts/font.ttf index 2827ed1e35..06002ee2ab 100644 Binary files a/core/assets/fonts/font.ttf and b/core/assets/fonts/font.ttf differ diff --git a/core/assets/fonts/icon.ttf b/core/assets/fonts/icon.ttf index 80724dac88..f29f1b60fe 100644 Binary files a/core/assets/fonts/icon.ttf and b/core/assets/fonts/icon.ttf differ diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java index 8248e90097..e81f5014e2 100644 --- a/core/src/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/mindustry/ui/fragments/MenuFragment.java @@ -106,7 +106,7 @@ public class MenuFragment extends Fragment{ join = new MobileButton(Icon.add, "$joingame", () -> checkPlay(ui.join::show)), editor = new MobileButton(Icon.terrain, "$editor", () -> checkPlay(ui.maps::show)), tools = new MobileButton(Icon.settings, "$settings", ui.settings::show), - mods = new MobileButton(Icon.fileText, "$mods", ui.mods::show), + mods = new MobileButton(Icon.book, "$mods", ui.mods::show), donate = new MobileButton(Icon.link, "$website", () -> Core.net.openURI("https://anuke.itch.io/mindustry")), exit = new MobileButton(Icon.exit, "$quit", () -> Core.app.exit()); @@ -172,7 +172,7 @@ public class MenuFragment extends Fragment{ new Buttoni("$tutorial", Icon.info, () -> checkPlay(control::playTutorial)) ), new Buttoni("$editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new Buttoni("$workshop", Icon.save, platform::openWorkshop) : null, - new Buttoni(Core.bundle.get("mods") + "\n" + Core.bundle.get("mods.alpha"), Icon.fileText, ui.mods::show), + new Buttoni(Core.bundle.get("mods"), Icon.bookOpen, ui.mods::show), //not enough space for this button //new Buttoni("$schematics", Icon.paste, ui.schematics::show), new Buttoni("$settings", Icon.settings, ui.settings::show),