diff --git a/core/assets-raw/fontgen/config.json b/core/assets-raw/fontgen/config.json index 16bc4ed7d2..49e6795cc5 100644 --- a/core/assets-raw/fontgen/config.json +++ b/core/assets-raw/fontgen/config.json @@ -72,24 +72,12 @@ "code": 59401, "src": "typicons" }, - { - "uid": "dd4b00255957a608953c409346e7d7fb", - "css": "warning", - "code": 59402, - "src": "typicons" - }, { "uid": "cdfalpadi7huwv9ah4fef2gpfpb4c6qm", "css": "resize", "code": 59403, "src": "typicons" }, - { - "uid": "j6xzwioffey3gxe90yx3ie56j5dlt902", - "css": "block_", - "code": 59404, - "src": "typicons" - }, { "uid": "i7r8vgyqewsy2rlx0xhawybpw5uyss3z", "css": "wrench", @@ -309,7 +297,7 @@ { "uid": "4bad23bc52aaddaac37da019e46b6f6b", "css": "discord_", - "code": 59406, + "code": 59405, "src": "custom_icons", "selected": true, "svg": { @@ -359,7 +347,7 @@ { "uid": "dd1e5d774d1ced68cb7c439d8ed102f5", "css": "logic", - "code": 59412, + "code": 59406, "src": "custom_icons", "selected": true, "svg": { @@ -373,7 +361,7 @@ { "uid": "d0ff49daa25603348abe7e3f7c70be56", "css": "distribution", - "code": 59415, + "code": 59412, "src": "custom_icons", "selected": true, "svg": { @@ -387,7 +375,7 @@ { "uid": "47efe0c5ca937e0def7264347af501ed", "css": "hammer", - "code": 59419, + "code": 59415, "src": "custom_icons", "selected": true, "svg": { @@ -401,7 +389,7 @@ { "uid": "b41aaf351112113e5f50cb8b977d6293", "css": "save", - "code": 59434, + "code": 59419, "src": "custom_icons", "selected": true, "svg": { @@ -415,7 +403,7 @@ { "uid": "e67fcdbfc21c4f395a4f78e2a56c5060", "css": "link", - "code": 59435, + "code": 59420, "src": "custom_icons", "selected": true, "svg": { @@ -429,7 +417,7 @@ { "uid": "3679836be9338f58f8a74e4352dc0bdd", "css": "itchio", - "code": 59436, + "code": 59434, "src": "custom_icons", "selected": true, "svg": { @@ -443,7 +431,7 @@ { "uid": "a3f0c795c6e6506c0bf33e4d344676d5", "css": "line", - "code": 59437, + "code": 59435, "src": "custom_icons", "selected": true, "svg": { @@ -457,7 +445,7 @@ { "uid": "f54e291de7ca06c5101bdeb7e81d6b7f", "css": "admin", - "code": 59440, + "code": 59436, "src": "custom_icons", "selected": true, "svg": { @@ -471,7 +459,7 @@ { "uid": "53efee2384cbefdc94210fb1b4972ed6", "css": "spray-1", - "code": 59468, + "code": 59437, "src": "custom_icons", "selected": true, "svg": { @@ -485,7 +473,7 @@ { "uid": "98cdb7c2e72493434efd910db1f62b29", "css": "crafting", - "code": 59469, + "code": 59440, "src": "custom_icons", "selected": true, "svg": { @@ -499,7 +487,7 @@ { "uid": "dc6530e8b375575b7df2040d108e5368", "css": "fill", - "code": 59474, + "code": 59468, "src": "custom_icons", "selected": true, "svg": { @@ -513,7 +501,7 @@ { "uid": "06281408f2d30c261c9129e3f167204f", "css": "defense", - "code": 59475, + "code": 59469, "src": "custom_icons", "selected": true, "svg": { @@ -527,7 +515,7 @@ { "uid": "88103366af75e17d8a3921ee1fb8616c", "css": "paste", - "code": 59483, + "code": 59474, "src": "custom_icons", "selected": true, "svg": { @@ -541,7 +529,7 @@ { "uid": "c0d81c71f616c8324a78c54d994af313", "css": "effect", - "code": 59484, + "code": 59475, "src": "custom_icons", "selected": true, "svg": { @@ -555,7 +543,7 @@ { "uid": "65c4e52c12c9bed7754878f76c4a0acd", "css": "book", - "code": 59485, + "code": 59483, "src": "custom_icons", "selected": true, "svg": { @@ -569,7 +557,7 @@ { "uid": "cee021b830261625d59e49c48a86102c", "css": "liquid", - "code": 59486, + "code": 59484, "src": "custom_icons", "selected": true, "svg": { @@ -583,7 +571,7 @@ { "uid": "afcfe6416bfdb70c40ede7bf666667d9", "css": "host", - "code": 59487, + "code": 59485, "src": "custom_icons", "selected": true, "svg": { @@ -597,7 +585,7 @@ { "uid": "060ea30307b6e6ab4706682853ec9d21", "css": "production", - "code": 59489, + "code": 59486, "src": "custom_icons", "selected": true, "svg": { @@ -611,7 +599,7 @@ { "uid": "32084a9ecd9e7693002b13e274a84240", "css": "exit", - "code": 59405, + "code": 59487, "src": "custom_icons", "selected": true, "svg": { @@ -625,7 +613,7 @@ { "uid": "7ee2f2d80faaf4bce9af14bbb6cf1f07", "css": "mode-pvp", - "code": 59420, + "code": 59489, "src": "custom_icons", "selected": true, "svg": { @@ -636,24 +624,10 @@ "mode-pvp" ] }, - { - "uid": "bc0f646b936f7dc761ce8efe1201d450", - "css": "terrain", - "code": 59495, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M346.2 0L307.7 38.5 269.2 76.9 230.8 115.4 192.3 153.8 153.8 192.3 115.4 230.8 76.9 269.2 38.5 307.7 0 346.2V423.1 500 576.9 653.8 730.8 807.7 884.6 961.5L38.5 1000H115.4 192.3 269.2 346.2 423.1 500 576.9 653.8 730.8 807.7 884.6 961.5 1038.5L1076.9 961.5V884.6 807.7 730.8 653.8 576.9 500 423.1L1038.5 384.6 1000 346.2 961.5 307.7 923.1 269.2 884.6 230.8 846.2 192.3 807.7 153.8 769.2 192.3 730.8 230.8 692.3 269.2 653.8 307.7 615.4 269.2 576.9 230.8 538.5 192.3 500 153.8 461.5 115.4 423.1 76.9 384.6 38.5ZM346.2 153.8L384.6 192.3 423.1 230.8 461.5 269.2 500 307.7 538.5 346.2 576.9 384.6 615.4 423.1 653.8 461.5 692.3 423.1 730.8 384.6 769.2 346.2 807.7 307.7 846.2 346.2 884.6 384.6 923.1 423.1 961.5 461.5 1000 500V576.9 653.8 730.8 807.7 884.6L961.5 923.1H884.6 807.7 730.8 653.8 576.9 500 423.1 346.2 269.2 192.3 115.4L76.9 884.6V807.7 730.8 653.8 576.9 500 423.1L115.4 384.6 153.8 346.2 192.3 307.7 230.8 269.2 269.2 230.8 307.7 192.3Z", - "width": 1077 - }, - "search": [ - "terrain" - ] - }, { "uid": "fca174e630aceac2289d86197d04ac6d", "css": "mode-attack", - "code": 59496, + "code": 59493, "src": "custom_icons", "selected": true, "svg": { @@ -667,7 +641,7 @@ { "uid": "d2dae093c8eaeecb8b86b9b3137d5e59", "css": "refresh-1", - "code": 59497, + "code": 59495, "src": "custom_icons", "selected": true, "svg": { @@ -681,7 +655,7 @@ { "uid": "279c989fcea20393a5b83eb9e598d59a", "css": "none", - "code": 59498, + "code": 59496, "src": "custom_icons", "selected": true, "svg": { @@ -695,7 +669,7 @@ { "uid": "e3b561a775bcb150f6b8ea719a465345", "css": "pencil_", - "code": 59499, + "code": 59497, "src": "custom_icons", "selected": true, "svg": { @@ -709,7 +683,7 @@ { "uid": "8b4d5e8da6aa68188b631aaf252a9e14", "css": "refresh", - "code": 59500, + "code": 59498, "src": "custom_icons", "selected": true, "svg": { @@ -723,7 +697,7 @@ { "uid": "44e902e72564bc6d9a9eb1d174208d35", "css": "mode-survival", - "code": 59501, + "code": 59499, "src": "custom_icons", "selected": true, "svg": { @@ -737,7 +711,7 @@ { "uid": "9e23184b166b551c5fb0bd5ee3a4dc2c", "css": "command-rally", - "code": 59502, + "code": 59500, "src": "custom_icons", "selected": true, "svg": { @@ -751,7 +725,7 @@ { "uid": "5b2609713ca347b272beb0bc5f49c42e", "css": "units", - "code": 59503, + "code": 59501, "src": "custom_icons", "selected": true, "svg": { @@ -765,7 +739,7 @@ { "uid": "de2b09bde33670e3502e3e07b936e098", "css": "command-attack", - "code": 59504, + "code": 59502, "src": "custom_icons", "selected": true, "svg": { @@ -779,7 +753,7 @@ { "uid": "343b1d6c67d1c2bdc279b8df809fb3bf", "css": "trash", - "code": 59505, + "code": 59503, "src": "custom_icons", "selected": true, "svg": { @@ -793,7 +767,7 @@ { "uid": "f82a79ee879412f7ddf7c517c6958d45", "css": "chat", - "code": 59506, + "code": 59504, "src": "custom_icons", "selected": true, "svg": { @@ -807,7 +781,7 @@ { "uid": "1a406c75ee5adac112504cd1baf6d482", "css": "turret", - "code": 59507, + "code": 59505, "src": "custom_icons", "selected": true, "svg": { @@ -821,7 +795,7 @@ { "uid": "559d541ead67649a9658f22b36bc48fc", "css": "players", - "code": 59508, + "code": 59506, "src": "custom_icons", "selected": true, "svg": { @@ -835,7 +809,7 @@ { "uid": "2e574f2316b8b4f840d5680dcad8088b", "css": "editor", - "code": 59509, + "code": 59507, "src": "custom_icons", "selected": true, "svg": { @@ -849,7 +823,7 @@ { "uid": "6e16d3f823a60ce0e9db3a9768668132", "css": "copy", - "code": 59510, + "code": 59508, "src": "custom_icons", "selected": true, "svg": { @@ -863,7 +837,7 @@ { "uid": "295e9560f763400dae5f29abd75c4e39", "css": "tree", - "code": 59511, + "code": 59509, "src": "custom_icons", "selected": true, "svg": { @@ -877,7 +851,7 @@ { "uid": "0581bbd4c54547d8d6721cc122ffe0fa", "css": "lock-open", - "code": 59512, + "code": 59510, "src": "custom_icons", "selected": true, "svg": { @@ -891,7 +865,7 @@ { "uid": "d0203434b5e4cea53499b112743fd675", "css": "pick", - "code": 59513, + "code": 59511, "src": "custom_icons", "selected": true, "svg": { @@ -905,7 +879,7 @@ { "uid": "b04d1002bf24f642a026b8844f0ab4af", "css": "export", - "code": 59515, + "code": 59512, "src": "custom_icons", "selected": true, "svg": { @@ -919,7 +893,7 @@ { "uid": "6636e2512996fa2c2b37b8d9e111d4fe", "css": "download", - "code": 59516, + "code": 59513, "src": "custom_icons", "selected": true, "svg": { @@ -933,7 +907,7 @@ { "uid": "f9895cd70db81922fbd2aa1882f04a03", "css": "upload", - "code": 59517, + "code": 59515, "src": "custom_icons", "selected": true, "svg": { @@ -947,7 +921,7 @@ { "uid": "e8191eedaa10260cef458a2385925cb0", "css": "settings", - "code": 59530, + "code": 59516, "src": "custom_icons", "selected": true, "svg": { @@ -961,7 +935,7 @@ { "uid": "ea0128855a25fc520b78658acfe68693", "css": "spray", - "code": 59531, + "code": 59517, "src": "custom_icons", "selected": true, "svg": { @@ -975,7 +949,7 @@ { "uid": "32b0960726db55c7f26620e15f83acd9", "css": "zoom", - "code": 59532, + "code": 59530, "src": "custom_icons", "selected": true, "svg": { @@ -989,7 +963,7 @@ { "uid": "22856e2f42e364e7e363348542b46062", "css": "power_old", - "code": 59533, + "code": 59531, "src": "custom_icons", "selected": true, "svg": { @@ -1009,7 +983,7 @@ { "uid": "844ca62d81744d1ca4b59a4763aeca86", "css": "menu", - "code": 59534, + "code": 59532, "src": "custom_icons", "selected": true, "svg": { @@ -1023,7 +997,7 @@ { "uid": "4b4d5e5ee8884c2f545869496dcb525b", "css": "lock", - "code": 59535, + "code": 59533, "src": "custom_icons", "selected": true, "svg": { @@ -1037,7 +1011,7 @@ { "uid": "9515bb59fd462b77f0d088978c339778", "css": "eye", - "code": 59492, + "code": 59534, "src": "custom_icons", "selected": true, "svg": { @@ -1051,7 +1025,7 @@ { "uid": "fdd7088d0019bb1033df645f01981429", "css": "eye-off", - "code": 59493, + "code": 59535, "src": "custom_icons", "selected": true, "svg": { @@ -1061,6 +1035,26 @@ "search": [ "eye-off" ] + }, + { + "uid": "f47srtt9pew19q6kg9jniwtzsb8q1rhy", + "css": "warning", + "code": 9888, + "src": "modernpics" + }, + { + "uid": "c17baed6f9afce2a8fafe730886b8e06", + "css": "terrain", + "code": 59492, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M350 0L300 50 250 100 200 150 150 200 100 250 50 300 0 350V450 550 650 750 850 950L50 1000H150 250 350 450 550 650 750 850 950L1000 950V850 750 650 550 450L950 400 900 350 850 300 800 250 750 200 700 250 650 300 600 250 550 200 500 150 450 100 400 50ZM350 200L400 250 450 300 500 350 550 400 600 450 650 500 700 450 750 400 800 450 850 500 900 550V650 750 850L850 900H750 650 550 450 350 250 150L100 850V750 650 550 450L150 400 200 350 250 300 300 250Z", + "width": 1000 + }, + "search": [ + "terrain" + ] } ] } \ No newline at end of file diff --git a/core/assets-raw/fonts/Arturito Slab_v2.ttf b/core/assets-raw/fonts/Arturito Slab_v2.ttf deleted file mode 100755 index 04096503fa..0000000000 Binary files a/core/assets-raw/fonts/Arturito Slab_v2.ttf and /dev/null differ diff --git a/core/assets-raw/fonts/EkkamaiNew-Regular.ttf b/core/assets-raw/fonts/EkkamaiNew-Regular.ttf deleted file mode 100644 index 8c3f521e80..0000000000 Binary files a/core/assets-raw/fonts/EkkamaiNew-Regular.ttf and /dev/null differ diff --git a/core/assets-raw/fonts/Exo2-Regular.ttf b/core/assets-raw/fonts/Exo2-Regular.ttf deleted file mode 100644 index 8e09f6fb43..0000000000 Binary files a/core/assets-raw/fonts/Exo2-Regular.ttf and /dev/null differ diff --git a/core/assets-raw/fonts/NanumBarunGothic.ttf b/core/assets-raw/fonts/NanumBarunGothic.ttf deleted file mode 100644 index 658cd3c239..0000000000 Binary files a/core/assets-raw/fonts/NanumBarunGothic.ttf and /dev/null differ diff --git a/core/assets-raw/fonts/OpenSansEmoji.ttf b/core/assets-raw/fonts/OpenSansEmoji.ttf deleted file mode 100644 index 57d86a62bb..0000000000 Binary files a/core/assets-raw/fonts/OpenSansEmoji.ttf and /dev/null differ diff --git a/core/assets-raw/fonts/font_latin.ttf b/core/assets-raw/fonts/font_latin.ttf deleted file mode 100644 index cebae09c33..0000000000 Binary files a/core/assets-raw/fonts/font_latin.ttf and /dev/null differ diff --git a/core/assets-raw/icons/command-retreat.png b/core/assets-raw/icons/command-retreat.png deleted file mode 100644 index f40dcfe5cf..0000000000 Binary files a/core/assets-raw/icons/command-retreat.png and /dev/null differ diff --git a/core/assets-raw/icons/defense.png b/core/assets-raw/icons/defense.png index 2ae509685e..4b85844b8b 100644 Binary files a/core/assets-raw/icons/defense.png and b/core/assets-raw/icons/defense.png differ diff --git a/core/assets-raw/icons/liquid.png b/core/assets-raw/icons/liquid.png index 1306834469..41fe7d5f92 100644 Binary files a/core/assets-raw/icons/liquid.png and b/core/assets-raw/icons/liquid.png differ diff --git a/core/assets-raw/icons/terrain.png b/core/assets-raw/icons/terrain.png index cc9c57380e..a9bd73972e 100644 Binary files a/core/assets-raw/icons/terrain.png and b/core/assets-raw/icons/terrain.png differ diff --git a/core/assets/fonts/font.woff b/core/assets/fonts/font.woff index d294b8c83a..608f6a870e 100644 Binary files a/core/assets/fonts/font.woff and b/core/assets/fonts/font.woff differ diff --git a/core/assets/fonts/icon.ttf b/core/assets/fonts/icon.ttf index c70f8c89cc..491f8b9259 100644 Binary files a/core/assets/fonts/icon.ttf and b/core/assets/fonts/icon.ttf differ diff --git a/core/src/mindustry/game/Waves.java b/core/src/mindustry/game/Waves.java index e889141889..44b557ae1b 100644 --- a/core/src/mindustry/game/Waves.java +++ b/core/src/mindustry/game/Waves.java @@ -316,7 +316,7 @@ public class Waves{ }}); i += next + 1; - if(curTier < 3 || rand.chance(0.05)){ + if(curTier < 3 || (rand.chance(0.05) && difficulty > 0.8)){ curTier ++; } diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 97da3a51a7..4294730f8b 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -99,7 +99,7 @@ public class PlanetRenderer implements Disposable{ Gl.enable(Gl.blend); - irenderer.renderProjections(); + irenderer.renderProjections(planet); Gl.disable(Gl.cullFace); Gl.disable(Gl.depthTest); @@ -318,6 +318,6 @@ public class PlanetRenderer implements Disposable{ public interface PlanetInterfaceRenderer{ void renderSectors(Planet planet); - void renderProjections(); + void renderProjections(Planet planet); } } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index d170a6abb9..f5bda89a24 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -153,24 +153,21 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ public void renderSectors(Planet planet){ //draw all sector stuff - if(!debugSelect){ + if(!debugSelect && selectAlpha > 0.01f){ for(Sector sec : planet.sectors){ + if(canSelect(sec) || sec.unlocked()){ - if(selectAlpha > 0.01f){ - if(canSelect(sec) || sec.unlocked()){ + Color color = + sec.hasBase() ? Tmp.c2.set(Team.sharded.color).lerp(Team.crux.color, sec.hasEnemyBase() ? 0.5f : 0f) : + sec.preset != null ? Team.derelict.color : + sec.hasEnemyBase() ? Team.crux.color : + null; - Color color = - sec.hasBase() ? Tmp.c2.set(Team.sharded.color).lerp(Team.crux.color, sec.hasEnemyBase() ? 0.5f : 0f) : - sec.preset != null ? Team.derelict.color : - sec.hasEnemyBase() ? Team.crux.color : - null; - - if(color != null){ - planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(selectAlpha), 0.026f, -0.001f); - } - }else{ - planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, selectAlpha), -0.001f); + if(color != null){ + planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(selectAlpha), 0.026f, -0.001f); } + }else{ + planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, selectAlpha), -0.001f); } } } @@ -202,11 +199,13 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } } - for(Sector sec : planet.sectors){ - if(sec.hasBase()){ - for(Sector enemy : sec.near()){ - if(enemy.hasEnemyBase()){ - planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.crux.color, Color.clear, 0.24f, 110f, 25); + if(selectAlpha > 0.001f){ + for(Sector sec : planet.sectors){ + if(sec.hasBase()){ + for(Sector enemy : sec.near()){ + if(enemy.hasEnemyBase()){ + planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.crux.color.write(Tmp.c2).a(selectAlpha), Color.clear, 0.24f, 110f, 25); + } } } } @@ -225,7 +224,24 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } @Override - public void renderProjections(){ + public void renderProjections(Planet planet){ + + for(Sector sec : planet.sectors){ + if(sec != hovered){ + var icon = (sec.isAttacked() ? Icon.warning : !sec.hasBase() && sec.preset != null ? Icon.terrain : null); + var color = sec.preset != null && !sec.hasBase() ? Team.derelict.color : Team.sharded.color; + + if(icon != null){ + planets.drawPlane(sec, () -> { + Draw.color(color, selectAlpha); + Draw.rect(icon.getRegion(), 0, 0); + }); + } + } + } + + Draw.reset(); + if(hovered != null){ planets.drawPlane(hovered, () -> { Draw.color(hovered.isAttacked() ? Pal.remove : Color.white, Pal.accent, Mathf.absin(5f, 1f)); @@ -239,6 +255,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ Draw.reset(); }); } + + Draw.reset(); } void setup(){