From 4c26efaef6118ca6405ebd829f20a5e29bb5d1c5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 29 Apr 2017 22:15:41 -0400
Subject: [PATCH] Added a bunch more turrets

---
 core/assets/sprites/moment.atlas              | 276 ++++++++++--------
 core/assets/sprites/moment.png                | Bin 3292 -> 3877 bytes
 core/src/io/anuke/moment/Moment.java          |   4 +-
 .../io/anuke/moment/entities/BulletType.java  |  15 +
 core/src/io/anuke/moment/resource/Recipe.java |   6 +-
 core/src/io/anuke/moment/world/Generator.java |   2 +-
 core/src/io/anuke/moment/world/TileType.java  | 119 +++++++-
 .../anuke/moment/desktop/DesktopLauncher.java |   1 +
 8 files changed, 286 insertions(+), 137 deletions(-)

diff --git a/core/assets/sprites/moment.atlas b/core/assets/sprites/moment.atlas
index 68e612280f..c2793a340a 100644
--- a/core/assets/sprites/moment.atlas
+++ b/core/assets/sprites/moment.atlas
@@ -6,203 +6,217 @@ filter: Nearest,Nearest
 repeat: none
 block
   rotate: false
-  xy: 57, 23
+  xy: 105, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 67, 23
+  xy: 115, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-coal1
-  rotate: false
-  xy: 77, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-coal2
-  rotate: false
-  xy: 87, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-coal3
-  rotate: false
-  xy: 97, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-coaldrill
-  rotate: false
-  xy: 107, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-conveyor
-  rotate: false
-  xy: 117, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-conveyormove
-  rotate: false
-  xy: 127, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-core
-  rotate: false
-  xy: 137, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-dirt1
-  rotate: false
-  xy: 147, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-dirt2
-  rotate: false
-  xy: 157, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-dirt3
-  rotate: false
-  xy: 167, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-dirtblock
-  rotate: false
-  xy: 177, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-doubleturret
+circle
   rotate: false
   xy: 1, 1
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
-drill
+coal1
   rotate: false
-  xy: 187, 23
+  xy: 125, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-furnace
+coal2
   rotate: false
-  xy: 197, 23
+  xy: 135, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-smelter
+coal3
   rotate: false
-  xy: 197, 23
+  xy: 145, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-grass
+coaldrill
   rotate: false
-  xy: 207, 23
+  xy: 155, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-healturret
+conveyor
+  rotate: false
+  xy: 165, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyormove
+  rotate: false
+  xy: 175, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+core
+  rotate: false
+  xy: 185, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirt1
+  rotate: false
+  xy: 195, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirt2
+  rotate: false
+  xy: 205, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirt3
+  rotate: false
+  xy: 215, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirtblock
+  rotate: false
+  xy: 225, 23
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+doubleturret
   rotate: false
   xy: 13, 1
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
-icon-coal
+drill
   rotate: false
-  xy: 217, 23
+  xy: 235, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-icon-iron
+flameturret
   rotate: false
-  xy: 227, 23
+  xy: 21, 21
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+furnace
+  rotate: false
+  xy: 245, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-icon-steel
+smelter
   rotate: false
-  xy: 237, 23
+  xy: 245, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-icon-stone
-  rotate: false
-  xy: 247, 23
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-iron1
+grass
   rotate: false
   xy: 25, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-iron2
+healturret
+  rotate: false
+  xy: 33, 21
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-coal
   rotate: false
   xy: 25, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-iron3
+icon-iron
   rotate: false
   xy: 35, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-irondrill
+icon-steel
   rotate: false
   xy: 35, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ironwall
+icon-stone
   rotate: false
   xy: 45, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+iron1
+  rotate: false
+  xy: 45, 1
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+iron2
+  rotate: false
+  xy: 55, 11
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+iron3
+  rotate: false
+  xy: 55, 1
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+irondrill
+  rotate: false
+  xy: 65, 11
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ironwall
+  rotate: false
+  xy: 65, 1
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 laser
   rotate: false
-  xy: 55, 7
+  xy: 135, 9
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
@@ -216,112 +230,126 @@ laserend
   index: -1
 machineturret
   rotate: false
