Zone unlocking tweak

core/assets/bundles/bundle.properties

@@ -300,7 +300,7 @@ uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Unlock configuring loadout:\nWave {0}.
 zone.unlocked = [LIGHT_GRAY]{0} unlocked.
-zone.complete = Wave {0} reached:\nNext zone requirements met.
+zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
 zone.resources = Resources Detected:
 add = Add...

core/assets/sprites/sprites.atlas

@@ -9804,28 +9804,28 @@ char2
   index: -1
 char3
   rotate: false
-  xy: 1193, 571
+  xy: 1483, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 1309, 687
+  xy: 1599, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 1599, 785
+  xy: 1019, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 1019, 491
+  xy: 1309, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9860,28 +9860,28 @@ copper3
   index: -1
 craters1
   rotate: false
-  xy: 1193, 537
+  xy: 1483, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 1343, 687
+  xy: 1633, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 1633, 785
+  xy: 1053, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 1053, 491
+  xy: 1343, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9923,7 +9923,7 @@ darksand-edge
   index: -1
 darksand-tainted-water
   rotate: false
-  xy: 1087, 491
+  xy: 1377, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9958,14 +9958,14 @@ darksand1
   index: -1
 darksand2
   rotate: false
-  xy: 1377, 687
+  xy: 1667, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand3
   rotate: false
-  xy: 1667, 785
+  xy: 1087, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10000,7 +10000,7 @@ dunerocks1
   index: -1
 dunerocks2
   rotate: false
-  xy: 1411, 687
+  xy: 1701, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10028,14 +10028,14 @@ grass-edge
   index: -1
 grass1
   rotate: false
-  xy: 1701, 785
+  xy: 1121, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 1121, 491
+  xy: 1411, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10056,21 +10056,21 @@ holostone-edge
   index: -1
 holostone1
   rotate: false
-  xy: 1445, 687
+  xy: 1735, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 1735, 785
+  xy: 1155, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 1155, 491
+  xy: 1445, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10173,6 +10173,13 @@ icerocks2
   orig: 32, 32
   offset: 0, 0
   index: -1
+ignarock-edge
+  rotate: false
+  xy: 323, 623
+  size: 288, 96
+  orig: 288, 96
+  offset: 0, 0
+  index: -1
 ignarock1
   rotate: false
   xy: 291, 303
@@ -10224,42 +10231,42 @@ magmarock1
   index: -1
 magmarock2
   rotate: false
-  xy: 1483, 719
+  xy: 903, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 903, 425
+  xy: 1193, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 1517, 719
+  xy: 937, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged5
   rotate: false
-  xy: 1517, 719
+  xy: 937, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 937, 425
+  xy: 1227, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-edge
   rotate: false
-  xy: 323, 623
+  xy: 613, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10273,7 +10280,7 @@ metal-floor-3
   index: -1
 metal-floor-3-edge
   rotate: false
-  xy: 613, 721
+  xy: 903, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10287,14 +10294,14 @@ metal-floor-5
   index: -1
 metal-floor-5-edge
   rotate: false
-  xy: 903, 819
+  xy: 1193, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-damaged-edge
   rotate: false
-  xy: 1193, 917
+  xy: 323, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10336,14 +10343,14 @@ metal-floor-damaged6
   index: -1
 metal-floor-edge
   rotate: false
-  xy: 323, 525
+  xy: 613, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 moss-edge
   rotate: false
-  xy: 613, 623
+  xy: 903, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10357,14 +10364,14 @@ moss1
   index: -1
 moss2
   rotate: false
-  xy: 1479, 685
+  xy: 1189, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss3
   rotate: false
-  xy: 1513, 685
+  xy: 1223, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10420,14 +10427,14 @@ ore-lead1
   index: -1
 ore-lead2
   rotate: false
-  xy: 1551, 735
+  xy: 971, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead3
   rotate: false
-  xy: 971, 441
+  xy: 1261, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10441,7 +10448,7 @@ ore-scrap1
   index: -1
 ore-scrap2
   rotate: false
