Map editor fixes / Zone environment changes

core/assets/bundles/bundle.properties

@@ -578,6 +578,7 @@ block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
 block.rock.name = Rock
+block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss

core/assets/bundles/bundle_cs.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Jméno:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_de.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Name:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_es.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Nombre:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_fr.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Nom:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_fr_BE.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Nom:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_in_ID.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Name:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_it.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Nome:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_ja.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = 名前:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_ko.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = 이름:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_nl.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Name:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_pl.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Nazwa:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_pt_BR.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Nome:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_ru.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Название:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_tk.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = isim:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_tr.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Name:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_uk_UA.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Назва:
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_zh_CN.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = 名字：
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

core/assets/bundles/bundle_zh_TW.properties

@@ -201,6 +201,12 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.to = to
 waves.boss = Boss
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = 名稱：
@@ -254,6 +260,7 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.block = Block
 filter.option.floor = Floor
 filter.option.wall = Wall
 filter.option.ore = Ore

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

@@ -38,7 +38,7 @@ public class Blocks implements ContentList{
     air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, ice, snow,
     holostone, rocks, sporerocks, icerocks, cliffs, sporePine, pine, whiteTree, whiteTreeDead, sporeCluster,
     iceSnow, sandWater, duneRocks, sandRocks, moss, sporeMoss, shale, shaleRocks, shaleBoulder, grass, salt,
-    metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, rock,
+    metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, rock, snowrock,
 
     //ores
     oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium,
@@ -189,11 +189,6 @@ public class Blocks implements ContentList{
             variants = 0;
         }};
 
-        iceSnow = new Floor("ice-snow"){{
-            variants = 3;
-            attributes.set(Attribute.water, 0.3f);
-        }};
-
         snow = new Floor("snow"){{
             attributes.set(Attribute.water, 0.2f);
         }};
@@ -205,6 +200,12 @@ public class Blocks implements ContentList{
             attributes.set(Attribute.water, 0.4f);
         }};
 
+        iceSnow = new Floor("ice-snow"){{
+            variants = 3;
+            attributes.set(Attribute.water, 0.3f);
+            edgeStyle = "blocky";
+        }};
+
         cliffs = new StaticWall("cliffs"){{
             variants = 1;
             fillsTile = false;
@@ -222,6 +223,10 @@ public class Blocks implements ContentList{
             variants = 2;
         }};
 
+        snowrock = new Rock("snowrock"){{
+            variants = 2;
+        }};
+
         icerocks = new StaticWall("icerocks"){{
             variants = 2;
         }};
@@ -277,6 +282,7 @@ public class Blocks implements ContentList{
         sporeMoss = new Floor("spore-moss"){{
             variants = 3;
             attributes.set(Attribute.spores, 0.3f);
+            edgeStyle = "blocky";
         }};
 
         metalFloor = new Floor("metal-floor"){{

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

@@ -16,7 +16,7 @@ public class Zones implements ContentList{
     @Override
     public void load(){
 
-        groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1)){{
+        groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1).decor(new Decoration(Blocks.snow, Blocks.snowrock, 0.01))){{
             baseLaunchCost = ItemStack.with(Items.copper, -100);
             startingItems = ItemStack.list(Items.copper, 100);
             alwaysUnlocked = true;
@@ -30,7 +30,7 @@ public class Zones implements ContentList{
             }};
         }};
 
-        craters = new Zone("craters", new MapGenerator("craters", 1).dist(0)){{
+        craters = new Zone("craters", new MapGenerator("craters", 1).dist(0).decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01))){{
             startingItems = ItemStack.list(Items.copper, 200);
             conditionWave = 10;
             itemRequirements = ItemStack.with(Items.copper, 2000);

core/src/io/anuke/mindustry/editor/MapEditor.java

@@ -212,7 +212,7 @@ public class MapEditor{
 
                             if(tile.block().isMultiblock()){
                                 removeLinked(wx, wy);
-                            }else if(link != 0 && tiles[x][y].block() == Blocks.part){
+                            }else if(link != 0 && tiles[wx][wy].block() == Blocks.part){
                                 removeLinked(wx - (Pack.leftByte(link) - 8), wy - (Pack.rightByte(link) - 8));
                             }
                         }