-  xy: 21, 21
+  xy: 45, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 mech1
   rotate: false
-  xy: 45, 1
+  xy: 75, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 player
   rotate: false
-  xy: 58, 13
+  xy: 75, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 68, 13
+  xy: 85, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shadow
   rotate: false
-  xy: 33, 21
+  xy: 57, 21
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+shotgunturret
+  rotate: false
+  xy: 69, 21
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+sniperturret
+  rotate: false
+  xy: 81, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 steelconveyor
   rotate: false
-  xy: 78, 13
+  xy: 85, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyormove
   rotate: false
-  xy: 88, 13
+  xy: 95, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone
   rotate: false
-  xy: 98, 13
+  xy: 95, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 108, 13
+  xy: 105, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 118, 13
+  xy: 105, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 128, 13
+  xy: 115, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock
   rotate: false
-  xy: 138, 13
+  xy: 115, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stonedrill
   rotate: false
-  xy: 148, 13
+  xy: 125, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stonedrillhead
   rotate: false
-  xy: 148, 13
+  xy: 125, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stonewall
   rotate: false
-  xy: 158, 13
+  xy: 125, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 turret
   rotate: false
-  xy: 45, 21
+  xy: 93, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
diff --git a/core/assets/sprites/moment.png b/core/assets/sprites/moment.png
index 4de7a74884e0023288901c2d8cfd16ed13464fd5..3d553375e465bad81feff09b46cb6da2cd35c9db 100644
GIT binary patch
literal 3877
zcmXY!c|6p8_r^cpnXwNu;m&@W9&3x+kgbRj-N;h5$~s!?YnHM!W0Vw<-Pn!nSxd<l
zlUBk|)`lpIof!LA9>3@H`{%sQ`RDv~UFUkA=*wmXyxgMP003SiLwySXpu-kmIN1;D
zURm)Z0DKEZ`np!ZKNhp+eTA$=Kj*bN;TL#nebt)E#bn&j1NFnaM`TVulecPEf9Czp
zand&YttI{2H!(q5HwE%hw|s>wcGwa9G&Y$02bub;{!x8(^WUOIkCj&XTShv&H*e*(
zpDuA_s54o6wvTg+S~5<P%{0Gn6T1U)0~qMxSZABY;FX2xDWUnXqDN}+Wv>;!+B7+9
ze;OoCCK|YHEDWy=-Hh*T4q?tj%jHt!^6ptgSMT*-#rF>4!z%~sP8kGFcT4Q7e3mRL
zER2kaiNWwR_F4E4v_~pBtgWqc3C(z+JULYjjZzgQr9=}IW##i6sJ~S_4)*r~*JjMW
z+;7p)shE7@y~DbvuiF-2(@H!i!_W1+qM~qa&g12>Wu>QwM`>N%m9na;r=ntFWtEk2
zcNTwKICt*c+6LX%5|77Ieox7@2zM^?fG8lgAFuj3Wj6fkHlMD%Cd(dBcWYg`EauMy
zFnUHB0vwon!Agqw787;fpH_?mMwYKVsM&61EoplA`j!OE4~$v@!}rU>wFX8@^cDi^
z6&&0E)ETT!Y!~eY2)ujuB#=HGjwEGpfYy(kK=^OQZ4aW&1^}UJy#_DpyuQ~80yVE8
z3IK$SVb_k`x>*MTYw-;?a$;h_>dKWUAv+Nf7c$xj)T|L!wQTB4^FLsEJ_2D03FiX4
zu+60+3C%n5`A-NM10y3Q!^6WzUj?t+7*mzbzXh|j8fL%i{GM8?;5@j0v92NcI6D;y
z$GyCebC=<JkWX&<N0yE1D<Ci@&Q5Y6q7dDAIw){0K}E*^c6a%wbs`A?^e{HO)p|Jf
zYy`=1{wv{Wdun6o=DXdakuSB<xIiH+QW&f#D*%$yg3wuQKM1?hE_4wIriY{f7O`ds
zfCgdb6&nQey2k}q;kYG$>kwRJ^;cv7@T9fOQ=e-p5TLKLQxfv>su4_MFhlR}@4twI
zIVb^_zrnMAd=|r58{UIkNZ3Mh7mxt_2qd6yT@>d6h)`*gJWduWQd&dftM}HMNq7Ma
zC$OKW{dICP=kg6qO))oU#}&hISCORPb`4NCD}!tU;CCeE<=}L8j%5gmN9dpWE{H^u
zg7iUG))*!^+PMj@9(DXu0v{Oqqb!<$Hv9{i`$I293gJ`~ObPs!DKG^hkRd?mgR_W{
zTnGmkt-&kLcpx7>9G<vc)N$xj<z6ARHCK)Fq{!>ZBsd)2N2kxbFB|_74pk`@0L8K-
zE}+bThGQJR!KhWJ{jw)Hg8}az0y(H*LA+q>jZeXJR$8xRwPK$xC2~)r#s80W(R)c`
zZ;>&1gh3MEm5-B<Sk(uOiF^J~vDzyxK)iuQqEO|IK-eK3h+|Ex)t%%YmhBb5zyxBS
z6>s{&=(i8fcTuN=K|moA)+P!uSqEhs{|pXY?+@}oIkXZ-3r=3Gk_Rg4&8qI0o<JBi
zO?i81v`G#EtgRs{7)JhL!V&NQm-fGn6k%|h2jp|Wln^FuFD{&O_VPMeSi0OvRBM@f
zti3ZM_4*RuJzZ(6Rg+PBG`HI$2bYYbhs2Dvjg31pYK<+Ga8Nw<#y4;7;L&BqZNSUR
z`|9?@zp<&w$rFiMY25P902P6F42{dNL+m`)DVB$>;fkQ<Q;`vv%CoDsw+?+(x+nt7
zGO8S!ihmSf?|3`21qB6#^fkVYu$}WPtIdz`kieM8fcoRqe4XXmxV>ZuEG>SD6Kgp*
z2+lauOM1?B?K-*t{dUSZ+i@7>kCi(HoM88~qDy|#A@0`mcNij-5j8&E-bLQ@x_4V?
zQYhry$)73=?)ngl94e@Gj*cY7$E$yTy;A9eph`h!VAL1Cx?w^<K|$f)mD^_Q>@vuF
zlWFeVq@2bo$F~=C|H3tY0G#$tM9xpHOb*@gFNsnY`482Di5#|j<MVOojxmnPrfZ<*
z;N%;TtC<ir{Uc8X`qNrop6aymp8lpu3Nrtst?l!CQATiUYmX0v8F79D>F%*AZ;i~Q
zNVjf)EnN~ss#2StIQkU@Q-)!Ak;<x&)8z^s?STU6O<jI~-LEV%PSrRz!vSoVC2&&B
zXk>dgm)J^r5_Lrx-X$r>i-^E@@Bvdm-<3W_#UubU{!K{Z8)2B+-|6f~qnlqMRLmi2
zRBKLZ(Fa_;5HOs|il{kq2}u%ZoIJIg+Ph_*#r7<W<`%3MK!R|gD&ugVOjv*c%3VyS
z(=qvqV{K0n&10G1tn}pA`-J4FdagtHmu&}e>a&q9nUUtAMB~s@3Puvlpf9teK@u+;
zpBR6E@u^`$YD^5bvIrjL)R;^PokSl6!2`GXvFx}G^q2XQF(bU!g6kj8@%bjA{em_Y
zY<`o!0qClPv#)Rf@aKap`7ev=s<THDS8ho`CFNpR`L)4#7KE|+@W6+5NoP-mooZsY
z@9?7SR^TOhVRleNf1dgbj2G$Iys9~HkC#SIE<YUR7<B%=KB5!+s$4_vPx(75$Zw$w
z7DOmv(coa=Fl93RLF9Jl84*m|zghqYq7a$Gz-fY+#F>nmvGvc+j742`FhX?<MD2v$
zuU}9X-1-<n9y*j&Xw`wu>q~g2PoCR6|2K;sw^w%Ws9@tcTI$#h2nU^~X{FWty<MF7
zNZypnb$dw{gE*QLl=GM*Dp1J{)<c^52<M~w<8EbLETd3JF|o1zXX>@1c=JLw<yF_?
zR_$Z1^e>q=5?4$4pZ3#fCp=0e>x8J6_(A%4Bn=gQ*WJA=GamBv$|{yUo%2Xl*8knP
zyLaw9U*^H&T6BpR<VQ|NZ*wc{WsTZjG!|C;*4z85J6xl0%-A)mY35Vd;zd`3M)$2A
z$2od!^4TnYEBp>DwK_CgO_6}TdBSc3E#pW`KaobWI4{ETs|ekG-)D{`Kb6ic-W;<v
zaedQbSRzI)U2kBJXJ`svQ_R%fp4anrwsiGA{#wn){H;9)pE!nHg@@IrA<W8o$NW_L
zS(8jAmwZ^3+*dcdP?UlM#WF|OK~Kvwfes{rO^);Y@UQ_t!sgMHZ%hude8Dub;tn*P
z;xG$H`!9d}HApcV-ghu|-{0L%jyi*YaJlIRzyBk8Pl~>|Ghuxpu&`1$&g_Hnh;?n=
zk5yFglFd)gsnw&ld3II%kXO`T7V8}IM8~$^e3(ILbr?q~nLKtHXtdJ*aumPPvm05=
z^rOwRTsX}gb$HUeiP0ipHZzY6EQ~Z*LL99e#RshDqcSNh7AsX4WT@!y6j$3T*>O3C
zJb^&L``uG&Iy}Iw{91V@Z}L3DRS7tGv6ISRnHGnLAz@Qumh*B5{cIr@e$$m#OEGS#
zB~qO2OMuDi)~tGe4|nmbO)9NTcue|4HcM={B0Z2W(~+rDrn;0L_HnB)Y+yN+_70YO
z5c)mc)sgK?JnZRTzQa`v;aAWDM4@wQX~cN}gg``_7g09I!-ox)n{r`8@JqC<g~-i>
z=wpLKDS6A({oR%Wzu2VxT`xVe43C$RSCu7dd6(v{_1ETlAJ>a?u^N(fy9OeCV1HtN
zGFKx%Bex2M(DKHX<0IczJ)9RzA2CNV@o>_VxTOVqI3cm*4rBhSZD?0Bhb228?(b$b
z_;e{&qt1Mud4CmOl%F~}=NM}I$?(3}ecGAgr8l>xG!%XWw^_1`fuCT)cRw7#QT!+<
zZAWh?gEef99#a@70bvj<shoyLdA)PFJ*-NExb=%e{l!D&<-6Ut3l1R(?pLFIcQZX{
z<S@@1s%$0(y6+LHigIoqhn$A>P(65oujf=-o3#)4vI9b$AztU#4Vzy{6U-^?kk(a8
zkMG$ryGE-20h)nz7-C|O5x^1Os=9G}HL{-S^Wx_|Maa{lAvpK6_FUU!CEuHs^4E!3
zhZA?3*A}rZrXSZ<ZHqmZ|H=J-wApP&&mJSU(d9Kw0SY7$V()XqI<BcxD%OV)TMwK<
zkE;phmB4|&4)u1ODHzYR5fyMYw=6+`s;O<;;`y6h)3cjjdu|S8EU7PK$GE8*KtQ{A
zm8BCG7iXGjZ6kWFG>Xg^U?O+4;&=8-N8>HIK*eC(&ljsrI(LqZ3qks9y3faZAc`>u
z$*r}C&WGq@CX<{GY9?_ilL*QaUPRInYX15DpFy4k5vWEaJ3#9Q@F97Ir{(e_fbn_%
zFJ1Im0FF@Q#K@sliuqK!#v>^Z(i-}~sd20(;KaXdpe22+eXR7hAhGsDmd9F6?Fp9A
zqgd_9Oei1K(5(XY*SlS0+=*O}55LKUU`aMWL}LL48&VD*XLOXL1OklG<DU^vc-a`_
zFxpG5ORT&&8iO1HvhC`fAIQN-vl-XyH{bw|ALvoGA)E1GI@c8^t0)hu*Df@UO*@7u
zu4TuVLw@rE3I*Hw`T57jR*r-&R*Kosc+$K3nOyBH4TtHK!1#Pt02p4?1=uN2EDmOg
z$PbwD!gMUjj!~Fix;H9K!8Y3sB$Jel<dCyzXN<_v(oQ|=4MMn|)tv!;Ha`_FrSrR(
zeJll7!h70z?PDiT#+t~c{c1e^VUVV}=XF`|$W&HrnGdXHI|QFDP4S{-{n(h*M_%_h
zaQB84vd+{jtlqF(6Kpn4P=V)3HEjvQJW-Vx!^}KdqJy88#jX7Y15#IXRdZky^q|Uj
zj$Nzwp7rR&i<nqM{=z~4jZ3rScg&9#Lx9uSY)_UWK!B-7^xmML^M0XIq)pgkSTbBQ
zWI+>|X4KigH(Z?&hlxIg1-KhMeLUzjg&1FctO#e@si>CQ@moWzhk4~p-kXqC(oIkw
z<pR%)yvY;3&6I~nXu(HUYTK(6|AP!tWZ^X@!dmY=Syu1Nj`4g>*8+b8TEA$ub)!J}
zmCFCosOjRJR>bv}OcM&H=H%J$qof^Xk|}I^cj=KV$w-`6+7p(ZVxjIN3n+4IruRjL
z(1%2q5e4IDuZd*GofwP{ZEa^*1$Ih`0^!8RRoXgWlEDb|KeYD^fIHy07BL;wui}F{
Qe1Cz_1vCAs^G^5w3;)#!&j0`b

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

diff --git a/core/src/io/anuke/moment/Moment.java b/core/src/io/anuke/moment/Moment.java
index cc5d713ef1..f9b3564555 100644
--- a/core/src/io/anuke/moment/Moment.java
+++ b/core/src/io/anuke/moment/Moment.java
@@ -4,7 +4,6 @@ import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.ObjectMap;
 
-import io.anuke.aabb.Collider;
 import io.anuke.moment.entities.Enemy;
 import io.anuke.moment.entities.Player;
 import io.anuke.moment.resource.Item;
@@ -67,8 +66,7 @@ public class Moment extends ModuleController<Moment>{
 		
 		items.put(Item.stone, 200);
 		items.put(Item.iron, 200);
-		
-		Collider.defaultDrag = 0.2f;
+		items.put(Item.steel, 200);
 		
 		player = new Player().add();
 		
diff --git a/core/src/io/anuke/moment/entities/BulletType.java b/core/src/io/anuke/moment/entities/BulletType.java
index 44cc28d155..460fe300bf 100644
--- a/core/src/io/anuke/moment/entities/BulletType.java
+++ b/core/src/io/anuke/moment/entities/BulletType.java
@@ -20,6 +20,13 @@ public enum BulletType{
 			Draw.clear();
 		}
 	},
+	sniper(3f, 17){
+		public void draw(Bullet b){
+			Draw.color("light gray");
+			Draw.rect("bullet", b.x, b.y, b.angle());
+			Draw.clear();
+		}
+	},
 	small(1.5f, 1){
 		public void draw(Bullet b){
 			Draw.color("orange");
@@ -27,6 +34,14 @@ public enum BulletType{
 			Draw.clear();
 		}
 	},
+	flame(0.6f, 4){
+		public void draw(Bullet b){
+			Draw.color(Color.YELLOW, Color.SCARLET, b.time/lifetime);
+			float size = 6f-b.time/lifetime*5f;
+			Draw.rect("circle", b.x, b.y, size, size);
+			Draw.clear();
+		}
+	},
 	shot(2.4f, 2){
 		{lifetime=40;}
 		public void draw(Bullet b){
diff --git a/core/src/io/anuke/moment/resource/Recipe.java b/core/src/io/anuke/moment/resource/Recipe.java
index 6e482fca38..74875a3c51 100644
--- a/core/src/io/anuke/moment/resource/Recipe.java
+++ b/core/src/io/anuke/moment/resource/Recipe.java
@@ -9,12 +9,16 @@ public enum Recipe{
 	irondrill(TileType.irondrill, stack(Item.stone, 30)),
 	coaldrill(TileType.coaldrill, stack(Item.stone, 30), stack(Item.iron, 30)),
 	conveyor(TileType.conveyor, stack(Item.stone, 1)),
+	fastconveyor(TileType.steelconveyor, stack(Item.steel, 1)),
 	router(TileType.router, stack(Item.stone, 3)),
 	smelter(TileType.smelter, stack(Item.stone, 40), stack(Item.iron, 40)),
 	healturret(TileType.healturret, stack(Item.iron, 20)),
 	turret(TileType.turret, stack(Item.stone, 4)),
 	dturret(TileType.doubleturret, stack(Item.stone, 6)),
-	machineturret(TileType.machineturret, stack(Item.iron, 8), stack(Item.stone, 6));
+	machineturret(TileType.machineturret, stack(Item.iron, 10), stack(Item.stone, 6)),
+	shotgunturret(TileType.shotgunturret, stack(Item.iron, 10), stack(Item.steel, 8)),
+	flameturret(TileType.flameturret, stack(Item.iron, 12), stack(Item.steel, 12)),
+	sniperturret(TileType.sniperturret, stack(Item.iron, 15), stack(Item.steel, 20));
 	
 	public TileType result;
 	public ItemStack[] requirements;
diff --git a/core/src/io/anuke/moment/world/Generator.java b/core/src/io/anuke/moment/world/Generator.java
index 527f8e50b0..05a1823e5a 100644
--- a/core/src/io/anuke/moment/world/Generator.java
+++ b/core/src/io/anuke/moment/world/Generator.java
@@ -33,7 +33,7 @@ public class Generator{
 				}
 				
 				if(color == white){
-					block = TileType.dirtblock;
+					block = TileType.stoneblock;
 					
 					
 				}else if(color == blue){
diff --git a/core/src/io/anuke/moment/world/TileType.java b/core/src/io/anuke/moment/world/TileType.java
index 128d04bb0b..d25106e4ee 100644
--- a/core/src/io/anuke/moment/world/TileType.java
+++ b/core/src/io/anuke/moment/world/TileType.java
@@ -179,7 +179,7 @@ public enum TileType{
 		}
 
 		public String description(){
-			return "Moves Items (faster than a normal conveyor!)";
+			return "Moves Items\nFaster than a normal conveyor";
 		}
 
 		@Override
@@ -273,7 +273,7 @@ public enum TileType{
 	doubleturret(true, true, false){
 		{
 			range = 40;
-			reload = 10f;
+			reload = 13f;
 			bullet = BulletType.stone;
 			ammo = Item.stone;
 			health = 50;
@@ -294,11 +294,19 @@ public enum TileType{
 		public String description(){
 			return "Shoots things.";
 		}
+		
+		@Override
+		void shoot(Tile tile){
+			vector.set(4, -2).rotate(tile.entity.rotation);
+				bullet(tile, tile.entity.rotation);
+			vector.set(4, 2).rotate(tile.entity.rotation);
+				bullet(tile, tile.entity.rotation);
+		}
 	},
 	machineturret(true, true, false){
 		{
 			range = 65;
-			reload = 5f;
+			reload = 7f;
 			bullet = BulletType.iron;
 			ammo = Item.iron;
 			health = 65;
@@ -320,6 +328,91 @@ public enum TileType{
 			return "Shoots things.";
 		}
 	},
+	flameturret(true, true, false){
+		{
+			range = 30f;
+			reload = 6f;
+			bullet = BulletType.flame;
+			ammo = Item.coal;
+			health = 75;
+		}
+
+		public void update(Tile tile){
+			updateTurret(tile);
+		}
+
+		public void draw(Tile tile){
+			Draw.rect("block", tile.worldx(), tile.worldy());
+		}
+
+		public void drawOver(Tile tile){
+			Draw.rect(name(), tile.worldx(), tile.worldy(), tile.entity.rotation - 90);
+		}
+
+		public String description(){
+			return "Burns things.";
+		}
+	},
+	sniperturret(true, true, false){
+		{
+			range = 100;
+			reload = 60f;
+			bullet = BulletType.sniper;
+			ammo = Item.steel;
+			health = 60;
+		}
+
+		public void update(Tile tile){
+			updateTurret(tile);
+		}
+
+		public void draw(Tile tile){
+			Draw.rect("block", tile.worldx(), tile.worldy());
+		}
+
+		public void drawOver(Tile tile){
+			Draw.rect(name(), tile.worldx(), tile.worldy(), tile.entity.rotation - 90);
+		}
+
+		public String description(){
+			return "Shoots things.";
+		}
+	},
+	shotgunturret(true, true, false){
+		{
+			range = 65;
+			reload = 40f;
+			bullet = BulletType.iron;
+			ammo = Item.iron;
+			health = 70;
+		}
+
+		public void update(Tile tile){
+			updateTurret(tile);
+		}
+
+		public void draw(Tile tile){
+			Draw.rect("block", tile.worldx(), tile.worldy());
+		}
+
+		public void drawOver(Tile tile){
+			Draw.rect(name(), tile.worldx(), tile.worldy(), tile.entity.rotation - 90);
+		}
+
+		public String description(){
+			return "Shoots things.";
+		}
+		
+		@Override
+		void shoot(Tile tile){
+			vector.set(0, 4).setAngle(tile.entity.rotation);
+			for(int i = 0; i < 6; i ++)
+				Timers.run(i, ()->{
+					bullet(tile, tile.entity.rotation + Mathf.range(6));
+				});
+				
+		}
+	},
 	healturret(true, true, false){
 		{
 			range = 30;
@@ -415,24 +508,34 @@ public enum TileType{
 			tile.entity.shots += 20;
 			tile.entity.removeItem(ammo, 1);
 		}
-
-		if(tile.entity.shots > 0){
+		
+		//TODO readd
+		//if(tile.entity.shots > 0){
 			Enemy enemy = findTarget(tile, range);
 			if(enemy != null){
 				tile.entity.rotation = MathUtils.lerpAngleDeg(tile.entity.rotation, Angles.predictAngle(tile.worldx(), tile.worldy(), enemy.x, enemy.y, enemy.xvelocity, enemy.yvelocity, bullet.speed - 0.1f), 0.2f);
 				if(Timers.get(tile, reload)){
-					new Bullet(bullet, tile.entity, tile.worldx(), tile.worldy(), tile.entity.rotation).add();
+					shoot(tile);
 					tile.entity.shots--;
 				}
 			}
-		}
+		//}
+	}
+	
+	void shoot(Tile tile){
+		vector.set(0, 4).setAngle(tile.entity.rotation);
+		new Bullet(bullet, tile.entity, tile.worldx()+vector.x, tile.worldy()+vector.y, tile.entity.rotation).add();
+	}
+	
+	void bullet(Tile tile, float angle){
+		new Bullet(bullet, tile.entity, tile.worldx()+vector.x, tile.worldy()+vector.y, angle).add();
 	}
 
 	Enemy findTarget(Tile tile, float range){
 		Entity closest = null;
 		float dst = 0;
 
-		Array<SolidEntity> array = Entities.getNearby(tile.worldx(), tile.worldy(), 100);
+		Array<SolidEntity> array = Entities.getNearby(tile.worldx(), tile.worldy(), range*2);
 
 		for(Entity e : array){
 
diff --git a/desktop/src/io/anuke/moment/desktop/DesktopLauncher.java b/desktop/src/io/anuke/moment/desktop/DesktopLauncher.java
index 3947b1f622..78da4b39f9 100644
--- a/desktop/src/io/anuke/moment/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/moment/desktop/DesktopLauncher.java
@@ -11,6 +11,7 @@ public class DesktopLauncher {
 		config.setTitle("Moment");
 		config.setMaximized(true);
 		config.useVsync(false);
+		config.setWindowedMode(800, 600);
 		new Lwjgl3Application(new Moment(), config);
 	}
 }