-  xy: 1243, 621
+  xy: 1533, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10511,14 +10518,14 @@ rock1
   index: -1
 rock2
   rotate: false
-  xy: 1193, 605
+  xy: 1483, 703
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rocks-large
   rotate: false
-  xy: 1193, 655
+  xy: 1483, 753
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -10546,28 +10553,28 @@ salt
   index: -1
 salt-edge
   rotate: false
-  xy: 903, 721
+  xy: 1193, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-edge
   rotate: false
-  xy: 1193, 819
+  xy: 1483, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-water
   rotate: false
-  xy: 1227, 571
+  xy: 1517, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-edge
   rotate: false
-  xy: 1483, 917
+  xy: 323, 427
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10595,147 +10602,147 @@ sand3
   index: -1
 sandrocks-large
   rotate: false
-  xy: 1483, 753
+  xy: 903, 459
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sandrocks1
   rotate: false
-  xy: 1227, 537
+  xy: 1517, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks2
   rotate: false
-  xy: 1019, 457
+  xy: 1309, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 1053, 457
+  xy: 1343, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 1087, 457
+  xy: 1377, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 1121, 457
+  xy: 1411, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1377, 653
+  xy: 1087, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1411, 653
+  xy: 1121, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-edge
   rotate: false
-  xy: 323, 427
+  xy: 613, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 shale1
   rotate: false
-  xy: 1155, 457
+  xy: 1445, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale2
   rotate: false
-  xy: 1309, 653
+  xy: 1019, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale3
   rotate: false
-  xy: 1343, 653
+  xy: 1053, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-large
   rotate: false
-  xy: 903, 459
+  xy: 1193, 557
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shalerocks1
   rotate: false
-  xy: 1445, 653
+  xy: 1155, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks2
   rotate: false
-  xy: 1479, 651
+  xy: 1189, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-edge
   rotate: false
-  xy: 613, 525
+  xy: 903, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 1513, 651
+  xy: 1223, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1551, 701
+  xy: 971, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1547, 667
+  xy: 1005, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 1259, 671
+  xy: 1549, 769
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 1549, 769
+  xy: 969, 475
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -10749,14 +10756,14 @@ snowrocks-large
   index: -1
 snowrocks1
   rotate: false
-  xy: 971, 407
+  xy: 1039, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 1005, 423
+  xy: 1073, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10784,35 +10791,35 @@ spore-cluster3
   index: -1
 spore-moss-edge
   rotate: false
-  xy: 903, 623
+  xy: 1193, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 spore-moss1
   rotate: false
-  xy: 1039, 423
+  xy: 1107, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss2
   rotate: false
-  xy: 1073, 423
+  xy: 1141, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss3
   rotate: false
-  xy: 1107, 423
+  xy: 1175, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine
   rotate: false
-  xy: 969, 475
+  xy: 1259, 573
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -10826,112 +10833,112 @@ sporerocks-large
   index: -1
 sporerocks1
   rotate: false
-  xy: 1141, 423
+  xy: 1209, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sporerocks2
   rotate: false
-  xy: 1599, 751
+  xy: 1261, 505
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-edge
   rotate: false
-  xy: 1193, 721
+  xy: 1483, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1633, 751
+  xy: 1257, 471
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water
   rotate: false
-  xy: 1667, 751
+  xy: 1295, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-edge
   rotate: false
-  xy: 1483, 819
+  xy: 613, 427
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 1701, 751
+  xy: 1329, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-edge
   rotate: false
-  xy: 613, 427
+  xy: 903, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 1735, 751
+  xy: 1363, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1769, 739
+  xy: 1397, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1585, 717
+  xy: 1431, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1619, 717
+  xy: 1599, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1653, 717
+  xy: 1633, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1687, 717
+  xy: 1667, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1721, 717
+  xy: 1701, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-edge
   rotate: false
-  xy: 903, 525
+  xy: 1193, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0

core/src/io/anuke/mindustry/content/Blocks.java

@@ -1191,11 +1191,11 @@ public class Blocks implements ContentList{
             );
             size = 2;
             recoil = 0f;
