From c74a8a2fa661a3bea05c6c9b25299b32f0705c80 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 20 May 2017 10:08:25 -0400
Subject: [PATCH] Added more blocks, updated Delta map

---
 core/assets/maps/delta.png                    | Bin 1186 -> 2399 bytes
 core/assets/maps/map.png                      | Bin 1204 -> 1183 bytes
 core/assets/sprites/mindustry.atlas           | 203 +++++++++++-------
 core/assets/sprites/mindustry.png             | Bin 6045 -> 6869 bytes
 core/assets/ui/out/button-map-down.9.png      | Bin 212 -> 213 bytes
 core/assets/ui/out/button-map-over.9.png      | Bin 212 -> 212 bytes
 core/assets/ui/out/button-map.9.png           | Bin 205 -> 205 bytes
 core/assets/ui/uiskin.png                     | Bin 11998 -> 12006 bytes
 core/src/io/anuke/mindustry/Vars.java         |   4 +-
 core/src/io/anuke/mindustry/World.java        |   2 +-
 .../io/anuke/mindustry/world/Generator.java   |  84 +++++---
 .../anuke/mindustry/world/blocks/Blocks.java  |  37 +++-
 12 files changed, 214 insertions(+), 116 deletions(-)

diff --git a/core/assets/maps/delta.png b/core/assets/maps/delta.png
index 79a5dccc681ba1d1604635403f7aeb8065d6ed62..a1dde73f175653ffe93f557e913587e459ef3b0f 100644
GIT binary patch
delta 2324
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

