From d53b0747608fdca6d8a05506ea9ce4b4615f5f33 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 15 Nov 2020 12:52:29 -0500 Subject: [PATCH] Tutorial removed / Logic block group --- core/assets/bundles/bundle.properties | 4 +- core/src/mindustry/core/Control.java | 64 ------------------- .../ui/dialogs/SettingsMenuDialog.java | 13 ---- .../mindustry/ui/fragments/MenuFragment.java | 3 +- .../world/blocks/logic/LogicBlock.java | 1 + .../world/blocks/logic/LogicDisplay.java | 1 + .../world/blocks/logic/MemoryBlock.java | 1 + .../world/blocks/logic/MessageBlock.java | 2 + .../world/blocks/logic/SwitchBlock.java | 2 + core/src/mindustry/world/meta/BlockGroup.java | 2 +- 10 files changed, 11 insertions(+), 82 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a09df8e1a6..caa42eb78e 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -20,7 +20,7 @@ gameover = Game Over gameover.pvp = The[accent] {0}[] team is victorious! highscore = [accent]New highscore! copied = Copied. -indev.popup = [accent]v6[] is currently in [accent]beta[].\n[lightgray]This means:[]\n[scarlet]- The campaign is unfinished[]\n- SFX and music are unfinished/missing\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. +indev.popup = [accent]v6[] is currently in [accent]beta[].\n[lightgray]This means:[]\n[scarlet]- The campaign is unfinished[]\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. indev.notready = This part of the game isn't ready yet load.sound = Sounds @@ -1252,7 +1252,7 @@ item.coal.description = Used for fuel and refined material production. item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event. item.titanium.description = Used in liquid transportation structures, drills and aircraft. item.thorium.description = Used in durable structures and as nuclear fuel. -item.scrap.description = Melted down and refined into other materials. +item.scrap.description = Used in Melters and Pulverizers for refining into other materials. item.scrap.details = Leftover remnants of old structures and units. item.silicon.description = Used in solar panels, complex electronics and homing turret ammunition. item.plastanium.description = Used in advanced units, insulation and fragmentation ammunition. diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 8d43863be2..168ba1ec74 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -356,64 +356,6 @@ public class Control implements ApplicationListener, Loadable{ }); } - public void playTutorial(){ - ui.showInfo("@indev.notready"); - //TODO implement - //ui.showInfo("death"); - /* - Zone zone = Zones.groundZero; - ui.loadAnd(() -> { - logic.reset(); - net.reset(); - - world.beginMapLoad(); - - world.resize(zone.generator.width, zone.generator.height); - zone.generator.generate(world.tiles); - - Tile coreb = null; - - out: - for(int x = 0; x < world.width(); x++){ - for(int y = 0; y < world.height(); y++){ - if(world.rawTile(x, y).block() instanceof CoreBlock){ - coreb = world.rawTile(x, y); - break out; - } - } - } - - Geometry.circle(coreb.x, coreb.y, 10, (cx, cy) -> { - Tile tile = world.ltile(cx, cy); - if(tile != null && tile.team() == state.rules.defaultTeam && !(tile.block() instanceof CoreBlock)){ - tile.remove(); - } - }); - - Geometry.circle(coreb.x, coreb.y, 5, (cx, cy) -> world.tile(cx, cy).clearOverlay()); - - world.endMapLoad(); - - zone.rules.get(state.rules); - //TODO assign zone!! - //state.rules.zone = zone; - for(Building core : state.teams.playerCores()){ - for(ItemStack stack : zone.getStartingItems()){ - core.items.add(stack.item, stack.amount); - } - } - Building core = state.teams.playerCores().first(); - core.items.clear(); - - logic.play(); - state.rules.waveTimer = false; - state.rules.waveSpacing = 60f * 30; - state.rules.buildCostMultiplier = 0.3f; - state.rules.tutorial = true; - Events.fire(Trigger.newGame); - });*/ - } - public boolean isHighScore(){ return hiscore; } @@ -467,12 +409,6 @@ public class Control implements ApplicationListener, Loadable{ })); } - //play tutorial on start - //TODO no tutorial right now - if(!settings.getBool("playedtutorial", false)){ - //Core.app.post(() -> Core.app.post(this::playTutorial)); - } - //display UI scale changed dialog if(Core.settings.getBool("uiscalechanged", false)){ Core.app.post(() -> Core.app.post(() -> { diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index ffaf137b56..a2ddea1b10 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -341,19 +341,6 @@ public class SettingsMenuDialog extends SettingsDialog{ } } - game.pref(new Setting(){ - @Override - public void add(SettingsTable table){ - table.button("@tutorial.retake", () -> { - hide(); - control.playTutorial(); - }).size(220f, 60f).pad(6).left(); - table.add(); - table.row(); - hide(); - } - }); - graphics.sliderPref("uiscale", 100, 25, 300, 25, s -> { if(ui.settings != null){ Core.settings.put("uiscalechanged", true); diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java index c719fce7b5..181bd90b40 100644 --- a/core/src/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/mindustry/ui/fragments/MenuFragment.java @@ -168,8 +168,7 @@ public class MenuFragment extends Fragment{ new Buttoni("@campaign", Icon.play, () -> checkPlay(ui.planet::show)), new Buttoni("@joingame", Icon.add, () -> checkPlay(ui.join::show)), new Buttoni("@customgame", Icon.terrain, () -> checkPlay(ui.custom::show)), - new Buttoni("@loadgame", Icon.download, () -> checkPlay(ui.load::show)), - new Buttoni("@tutorial", Icon.info, () -> checkPlay(control::playTutorial)) + new Buttoni("@loadgame", Icon.download, () -> checkPlay(ui.load::show)) ), new Buttoni("@editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new Buttoni("@workshop", Icon.book, platform::openWorkshop) : null, new Buttoni("@mods", Icon.book, ui.mods::show), diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 35d76dcc82..4ce500f9d4 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -36,6 +36,7 @@ public class LogicBlock extends Block{ update = true; solid = true; configurable = true; + group = BlockGroup.logic; config(byte[].class, (LogicBuild build, byte[] data) -> build.readCompressed(data, true)); diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java index 998f7d6083..22e2b0fb6e 100644 --- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java +++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java @@ -34,6 +34,7 @@ public class LogicDisplay extends Block{ super(name); update = true; solid = true; + group = BlockGroup.logic; } @Override diff --git a/core/src/mindustry/world/blocks/logic/MemoryBlock.java b/core/src/mindustry/world/blocks/logic/MemoryBlock.java index 0329744168..5b91425a27 100644 --- a/core/src/mindustry/world/blocks/logic/MemoryBlock.java +++ b/core/src/mindustry/world/blocks/logic/MemoryBlock.java @@ -12,6 +12,7 @@ public class MemoryBlock extends Block{ super(name); destructible = true; solid = true; + group = BlockGroup.logic; } @Override diff --git a/core/src/mindustry/world/blocks/logic/MessageBlock.java b/core/src/mindustry/world/blocks/logic/MessageBlock.java index e67bf93680..f47b613d72 100644 --- a/core/src/mindustry/world/blocks/logic/MessageBlock.java +++ b/core/src/mindustry/world/blocks/logic/MessageBlock.java @@ -14,6 +14,7 @@ import mindustry.gen.*; import mindustry.ui.*; import mindustry.ui.dialogs.*; import mindustry.world.*; +import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -27,6 +28,7 @@ public class MessageBlock extends Block{ configurable = true; solid = true; destructible = true; + group = BlockGroup.logic; config(String.class, (MessageBuild tile, String text) -> { if(text.length() > maxTextLength){ diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java index d27cebb1b3..60e5db6dc7 100644 --- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java +++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java @@ -5,6 +5,7 @@ import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; import mindustry.world.*; +import mindustry.world.meta.*; public class SwitchBlock extends Block{ public @Load("@-on") TextureRegion onRegion; @@ -15,6 +16,7 @@ public class SwitchBlock extends Block{ update = true; drawDisabled = false; autoResetEnabled = false; + group = BlockGroup.logic; config(Boolean.class, (SwitchBuild entity, Boolean b) -> entity.enabled = b); } diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java index de7591e751..240e164ab3 100644 --- a/core/src/mindustry/world/meta/BlockGroup.java +++ b/core/src/mindustry/world/meta/BlockGroup.java @@ -1,5 +1,5 @@ package mindustry.world.meta; public enum BlockGroup{ - none, walls, turrets, transportation, power, liquids, drills, storage, units + none, walls, turrets, transportation, power, liquids, drills, storage, units, logic }