diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a4b40d1d6e..ce99462b24 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1176,6 +1176,10 @@ block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible block.overdrive-dome.name = Overdrive Dome +#experimental, may be removed +block.block-forge.name = Block Forge +block.block-loader.name = Block Loader +block.block-unloader.name = Block Unloader block.switch.name = Switch block.micro-processor.name = Micro Processor diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 4b0f6d6c02..1d86d8e084 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -45,6 +45,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform //debug GL information Log.info("[GL] Version: @", graphics.getGLVersion()); Log.info("[GL] Max texture size: @", Gl.getInt(Gl.maxTextureSize)); + Log.info("[GL] Max vert/frag shader FP precision: @ / @", Gl.getShaderPrecision(Gl.vertexShader, Gl.highFloat), Gl.getShaderPrecision(Gl.fragmentShader, Gl.highFloat)); Log.info("[GL] Using @ context.", gl30 != null ? "OpenGL 3" : "OpenGL 2"); Log.info("[JAVA] Version: @", System.getProperty("java.version")); diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b544fff62b..d8738ed451 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1330,7 +1330,7 @@ public class Blocks implements ContentList{ //region storage coreShard = new CoreBlock("core-shard"){{ - requirements(Category.effect, BuildVisibility.editorOnly, with(Items.copper, 2000, Items.lead, 1000)); + requirements(Category.effect, BuildVisibility.editorOnly, with(Items.copper, 1500, Items.lead, 1000)); alwaysUnlocked = true; unitType = UnitTypes.alpha; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 9cfc8c1594..3c2cc4a1be 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -202,7 +202,6 @@ public class UnitType extends UnlockableContent{ stats.add(Stat.itemCapacity, itemCapacity); stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks); stats.add(Stat.commandLimit, commandLimit); - //TODO abilities, maybe try something like DPS if(abilities.any()){ var unique = new ObjectSet(); @@ -249,7 +248,7 @@ public class UnitType extends UnlockableContent{ singleTarget = weapons.size <= 1; if(itemCapacity < 0){ - itemCapacity = Math.max(Mathf.round(hitSize * 4, 10), 10); + itemCapacity = Math.max(Mathf.round((int)(hitSize * 4.3), 10), 10); } //set up default range diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 1efd1f3938..52e1f7a160 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -412,7 +412,7 @@ public class SettingsMenuDialog extends SettingsDialog{ } }); - graphics.checkPref("linear", !mobile, b -> { + graphics.checkPref("linear", true, b -> { for(Texture tex : Core.atlas.getTextures()){ TextureFilter filter = b ? TextureFilter.linear : TextureFilter.nearest; tex.setFilter(filter, filter); diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index d7c8390cd6..80cf98e7fe 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -9,11 +9,16 @@ public enum SAchievement{ win10Attack(SStat.attacksWon, 10), win10PvP(SStat.pvpsWon, 10), defeatAttack5Waves, + //TODO launch30Times(SStat.timesLaunched, 30), + //TODO + captureBackground, + //TODO survive100Waves(SStat.maxWavesSurvived, 100), survive500Waves(SStat.maxWavesSurvived, 500), researchAll, - useAllMechs(SStat.zoneMechsUsed, 6), + //TODO + useAllUnits, shockWetEnemy, killEnemyPhaseWall, researchRouter, @@ -24,8 +29,9 @@ public enum SAchievement{ downloadMapWorkshop, publishMap(SStat.mapsPublished, 1), defeatBoss(SStat.bossesDefeated, 1), - unlockAllZones, - configAllZones, + //TODO + captureAllSectors, + //configAllZones, drop10kitems, powerupImpactReactor, obtainThorium, @@ -37,16 +43,25 @@ public enum SAchievement{ active10Phantoms, active50Crawlers, build1000Units, - earnSRank, - earnSSRank, + //TODO + buildAllUnits, + //TODO + activeAllT5, + //TODO + //earnSRank, + //earnSSRank, dieExclusion, drown, fillCoreAllCampaign, hostServer10(SStat.maxPlayersServer, 10), - buildMeltdownSpectre, + buildMeltdownSpectreForeshadow, launchItemPad, - skipLaunching2Death, + //skipLaunching2Death, chainRouters, + //TODO + becomeRouter, + //TODO + save20Schematics, survive10WavesNoBlocks, useFlameAmmo, coolTurret, diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index 6fb335ae26..968b7f8b67 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -127,7 +127,8 @@ public class SStats implements SteamUserStatsCallback{ } if(Core.settings.getBool("meltdownp", false) && Core.settings.getBool("spectrep", false)){ - buildMeltdownSpectre.complete(); + //TODO + //buildMeltdownSpectre.complete(); } } } @@ -148,7 +149,8 @@ public class SStats implements SteamUserStatsCallback{ if(e.content == Items.titanium) obtainTitanium.complete(); if(!content.sectors().contains(SectorPreset::locked)){ - unlockAllZones.complete(); + //TODO + //unlockAllZones.complete(); } }); diff --git a/gradle.properties b/gradle.properties index dcd2eb0683..4c83f159fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=46d1f7c89424a7abf0d7c51cd24f2a185ba98337 +archash=73be877255367297b289b4ae09ca8d71af29cc5e