delta 1101
zcmV-T1hV_z5~2x^K?nl^F&gtCXupw3Cw~MSNkl<Zc-rk<+ik-z40H+2l<wfEJXLmR
zrs_x0AV_RklKIy0vuG@ecSq`B$zR*HEp2wc-{1c7^LTvUZlC|TuInOcEuIMZ@Y*y>
zqjbfa-RPT`i6<<Lb^svF>*zKXAJRz?A!1=-1m@Zji{=r#Pg#>t&&{(CSJ0m()PLn7
z>V3Gnt<RgXz)bbpT?4vE?LQGUrkB79FiAv>jaEYc_VX5y^yUG*EtycP(rCS|uIu{Q
zK{*bQrqY#>*ln)vLnY8c7!)gFUhL1huI)p^XImB4Pd5|p8e+4cem(jUI2BO>4&(}j
zWn?w(x5(YyJb)`l*)D0k;awS(>3;$6=|NpX(nu&v%~AnJT|KRhyM=V1U7gX_SS#c~
z=Ig&PPFY`{w)^CPcnt#?rUsnW_GdEfjm7Shg=Xnp&vaLWPvd)$hVA81r>;2NkU7mr
zjN?wO3gKu^*trd(E0M2A8E}P)=e#X51t@IqT_KPa2Ba4H>%DCmt%k#Ztbf!!Fpgv_
z(G?7oVTe(Lcf&1&fwB}V0pJpcgc}2!IcXK3ze^P+1zq3O@*El+A(HcMXPRyJ0)T6U
z(g{4nL?QiH9}OZudppC4gks2dhXm){>yA_dJS3k#mb42r`7qRpXr!4zZd1WBhmk`P
zd5He2526c1CAYwJCLC9O8-II8OcXyIA(Ek&yWyMdG%~rOs#Ww)UmZ(03d(VeGV?qj
z<=oo~0Iuk7yQofnf<EVEAQYE|S7hWzf~o)<9ToD-eQDn)eGid>q!s{jI7|~#c=$}9
zua|SLyUV_e(emW3@~f~|BAbFj=XafKS-1k->#pdnEA9VpeyNd*Lw|bp0C~9ULvFQ>
z0wn<_t?+t9CcQc(jxzDvn`8HiZA-H2jhcGqwOS|0c|apX6q3(`8!MIh^=&4DY_jr|
z<<yw6^WG0=44-)mL3|-6OTI3}@{<taR7E)Vd9Epjp#VUz6hj0y3J5pA4-df62@}A8
z8ZZq2NcT{{^Z-Bv_J0Zh21r5PxkXVNg#ut<0mvr;#vVZdNI?JqS!fCc0E7G~=<)La
z0G4+9z5xIj00>pg939l2F#3zmi&@x-Gy?#kw*eq)+#P+)^J4Uszi~H_0(!4R8T%?5
zhM|*M_zyTFSPo*xz=Z;00pt3Z>ToE1VsPXYBL-jFwkdF=J%7G_3i8|S#X^kH06_UV
zG9m7ter#Y25)lBR&*p}|A25J{UjQ^=Xg|r!jzL*`o6t<nPtErZKzl|GI?(c-f(CMe
zXrS4%5SAj0EgJygRy&{o0AMlS1^`HL83FL~IllY=_}oMr&_}iuqyWs($0o<JQ(0i9
z#UNo3j<v;)Q92L+m}AB}kpg02L&*XiP8kJchXPQ9VE_OCzyJUMfB^si0MoT!%SU2%
T@C>Yz00000NkvXXu0mjfL+ASW

diff --git a/core/assets/maps/map.png b/core/assets/maps/map.png
index 0c7af60bbe66c42fcfb07ec1d3d46b585965d0ef..6b0358b633348c1c4f119ef36361e8122be4641a 100644
GIT binary patch
delta 1126
zcmV-s1eyD^37-j&Bqa%ONLh0L01FcU01FcV0GgZ_00007bV*G`2jK-17dZ<Xzw|+o
zTPS}SNkl<Zc-rk<Tax222+UAEk#eP6cYLP#*xFPoaco)U(V*sYYGNUp1|%8z=ka*l
z`ea?#x4-<Z>%Fzl|7=@-RFob~jC6P%T4hkVqRrjd(BPV=40-~924ika8MBZ0goqTj
z2oa&@#yXbFLv~DBi_y%(qmY)-pJFuS#Z-U$ba~s~Z<ZS+l&`0Az$vH34@8~eB{2g+
z0#WCnJEnj8c@Ic_>wvQ(g}B(xp!<2Xwe~qdJ0B8HraL3CIo!SuJBBvGV2N_fi}Pu%
z^_Pavv39(Ex|Q&$5?clJ>(;lxX)$%cfmq?NjqK+8J#>d#2WZ8p*e#7WymzWHKLCF|
zHQ48nH4@HLi)6sJsUGIW%|tpdu21zfHi{t7y!{u&CF|?cHlI9TuVEn5<bcE6{tTvP
zZL#@eqgDE;XTl}nL;GHI!~XQ>lUG0wWDX;eV%@2gA%M<=!DSd-i+Cl@fIDP7@Ug-e
z;BdTm#et$Q5I56bpKVXInhpbrV)uVQ9jTb2cQ9~<Ax9E!mT#ci)kWw4XpzH0je*0Q
zvJCJ)rAiZmuAgclo5qKT0zU0Zs|_pww00;#;2Cxl@wfH2BJy*#Gjt>@f&LEY;JRns
znQ{O^@cHK@{RAyuhJujB+A{<;6x`+z0dyh+>%Zz?x<RzmCb-Xn<H~PypNM~%;^#v|
z3Dk1ae6w{U3zVxyS^x0Wv4T}ljW){4>wuDLZxjHa+&^|xU2u#(=Vc(0*A1`G2#12M
z0DNl|LiT-Y-K6{s8G@`f0BR^K6T0wlPaxLIx!2WI-^S>9@~QOeuvuaof>OtKpJ=&g
z8Tzccrnj#2|9|+UMi5PU`v!kPxa-4iw@wlT0gzF2wUUro9XgJ)<M$7zu9e!6<f%7m
z_9Ji9K0(a}jTBZWz7p=tRN>dRg%sHmrK?KUn6vWe4I0BeZz&w#NXez%lyd1QG;ygU
zT)UrZiZYY{7^Y&9Acg_y3jFi{eCseF49o%30Kjlh222kCNf6HfV!(e8gzj6CMNu+<
zk`{n^Bv70Y8Nd)k02qa)U;r_wAA;83l>memC-+7GC<Gu?G6QPVp3wR?pBJ-u5*Y>n
zO&<e5Rl5Uy%=4o4oxgE65d+R%i8A(8HkP52O8O5t6xa?@#{hx>xqyLgQyn%XCI;WM
zQpDir@pw4+NWXn?67qlB?ZrkO;{ky4b!0}qfB3P1F-S}R$iA8z{(is!2Dkut!qDHz
ztd7BQ!xp2J8cxnf2cSP9CoQzlL(o7>Fg3J#6yjDyuv7ye-EIdNKma1v+XR3it|9<9
zpW~|!0Oldu06(gQAO~Q+eQa_pIxRO!Xfi06gmWG7vkD>rbF4OaCt^S@Y^0c>(=lVA
svy%Z#!W05P04M~208j`30igKGA5+?3>SrZkb^rhX07*qoM6N<$g0K7!UH||9

delta 1119
zcmV-l1fct$3A722Bo78+OGiWi{{a60|De66laV1H2m=B!5EJ)-p^-@_e;i3fK~#9!
z?Ooe#!!QhV3C)!5;Hf-Sc4(&RN6{ciY*~`|*737wEQ)tW>S4)W+qNxjcE8`>{_^v9
zeBW-L|GBQ~B55t22>I~ZG)tp&#hcyeo0y3wERA*mAkFLOHWnY!Nf9ApVPXX4+7gTA
z5xY-WlTgpivk+I%pC;7he<JFAxVo*+o3g-6_1awnx=8Im5jCclzzQ%)M2(GBLjU&j
z7LfGj0lh7mP^{8uy{@k7`q@D_4w0tPm66zOuI@u6&_Wm#D`H;k&$_PdL&IlV71mET
z6Yd&fv!H%G`Vu%5Q34L+3Wa54HSV{_-Q7HZD@WNbX}sZG8I|b)fAHx+T|?4HC`-*!
z0Y_aut&O{dbf8_G(brfj<U!`^zcEf(U!S)7<bik%0~w|UoYwYdGVP7U?vsUP>0Qrs
zSA<XFdy$6i<x!`uINgvr%}9*nPOb{!XiwO=4WlcOuSgkig^K6AEi(luZ0}tmkQD}`
z7W(VGZ5geG!+@;Re?2gcWGvAY43uGrQG|EHErfxx6f6PY5{HBv1DiQ%6`;RM6($8;
z-_`OQ8XX~$^KNIFZTJF!YlYGYJi|mG{a7CjB0qaO!-<4q$ajYX=iTd$R0BLDpFftg
z3pDvK)QM=MnL%z-!7_)DLlSw2{;Ln73q&Qiz;z}ZSAH9Ne@9FdKOG^Gp_jYio9#3*
zxuU97^iN+MOE?P3af~waJRs%V+Y11$=x@8IPJV(u=Vc%imxfnl<VS+40300^^2~i{
z-za?#k%FWa0CG4?6H<8iOrWoqbFaJ0zKqfG<gW6ouvj9Sf<otaoordS0^RGb=&dX5
z|8IV&k&8omfAs))xa&i1wT=QM0Vl2SdPOF^Iwg)W@!OkY_lj*xvg?hSdgirSC&+m~
zBSaLE&x9K*mHG8;CWCCU@|ES(n6mTU4`>XZc?&^&Aty_|F2(Yb5aLutIQMz3DTbi{
zK(G`;1U3o?H^2`Mz|jd4z<?Ss4FE{@P{8y6Km_&*e*gwZLEgDVQ5=N=U||8sCj!PE
zK><iX003EN3Izaz{3+=1^8f&rcKf~o02lxWRm>b6)SfW<i_VK#*oia)0HL=5AZy$m
zea!P>^p(GHH<1E*uS6O9DjSBOlUn!>I3!pOV#mOR0%8H<`k3l)D1BmZ<P{?ZU)#1R
zaHKuHe|`$`+wH|djL`r<`8qNo?w@{aU<?uw0HV+4hQA*$fPr5CG+}5z$;^&HS$vz&
zOwCWt_YOdNMh-gA@}7bQa)M}}*|QLqB8)8?0O3|Upa1}1G2aFNNO2hf@bfvo`~dje
zL>tgYwiKiQ%+bdt$FfsdV5Y?&VG)kC#g9=CIRKbr#ygP$Vqrtc0v%2n1!RW;P=sLs
l006)M004ji0002fwO`9eVs`Khtdjr$002ovPDHLkV1leD0!aV>

diff --git a/core/assets/sprites/mindustry.atlas b/core/assets/sprites/mindustry.atlas
index aaf18f5303..0282756873 100644
--- a/core/assets/sprites/mindustry.atlas
+++ b/core/assets/sprites/mindustry.atlas
@@ -6,7 +6,7 @@ filter: Nearest,Nearest
 repeat: none
 block
   rotate: false
-  xy: 161, 23
+  xy: 175, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -20,7 +20,7 @@ bossmech
   index: -1
 bullet
   rotate: false
-  xy: 171, 23
+  xy: 185, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -34,98 +34,112 @@ circle
   index: -1
 coal1
   rotate: false
-  xy: 181, 23
+  xy: 195, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 191, 23
+  xy: 205, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 201, 23
+  xy: 215, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coaldrill
   rotate: false
-  xy: 211, 23
+  xy: 225, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor
   rotate: false
-  xy: 221, 23
+  xy: 235, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyormove
   rotate: false
-  xy: 231, 23
+  xy: 245, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 core
   rotate: false
-  xy: 241, 23
+  xy: 255, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+deepwater
+  rotate: false
+  xy: 265, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 251, 23
+  xy: 275, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 261, 23
+  xy: 285, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 271, 23
+  xy: 295, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtblock
   rotate: false
-  xy: 281, 23
+  xy: 305, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+dirtedge
+  rotate: false
+  xy: 37, 19
+  size: 12, 12
+  orig: 12, 12
+  offset: 0, 0
+  index: -1
 doubleturret
   rotate: false
-  xy: 51, 7
+  xy: 65, 7
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 drill
   rotate: false
-  xy: 291, 23
+  xy: 315, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 fastmech
   rotate: false
-  xy: 301, 23
+  xy: 325, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -139,126 +153,140 @@ firemech
   index: -1
 flameturret
   rotate: false
-  xy: 65, 21
+  xy: 79, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 furnace
   rotate: false
-  xy: 311, 23
+  xy: 335, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 311, 23
+  xy: 335, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 321, 23
+  xy: 345, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 331, 23
+  xy: 355, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 341, 23
+  xy: 365, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+grassblock
+  rotate: false
+  xy: 375, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+grassblock2
+  rotate: false
+  xy: 385, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 37, 19
+  xy: 37, 5
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icon-coal
   rotate: false
-  xy: 351, 23
+  xy: 395, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-iron
   rotate: false
-  xy: 361, 23
+  xy: 405, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-steel
   rotate: false
-  xy: 371, 23
+  xy: 415, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-stone
   rotate: false
-  xy: 381, 23
+  xy: 425, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron1
   rotate: false
-  xy: 391, 23
+  xy: 435, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron2
   rotate: false
-  xy: 401, 23
+  xy: 445, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron3
   rotate: false
-  xy: 411, 23
+  xy: 455, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill
   rotate: false
-  xy: 421, 23
+  xy: 465, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ironwall
   rotate: false
-  xy: 431, 23
+  xy: 475, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 441, 23
+  xy: 485, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laser
   rotate: false
-  xy: 63, 5
+  xy: 77, 5
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
@@ -272,238 +300,259 @@ laserend
   index: -1
 machineturret
   rotate: false
-  xy: 77, 21
+  xy: 91, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 mech1
   rotate: false
-  xy: 451, 23
+  xy: 495, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 megarepairturret
   rotate: false
-  xy: 89, 21
+  xy: 103, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
+mossblock
+  rotate: false
+  xy: 80, 11
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+mossstone
+  rotate: false
+  xy: 80, 11
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 player
   rotate: false
-  xy: 461, 23
+  xy: 80, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repairturret
   rotate: false
-  xy: 101, 21
+  xy: 115, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 rock
   rotate: false
-  xy: 471, 23
+  xy: 90, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 481, 23
+  xy: 90, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock2shadow
   rotate: false
-  xy: 491, 23
+  xy: 100, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow
   rotate: false
-  xy: 501, 23
+  xy: 100, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 66, 11
+  xy: 110, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shadow
   rotate: false
-  xy: 113, 21
+  xy: 127, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shotgunturret
   rotate: false
-  xy: 125, 21
+  xy: 139, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
+shrub
+  rotate: false
+  xy: 110, 1
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+shrubshadow
+  rotate: false
+  xy: 120, 11
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 sniperturret
   rotate: false
-  xy: 137, 21
+  xy: 151, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 steelconveyor
   rotate: false
-  xy: 66, 1
+  xy: 120, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyormove
   rotate: false
-  xy: 76, 11
+  xy: 130, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelwall
   rotate: false
-  xy: 76, 1
+  xy: 130, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone
   rotate: false
-  xy: 37, 5
-  size: 12, 12
-  orig: 12, 12
-  offset: 0, 0
-  index: -1
-stoneedge
-  rotate: false
-  xy: 37, 5
+  xy: 51, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 86, 11
+  xy: 140, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 86, 1
+  xy: 140, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 96, 11
+  xy: 150, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock
   rotate: false
-  xy: 96, 1
+  xy: 150, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock2
   rotate: false
-  xy: 106, 11
+  xy: 160, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock3
   rotate: false
-  xy: 106, 1
+  xy: 160, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stonedrill
   rotate: false
-  xy: 116, 11
+  xy: 170, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-stonedrillhead
+stoneedge
   rotate: false
-  xy: 116, 11
-  size: 8, 8
-  orig: 8, 8
+  xy: 51, 5
+  size: 12, 12
+  orig: 12, 12
   offset: 0, 0
   index: -1
 stonewall
   rotate: false
-  xy: 116, 1
+  xy: 170, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 turret
   rotate: false
-  xy: 149, 21
+  xy: 163, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 126, 11
+  xy: 180, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 51, 19
+  xy: 65, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 weapon-blaster
   rotate: false
-  xy: 126, 1
+  xy: 180, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapon-flamethrower
   rotate: false
-  xy: 136, 11
+  xy: 190, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapon-multigun
   rotate: false
-  xy: 136, 1
+  xy: 190, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapon-trishot
   rotate: false
-  xy: 146, 11
+  xy: 200, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/mindustry.png b/core/assets/sprites/mindustry.png
index 701b9ddd612fd8c710fd4b59783007aaaf28061b..a354a2536d070c9ea6f2fda7614d9d8379697e21 100644
GIT binary patch
literal 6869
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

literal 6045
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
b7z~yN0)4n+cH(3I(s$i+MrVu8*gyC`3pFm|

diff --git a/core/assets/ui/out/button-map-down.9.png b/core/assets/ui/out/button-map-down.9.png
index 8b1180b92bfca138249cd5b6dbbfe5cb942c6c89..b34035f63c775fcc47c0e3d1c1fca44934266788 100644
GIT binary patch
delta 99
zcmcb@c$IO2Bag7SHRH*c`nwDa3?&nNZG2XI-lgN(c5d2FLn-&gV!cr&Sr=Eh!Wm!k
xuNyAf{x)s*KMCGlj@RrLZLv3zazD(>z%V6Ph+Rb4RR(AdgQu&X%Q~loCIHk-CHw#Y

delta 98
zcmcc0c!hC-BM&pPpt0(;eQpd448;?DZM-vHrh9kstWDoxEakpftT)Oe>*5MmIO9wH
wb;Cv5-@Y<^-@|rS;kA6=EqSTl#Sa-7sxkyO&tZM33N(hn)78&qol`;+09LCeumAu6

diff --git a/core/assets/ui/out/button-map-over.9.png b/core/assets/ui/out/button-map-over.9.png
index be806bab8dc2f40656e05fa9e7b4490edf4c772e..02b2542e97511d9db1b057639f13614a32cfbf39 100644
GIT binary patch
delta 93
zcmcb@c!hC-BZsiKmE{lDZ%h+C9lcK3R(A2c6{|Fra$hXg8)cGpafK_K@g@Jd;iBzt
qcb$#vWxK2JT0ZcWyj1Vvhl~t{HG&VzrY$|i00f?{elF{r5}E)Gqb7|2

delta 93
zcmcb@c!hC-BL_3Hpw5bWn>SDNbo4r`pWVfCHr>Kp%6+j|Z<I;a#TBk_#+Ur-hKshp
r{j~I4FWX&(*Ybh4<fVESKV)QR)D)ch+W&A70}yz+`njxgN@xNADT5~7

diff --git a/core/assets/ui/out/button-map.9.png b/core/assets/ui/out/button-map.9.png
index 3af3ea0e105fdd0fd09108aaa4eff7f55d341fc8..0162270254981f7dff2f88743b4444b1cb563b66 100644
GIT binary patch
delta 148
zcmV;F0Birv0nGuBL4Ok$I}TanVoU%40BlJ_K~z}7?Uz9cz%U2|*U}I81mEd7@6{iq
z_q2zU(9ov4Hw7JV5mazbwTY#-PynEmQt_bNT{cY8dZ7I(84*KGRrLp>o9fYNhcc5M
z5kwF{1QA3KK?Hs8u9Nn*Gc%6vW&hFWKSYn#&;hKI5R3dwPz|U60000<MNUMnLSTY|
C89&kh

delta 148
zcmV;F0Birv0nGuBL4N}S6D{rU;imuq0BlJ_K~z}7?U&IBz%U3z&(aZ`!J!;5(}^pj
z|7kx`LPMM0{VC`J4?zX@RGV0O3k3j5DHRXO-DSfhtq0n#k`Xb~R8@a4x~U$Wb|^FH
z5kUkIL=Zs)5k%1U?mB62J2T_xUiKf2{zLR=4ILSA5R};w$_@7b0000<MNUMnLSTZw
CbUV2K

diff --git a/core/assets/ui/uiskin.png b/core/assets/ui/uiskin.png
index 3b83a255ca366281396e2b5921f9cdb0a3f085b3..150b81fb3b13a750369b0c54240c41d63b3ed837 100644
GIT binary patch
literal 12006
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
SL>3@FCI^okcxLEu`Tqe@z+sXA

literal 11998
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

diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 78255ac92c..f3dfa9930b 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -18,7 +18,7 @@ public class Vars{
 	public static final float respawnduration = 60*4;
 	public static final float wavespace = 20*60;
 	public static final float enemyspawnspace = 65;
-	public static boolean debug = false;
+	public static boolean debug = true;
 	
 	public static final Vector2 vector = new Vector2();
 	
@@ -35,7 +35,7 @@ public class Vars{
 	
 	public static float breaktime = 0;
 	
-	public static final String[] maps = {"delta", "canyon", "pit", "maze", "test"};
+	public static final String[] maps = {"delta", "canyon", "pit", "maze"};
 	public static Pixmap[] mapPixmaps;
 	public static Texture[] mapTextures;
 	public static int currentMap;
diff --git a/core/src/io/anuke/mindustry/World.java b/core/src/io/anuke/mindustry/World.java
index c940c3bf2a..bfa44ba4e6 100644
--- a/core/src/io/anuke/mindustry/World.java
+++ b/core/src/io/anuke/mindustry/World.java
@@ -25,7 +25,7 @@ public class World{
 	public static boolean solid(int x, int y){
 		Tile tile = tile(x, y);
 		
-		return tile == null || tile.block().solid;
+		return tile == null || tile.block().solid || (tile.floor().solid && (tile.block() == Blocks.air));
 	}
 	
 	public static int width(){
diff --git a/core/src/io/anuke/mindustry/world/Generator.java b/core/src/io/anuke/mindustry/world/Generator.java
index 5a2d2663bc..5f23cf9a24 100644
--- a/core/src/io/anuke/mindustry/world/Generator.java
+++ b/core/src/io/anuke/mindustry/world/Generator.java
@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.utils.ObjectMap;
 
 import io.anuke.mindustry.world.blocks.Blocks;
 import io.anuke.ucore.graphics.Hue;
@@ -14,11 +15,18 @@ import io.anuke.ucore.noise.Noise;
 import io.anuke.ucore.util.Mathf;
 
 public class Generator{
-	static final int stonefloor = Color.rgba8888(Hue.rgb(54, 54, 54));
-	static final int stone = Color.rgba8888(Hue.rgb(128, 128, 128));
 	static final int spawn = Color.rgba8888(Color.RED);
 	static final int start = Color.rgba8888(Color.GREEN);
 	
+	static ObjectMap<Integer, Block> colors = map(
+		Hue.rgb(80, 150, 90), Blocks.grass,
+		Hue.rgb(90, 180, 100), Blocks.grassblock,
+		Hue.rgb(80, 110, 180), Blocks.water,
+		Hue.rgb(70, 90, 150), Blocks.deepwater,
+		Hue.rgb(110, 80, 30), Blocks.dirt,
+		Hue.rgb(100, 100, 100), Blocks.stoneblock
+	);
+	
 	/**Returns world size.*/
 	public static void generate(int map){
 		Pixmap pix = mapPixmaps[map];
@@ -31,37 +39,44 @@ public class Generator{
 				
 				int color = pix.getPixel(x, pix.getHeight()-1-y);
 				
-				if(Noise.nnoise(x, y, 8, 1) > 0.22){
-					floor = Blocks.iron;
-				}
-				
-				if(Noise.nnoise(x, y, 8, 1) > 0.1){
-					floor = Blocks.grass;
-				}
-				
-				if(Noise.nnoise(x, y, 8, 1) > 0.1){
-					floor = Blocks.water;
-				}
-				
-				if(Mathf.chance(0.01)){
-					block = Blocks.rock;
-				}
-				
-				if(Mathf.chance(0.01)){
-					block = Blocks.rock2;
-				}
-				
-				if(Noise.nnoise(x, y, 6, 1) > 0.245){
-					floor = Blocks.coal;
-				}
-				if(color == stone && map == 1){
-					block = Blocks.dirtblock;
-				}else if(color == stone){
-					block = Mathf.choose(Blocks.stoneblock, Blocks.stoneblock2, Blocks.stoneblock3);
+				if(colors.containsKey(color)){
+					//TODO less hacky method
+					if(colors.get(color).name().contains("block")){
+						block = colors.get(color);
+					}else{
+						floor = colors.get(color);
+					}
 				}else if(color == start){
 					core = tiles[x][y];
 				}else if(color == spawn){
 					spawnpoints.add(tiles[x][y]);
+				}else{
+					if(Mathf.chance(0.02)){
+						block = Mathf.choose(Blocks.rock, Blocks.rock2);
+					}
+				}
+				
+				if(floor == Blocks.stone || floor == Blocks.grass){
+					if(Noise.nnoise(x, y, 8, 1) > 0.2){
+						floor = Blocks.iron;
+					}
+					
+					if(Noise.nnoise(x, y, 6, 1) > 0.242){
+						floor = Blocks.coal;
+					}
+				}
+				
+				if(block == Blocks.grassblock){
+					floor = Blocks.grass;
+					block = Mathf.choose(Blocks.grassblock, Blocks.grassblock2);
+				}
+				
+				if(block == Blocks.stoneblock){
+					block = Mathf.choose(Blocks.stoneblock, Blocks.stoneblock2, Blocks.stoneblock3);
+				}
+				
+				if(floor == Blocks.grass && Mathf.chance(0.02) && block == Blocks.air){
+					block = Blocks.shrub;
 				}
 				
 				tiles[x][y].setBlock(block);
@@ -80,4 +95,15 @@ public class Generator{
 			mapTextures[i] = new Texture(pix);
 		}
 	}
+	
+	private static ObjectMap<Integer, Block> map(Object...objects){
+		
+		ObjectMap<Integer, Block> out = new ObjectMap<>();
+		
+		for(int i = 0; i < objects.length; i += 2){
+			out.put(Hue.rgb((Color)objects[i]), (Block)objects[i+1]);
+		}
+		
+		return out;
+	}
 }
diff --git a/core/src/io/anuke/mindustry/world/blocks/Blocks.java b/core/src/io/anuke/mindustry/world/blocks/Blocks.java
index cc87d2d3b3..72f3ed02d2 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Blocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Blocks.java
@@ -11,6 +11,16 @@ public class Blocks{
 		public void draw(Tile tile){}
 	},
 	
+	deepwater = new Block("deepwater"){{
+		vary = false;
+		solid = true;
+	}},
+	
+	water = new Block("water"){{
+		vary = false;
+		solid = true;
+	}},
+	
 	stone = new Block("stone"),
 	
 	dirt = new Block("dirt"),
@@ -21,11 +31,6 @@ public class Blocks{
 	
 	grass = new Block("grass"),
 	
-	water = new Block("water"){{
-		vary = false;
-		solid = true;
-	}},
-	
 	stoneblock = new Block("stoneblock"){{
 		solid = true;
 	}},
@@ -38,16 +43,34 @@ public class Blocks{
 		solid = true;
 	}},
 	
+	grassblock = new Block("grassblock"){{
+		solid = true;
+	}},
+	
+	grassblock2 = new Block("grassblock2"){{
+		solid = true;
+	}},
+					
+	mossblock = new Block("mossblock"){{
+		solid = true;
+	}},
+	
+	shrub = new Block("shrub"){{
+		shadow = "shrubshadow";
+		breakable = true;
+		breaktime = 10;
+	}},
+	
 	rock = new Block("rock"){{
 		shadow = "rockshadow";
 		breakable = true;
-		breaktime = 10;
+		breaktime = 15;
 	}},
 			
 	rock2 = new Block("rock2"){{
 		shadow = "rock2shadow";
 		breakable = true;
-		breaktime = 10;
+		breaktime = 15;
 	}},
 	
 	dirtblock = new Block("dirtblock"){{