-            reload = 3f;
+            reload = 2f;
             inaccuracy = 5f;
             shootCone = 50f;
             shootEffect = Fx.shootLiquid;
-            range = 100f;
+            range = 110f;
             health = 250*size*size;
 
             drawer = (tile, entity) -> {

core/src/io/anuke/mindustry/core/Control.java

@@ -170,8 +170,8 @@ public class Control implements ApplicationListener{
             }
         });
 
-        Events.on(ZoneCompleteEvent.class, e -> {
+        Events.on(ZoneRequireCompleteEvent.class, e -> {
-            ui.hudfrag.showToast(Core.bundle.format("zone.complete", e.zone.conditionWave));
+            ui.hudfrag.showToast(Core.bundle.format("zone.requirement.complete", state.wave, e.zone.localizedName));
         });
 
         Events.on(ZoneConfigureCompleteEvent.class, e -> {

core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java

@@ -20,7 +20,7 @@ public class LiquidBulletType extends BulletType{
     Liquid liquid;
 
     public LiquidBulletType(Liquid liquid){
-        super(2.8f, 0);
+        super(3.5f, 0);
         this.liquid = liquid;
 
         lifetime = 74f;

core/src/io/anuke/mindustry/game/EventType.java

@@ -10,11 +10,12 @@ import io.anuke.mindustry.world.Tile;
 public class EventType{
 
     /**Called when a zone's requirements are met.*/
-    public static class ZoneCompleteEvent implements Event{
+    public static class ZoneRequireCompleteEvent implements Event{
-        public final Zone zone;
+        public final Zone zone, required;
 
-        public ZoneCompleteEvent(Zone zone){
+        public ZoneRequireCompleteEvent(Zone zone, Zone required){
             this.zone = zone;
+            this.required = required;
         }
     }
 

core/src/io/anuke/mindustry/type/Zone.java

@@ -7,8 +7,10 @@ import io.anuke.arc.function.Consumer;
 import io.anuke.arc.function.Supplier;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.util.Structs;
 import io.anuke.mindustry.content.Loadouts;
-import io.anuke.mindustry.game.EventType.ZoneCompleteEvent;
+import io.anuke.mindustry.game.EventType.ZoneConfigureCompleteEvent;
+import io.anuke.mindustry.game.EventType.ZoneRequireCompleteEvent;
 import io.anuke.mindustry.game.Rules;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.maps.generators.Generator;
@@ -17,8 +19,7 @@ import io.anuke.mindustry.world.Block;
 
 import java.util.Arrays;
 
-import static io.anuke.mindustry.Vars.data;
+import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.Vars.state;
 
 public class Zone extends UnlockableContent{
     public final Generator generator;
@@ -29,7 +30,7 @@ public class Zone extends UnlockableContent{
     public Supplier<Rules> rules = Rules::new;
     public boolean alwaysUnlocked;
     public int conditionWave = Integer.MAX_VALUE;
-    public int configureWave = 10;
+    public int configureWave = 15;
     public int launchPeriod = 10;
     public Loadout loadout = Loadouts.basicShard;
 
@@ -67,12 +68,15 @@ public class Zone extends UnlockableContent{
             Core.settings.put(name + "-wave", wave);
             data.modified();
 
-            if(wave == conditionWave + 1){
+            for(Zone zone : content.zones()){
-                Events.fire(new ZoneCompleteEvent(this));
+                ZoneRequirement req = Structs.find(zone.zoneRequirements, f -> f.zone == this);
+                if(req != null && wave == req.wave + 1){
+                    Events.fire(new ZoneRequireCompleteEvent(zone, this));
+                }
             }
 
             if(wave == configureWave + 1){
-            //    Events.fire(new ZoneConfigureCompleteEvent(this));
+                Events.fire(new ZoneConfigureCompleteEvent(this));
             }
         }
     }

core/src/io/anuke/mindustry/ui/fragments/HudFragment.java

@@ -455,6 +455,7 @@ public class HudFragment extends Fragment{
                 }else{
                     builder.append(enemiesf.get(state.enemies()));
                 }
+                builder.append("\n");
             }
 
             if(state.rules.waveTimer){