From b2a634e5e71d10cf08b876ebc4709c8140b3f820 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 10 Sep 2021 09:17:25 -0400 Subject: [PATCH] Untested/WIP naval campaign map --- core/assets/icons/icons.properties | 2 +- core/assets/maps/coastline.msav | Bin 0 -> 16630 bytes core/src/mindustry/content/SectorPresets.java | 15 ++++++++++++++- core/src/mindustry/content/TechTree.java | 12 ++++++++++-- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 core/assets/maps/coastline.msav diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 2b29514b5b..2bcf2d22de 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -1,6 +1,6 @@ 63743=spawn|block-spawn-ui 63742=deepwater|block-deepwater-ui -63741=water|block-water-ui +63741=water|block-shallow-water-ui 63740=tainted-water|block-tainted-water-ui 63739=darksand-tainted-water|block-darksand-tainted-water-ui 63738=sand-water|block-sand-water-ui diff --git a/core/assets/maps/coastline.msav b/core/assets/maps/coastline.msav new file mode 100644 index 0000000000000000000000000000000000000000..eacc6615ea2abd7b5266732c7a7a91e1a7b43961 GIT binary patch literal 16630 zcmV(>K-j-{oZWp1lw{Xg-mR)vdv#TJS1&c)v-d1&&Gcxto=w)s(u^c)m$mfFXe8S; z-8C~MRadpDyJwM*Eg6ErHpZ+D5nv9%z##-1$Cv;i2@Z)3{vMS!Dd+pc%r&Ye&oA32o%PLywueMaKxw>+-*H_tlx~ng?G~kuy%Cbto@~X-& zHkS;*kvG5R&7XMlAHVsNZ+`a8pZLn_U-{shKl|oCRn_@kcctI!bXp5f-&|^G&Qacu?i8w%S*&uGoicf3?$EPXEj+E3M|@ z@~Kx2o_gig{fAGz((YbvciStidlnaar-;l~U)|qaS?RYgt**3|snPOM^Llsr)Wug; zH11QEJI#J;|E1QIcK6iGA*!5jcdwi}ynlJV*`d4H{jJNFTk|WYy1j1e)%~_tzrDQN zOK5y_|MJy#tF!PFKOZ`n)Z52-cz>(AaO%)(0bK`r zd3m*er8U#+bb2>cad}Cb{mfEtK~*nNkD2-2;*#d_g7!2w`%R6gl~RA9GR?O32FAWr zcD~cTd|Bm;Q6J*#VZI*W>ruYW^7R;BkMs2eUr(yMg>%r|9C9~@-OUkqbJX3;x|?IF zw9slT&0KG;X!Z>(U!`GPcaJO0c6X(mYGWmq=0(CoiRoQ;*2Oqso}qK$pdtTg+o zyx8lkw7N6Po#qw8n0ezSwIZpCmV|CMW1ph=tGapaQggZ4SyB0`J?$RnU(_;gURi9K zTPxXu!=j>vc3-=~#nlCsThO|vg`d@GptT_~Frwvd@4CvgHO7MeGh-gJH1w9Hn~-Wk zwbw0K*_!(z!L+w!3)4Or0Ja5zagA5ID7E9Zw;cwNTfW*~y|k<`5YhnK5=9sb%iKoh zZ|yqi@XSiT)tXr#6)#DFmYV4~-&tKI_U143Ryzy&redJDrvZygDv2=nROK<@*|HnY zI_fMhI}*)(nQW{xbGg&gVXp2y%q%puXef;Og@?n(BjMxG@NrgENSHHA&2FosW1jzX zICwe|JRJ?5LMWu@^knd;{8H=EB^@NSC(yy5-|pza86H|UQlNY5O6bnIhJtONdspZV zE~IRp*o{=3znNLmPLSBN+F5DyLyeuw%<^KZL!ugV1@ryY`L-rVMK88HT{SAs$M_TK zt=Y_e=z2^0MlDd|fdH#E-@n)&9L@fs`!=tx6Ah4>LNj z>&63)ZMH={c;q%UZ}g_sXsm$SRha3v(Xju-ElSKVsvnelS8E-)t(AMOjTT6=OY|4* zNe^6m+&ikhlB>j*x>sOL*pL;Lp_(!(X)11~Sd9CFY zR;6&Er<2Fp<(>}KUIXn(v@6uY)y|@zHR@XHrY;=EjR6hR*zPH z(N*O&y$h@D6*ZuB*^+M_tC}AxcI39Y(|(C;$l>Eh&9N6%jUT|9s_=$kJJy)T(o*lb zR{w5qp{3Oi_pC6SN32k}$}Y62RsNDr$XorJYJhLJ?TGdQm$cq!q%&7q&e(?B2&JgD zOsSDqFt(s`jaFZqYddH-&|kUYJ(iby8k6;vYRG$V+U=~X-)dToY%l7Vy@KaKPZs1* zJKBu9t<^>Cf#$iOtTj)wfFGSncU-Z{Dz3>#*)Pe^o_S zo9zxKpSe!6J5Mc}eQmeoB|Dww4c+IuwiXhZj*!;~M(c_;VV#<+EU)UBU0X$$SC@5n zowP1#kDi~uIp3i~rgWJmh*z5nI@`!EFKN5&Yg;8htV_By^IKe`m`tvf{KAz!jZ0^p zH0+zItTRYF40M~?w@Z{8&K`o4lo*qj>fS$i(BL(*q!02ON= z%e__Y*qr5D>$Mkjd|7ENx{9KCFy+otxyD(lsRLfFthi@}*y*flS7|M#)4I}}zd1wt zt5tqM)wy6*&y~U9@r1$|%IPPPDy-;KsngV+!a|*(?6|L;O}AxSRC9j5)nVhyFX|wx zb0)2Z*V`*v4Qq?-`F@X>G;bq+t<$@r?Z_**dXpln6zF_xkx*->9XwnjuQg!%Y9~x{ zCp|ne=$WukTO)-Jt)UcG?E@Q1)jm1HiBzPrHjj@??w--+sZGo!A6Yf3BAO4<45Q!G zvpZF|th3aY&E0Buv3HH`bYIHBuWPNz>O_6vCNV+ls;CyciS|_Vq?)UV-?>8WH0@ChLR&c+bqIB9THw`ze09 ztz`F;BI#lq><%70enO|oEeek-ttZ=;b^2gpO|ySSXX%~R4K)M{e_DrT?P59uDy=!c z+ND6z*J{#J>Wg!!kEcGarj&Z?|EE7+Pz|LrbeF}Qsd$ARQ*@W1yByu6=q{qWG-^%b zWqPckNinS0gvS+nY~XP8=*ik^?OTfVv&yjY6OkD9Zp;4*ZKCs9XqY2+CCj z;ijx=sWRQ_e3uW0waZfAx(#4h1rVNs^bOE~5NHZii2{#cfTd8NDd_1SP^Rr&9Rg^u zPNuCAPNAK<%OnV@5+WDl6fI5zxnWb;0%-UakOwErp*E!waAZ9d2nLw9gASOJ3TYP0 zi$YKeJSZkmAS@oE$8j_%ph*s@5`}mRz$=OrdEK0vl~I-tu{9FxG94;<)&o#yy^`Ta zq425+h({6Y+Itfq=dD9=1eHL>`#i04jdL(M)1;f=!qe~q%sQuViwTO9MiT{<&urLOcyK*I zbHpc_CO1HzKvAI`odn8CXb`4sDvS$%6-JFC=#jCC6zF&=)RL6vq;=VjaDWV1R~)5^ zL4XpK%6c(C*KS8y1|v6Y|MO6vk616-@EzGOG-7M$RAYS)hps*kXOxD8Mj(K&~6MI8Up`zhaQAdwR47(zqKBe zDnexhc;ZF(B)~KB_)X7+>vnf|+;ILNgP>W2^Vk#O9RYp65jvRzp&1NA53;ZY8LtH4 zI>9p>|5bROH0TqX*$!+OP$f`?35sd=E9*fqICi2on?MUCEawdMZ-!&LBXmK#07djb z!l&raAi*=-{qlOeH=488i+OHrWk9KgR0)&=>p_vRRlvU*_$*LN@Solg${yUw*orn; z)bJv3yZ~O^7Q)-(S$v(qkND|~ByGQB@w%Wc@b)I~J_3~6LuV<8*DnCx7@VbOP8#&Z z;2j1Oq0dC!pNBq=!81f5eOasR&I@b_M}8#qVFLLJu;g*jk^v{vu*)ngZ}WOIr$ZTi z0oFJg>T?q0D1@8=%>_V-!HYr}CBfSgw!1Tw(a(ZXftL-#UB*UxH}WmueQG^;MhY^) z8bFVjmyZBBy&+^X$N48AWJ60i^t;;uIU7oAGK`mZ!dnypIR#21gHu10ERL|15Y= zM&BwR8y(*gTA9dgG68ZHH2*mCpzMt|z$SgSz(R8&j?Lh68VS8n|Cta+HH4fFA@iET zTF6E+_d$XMKo(saNPxUK^tLg`lKb2rLjH6DWSM-Yz8c8y3L*at-PHh3@`#BL9x4Ah z1$dIoJ_HFGc%S#6I13O;jodbca@zy?%s3tk`+h(NJUjBkA>;xei`F$lZ?Stl$foa2 zf^6=NqMfXQ6#>~q-LVjI63t>qHwd!v7PHV7;ke|~2J&c_@$3zy6{Gn&ARj~gD2Cj~ zz<0)$4W~Ec^9^w0nDrYYY|~jl7SAP+jb!$PI{qklWgx$wAg4BjoCj57pehZ>61yJ@ zdG&eg88(79jvj`B+r#McIL2WpUD1Con0BW_$T>h3{x#4y2HDg;6;djY??mLRhW3$N z5Ar@p)o8>VYKO1XTvdxeaj` zo*uAqW+NOUp2ITVjzdlA@(D#JfL%W^Jl0@(5i*u<Az6537`znv5<@`6jKCs7Z8%R%*t)=As7QuQvd3a3 zCPU~Z9z+6jZ0YnWeAsDE?;Ucp84>dWCD^5`>ZU_Wk=;I7SC*wFnGPEqFN747AT6O_ z0>hVeWd-{c$y5^BiLaBD=-6&#A)N3k8#G{gM;u=vcxJAJE3aOdSJ&PLT(quj#@rXaXM2Dy?hSd zEE`H8gFE5S7>rZmblzG;Fex;(+liJ5n@Tzk5%P1qY2hZLM-Zp$;M#ELX$HW9*p${^ z_;7efLkTuQUKy$;>24ZS8D8ZO!3=$4xRW$*1hP!Qw+k(DEMO~i(zi<&)g)>NueK2_ z+bj+zHw6w=LjIM&HCY^$EJJuu2HxFXWSSyh?6^^Y9+X0v`#b$+MAM{ZQ#R*!OD~!h zj`0B}4Sk10AI94?K@62`7~@~IKsSa!RmO{}&Qgkix0&$n1uc=)Y-a(KP}!}3`=KQz zj7V@WEv`vb=QnQ6&8bDrQ%6Zt8k{msf{YT#s3I*BC=Wo<^BBS~;AIosjm*ynh^jPL zTmV%gU{j2iB50{mSuHFZfT~2mb})fHo}D;HF&YMc31jt;J~Q$`WB{_4W$4=z(lSJ4 zRfti+$z)+dh6e{gpJWOnUYZin=O3_e^rbB1z`*jLbQe@=k2NMoi*Z$H^hkkbld|U! zo(z-$P%1%5WSK%cNgzj&`zTOKN%pe}nkYMVX1tSdWP7Xx9mi|nWQ6ckLr~fSuBAcW zFsKq2IRu>)`bwxB27Rdn`bKTS6400NG{SK$3;L=EEZY&DrV}WT-IlCJ=~`MwLur|^ zaX6VQaBPRAq(EOxs#(xC4reJe4}elxQ5u1x&4l(rls=mVk>en80*amuqgn<;-Udfj z2Ym&s$PI$NB1Tz)Kae%8Ot^X!qi+!Ona2iLw*|DwEQ@Hds|%B$uVA%vngcl1&M~M4 zAC46IilA>V+HoScmeP_Euk0jkdYlOfVs;v-PTRcl-3OkQLDeQ}3x+Buw=pNnIoXKZ1TuEg-ENTKi_GOia-^?D$W6Pa zlw0r zS|W*NU%BN4I@Qk0pRNwFlw2 z<-DjY`+v-`$$1|MERr+iF@-mp{Uo@N2`N1UizQ8=3Cpr>*QE)C}7;RN#ldKf%NhmglYcu@%Nju4)B{*(tf0Ge74r~sHr z0Q#*2YQ_SX_C;nGkx77@Sr4-CG!;TtZx8t#5|(_(hyx*HQ}!(cZ@)+LIzTVL)S|bC zw-4}Ap&qa|lgu)JoC#GR!hA3T$Ok+#2!KlBFbW>{=dJ^dl@sSV5As@|=`c|rg)PM1 zxiIt{@tk0Tr<>p6$!#qUL`yb?EV~}*^&qDJF9R(}fyKfNIbEIw&D8{W%A<7JpG}+x zs7km%5(Bj#E?1JGVJq%iqh&uL!~}+r3A^Q?Dz#Acq}v>LIuPbG#>xiK?RHONgTAr` zpFyzRm(W*XWnv`kTZ7z^`W{8-m9#?M+;|4wM~=k{6cemJfpkGAD29Cp(bx3Y4<4Al zcW>CE2s<}--x>B0?hYo%vJmvJyPNq?(TBopX%6Bl$52)z;kRjPT?sqV%VFT2Jk9?cLVTpfRY7Ov3DBel!Ywgni=0s zK*@%o_o)q`6frhgVl}lbz>ARa7?JHj^t&AvHJAX|sF|Ee9RUvnat5<}19<|FWpQ+R zJsgIUX5=-_*&;S;nB#(dxPNK{?wW2xE^#2zl#hGgxBOwjM&}EwFVU%W;k)h-z}IXB2k=`65An z80-|tyTHV1g13+aO~frKD!V*o;CKXlF*wXJ!RBzHorFW)gOuo;0S<%BOoJ{Ejz@uG zEX0uwaTKkpxM{&Ou*ti45?6Vz++j27Ge_7S1GdowY_)L8Bgba;DwoORAq81xmSquz zMA(ei?3zEGfY(H(Nz5E%rvXP#?KIM;yaKkAodP)Bm3Pi!yLg5IIl}lDQ9!Gv=TbH% zJM%O2?XdCQ9P_Pr$BQLI`Adkqi zfPgQu6Cy9})iFtugOCb(AhZ~6m^i&f|2eP1sreAbI}&C9qS?Y1IVzv>@HWt+?r#7X z3LXh5kX0Ar(D@A3f`pcR_Ri5V7+SJeMT{0X(x z7C(ehmO)h(TC5;nnT8v=4Tfc#!6BpB_c_Vfl`*2_e0n_!WQ#=hlPjSY9fYr|g?Q7@ z7lm{oZRbLDe*LNpe{dF5WkHp~!p8upKL$PvEone0z=Oz3okM6BVS-xqv^@!%sn`^X=Wc?$9j=NN@lATEMxca| z9kfO+TLC6`-D6oi!pd+8II?i?u{RE5@1+`<%fVC=S5Lb^TW^s^Iyeg6XDn%s8>Vl= z4yM5id1m-0K#;s=C_IpLOiB#RnT~S`D6>}ef`s6mP&i{G#~@lcsVH$jw$pFC?K^BV zaA|iDBN_^`8(K56dmV!qk+F(x7;h1GWyEP&!z(3FAhZ0O)!1o!3}P-1T6ibj-I4X2 zml@EQO)uRXhj;N@m@uUId$Z03$+4{*W;>F^oC;Y|fVNZYKA+Og*#r!C_b&VAJg+D{ zK9YO)CRhHP`R!BDkv3p8aC}fLYjrE&%pJ?MwCk!Q8pAZk7MoF z#HkvZQ|sMjLhAXjs-sFiK_F9Fb7$rsW8pYrpPi7fE$=Fv#5f|GE+kVgFZrC8$>=Dw zI0v;bxquwElVil@PGJb9tbxd$L!2JQ5ON8AV>Tpr$TIc;=!;XI6hwh+1mpEic*#>EbkYpPZpX=c)_D*fg@ljV$7u$joW9uEcHLU7qh4%*?cA|F zHjYqu=h+OLP>!hJeYFTdIFk@;QVApSPm4HbIgT=ZgJ+rEH0_!5UuLfLN6q3QGKOLf!8_b-1{zkq%5qoFgsI{I3 z?{Dpax6K5!IJ0tr%B+YS04>i$Rb-LKoQTha6cj=VvY=oH>a*Kt4D{-KuuF0J zn^2a6aSJv%7ElMaymdSd zn;BbHPstS<=OgSW#vth;@QUVa5Ah0Q!5d*|JQL!rVw4onE~dz1vOjo`U4bD(DVOA@ z?eM2~vS*NgGt^s<`zQPBSV&omykrIXh=)=$`#~S?7`!N-qG@pc_t7v`6ro6R1hgKi z*)8EUjF{%J)qsr@-JZO-037m`xTsVL>-@5OM|p`&HKuI*b*``MD7Y9>V979d+nmf* z3huB3s%8*5&v{NJSZb1!fO1AoK6HeG!WPQTwe(#S`jk_Uiz1#KRvlwWv?J0SlblAN zdLs07@=i@Ij1a?CWNt9Bt;4G>4&L@SxsEj6`0|MiLX4x2PVbl_X>&#~A4DvZQ}?lT zJ>E`o;!dwepJ}%Z^dU`go=ZHnlW!ReGXxopHK%~9AsJ$2gP|jcONWo^i zpX^3Hf{||q$K`dE2tG_WzA@fGc&Qy$;T+xx@32Sg7_6gZ%;KFws0>!4Xu)O9OcdV% z$>hU;CK@5jnuDOv$m3*au$%0z{yMbC#M5^fQ~uevOh}*M!ErAkb(G5Kwxl3DfFvPC zGrz$-jg`-7Dh@d5A02XfCDacl#0uFE9EY7BN3tU`pxB4d>^#c*uto}l-VTgYvvtQIX1eY;Obi`?@<))zj&K}< z;W#Acm-WsnqV8x&v%I02_3r9$eGNYq61^G@rF9(Co5T8b@IC_XcY=rsUCryuQN(H8GOo4bQ*kyelUJ^FgD6Z*y0BhbgdAMZ2UK?RDz;FG!c}fAJ zltp(5y|NE0Up**Vm3Ma|7-h}I4>!sjbW)^M2&E;XOxx5d7^QhpBJ#XIkSG-~wxnru z*=m>@rM!trIno8$WRN7fg19eVX_mK~v!Ra1-sY_#{>rA5?1qa+9|BLs8fD}%MXA~h z#Yr_4j=bzfc`@S+e;S8Yrja8Bp-2v5lp(0yVLn;J0IT7|&X0a>fTGIc0OU?yz!^#y zs>}!mFw`U=S2kRu;CynLO=ut-uPCsrSjz_d9bs8D+=0#_bmTn+9^peZG9od~L8J?n za71FJ%8oZ!^WZgw2mLjLq7{luVaXZU^Bb}EaAjF(6Lfa~wiRJm!w@Zh=fqh+8EPTl z~Qi{zLR=|ts)`bkJ87g9O^bBR&P-y50c zGxRB}m&|}Fd3{%=s{Xf6g6u{zP@=YCiVMZWlLv4ytP=GcW3h3QA zduU$P>qN8V%Ndj4P~Bz^PIKghkSub@r>|-uCwCy%TbBYkXe}R&6uwj;k1Xa^f>&M* zt-|4%zPq3Yf|u4xFBpG7yNC94Z!VOo>1#gJJqaB0qUS(}Blg_|!C^ejVa!B?YY$q7 z-0 zK;8|=v`uN}#A0s`1D^b3K{e#_2wqL$H!>Wy*k@gjT8nqs?yxhUz`r~YhD!06f^7)z zu|x^jV*4`&TV#DsfGrDb{#WYPVjGO7#4ceehdhn#N8N@|niIP6p+Upb`+>KLSxi2} zTl1zFE)f=#q99o-vW-w0)3^^POMsV0S>76KFtd^O0%iSgs~4!Ic=A0Byfi3)r?f{})M3I#nUOtb*{~U{z*`5e?7+z8PzHE;$IjiA!_;(V2;~srrS%AV zu5=S9@K?Z{lM&~37(pqA`SLu7|+q zD8wf36W;+Gg$;3tyUB#u}2SRMaUT}4?l(Uku*TxHyb^mkPMJUoK zD3YL*b*>rYFR?>iNyy~{`yguNJ%S7dEt@aKd*2zV^4%cZWVHK{!^J)=Fysl|;f?+5 zndF4A%qTWRjuL1w8zc8ZMGf`)Y)0mK)IuJNz;GnvnL_4~M(7Y6rpMVZ*z5~4fY|5Z z2iPzC35fA>U%X z4I}4or)v86<1X%$l=%Y4-3Y>lfA@z0Tz(coLa%%xUo=*zk~K@w_Smmv$x4=KH|@1^ zlnPH-a{`*5rn?6q8Tk>56y%l(=@V@7-d#GRuY@uMs{EHBgCocsde>6*u8@Dbz_l_0 zOU8}Tld9zWvaZK(xCLtzskl%aX$p68G)zI_EMJn4 zyL8C4Y)FP2#NC**he28nb4f`i8LhI>nE`&SQFt4@I4eKnvy1b7>@0hA&y`<(<`Lk*mmLWem0Q zV-l&50zS#>@EUFRKa%8LqiBTknDC;8Kz5#n4+hrhEV1(&SadqiOK`yeY2IyLgfS@u zeSl|<7lYjy8wt^|&wgf{@aAN}MKVUAfDcT%0SaETLO*J~lpA0UDz6f-716G;9yWfr z-i>n9E+J`bMJ&L|D~7Z`eU6upgRdUQ;j~R51qG-;#Y;5n{Ck1^!iQ68p}>r{XyxH{ z6?TFz2gCG3USLA{F_#6O#ofFo#2e$Y!J7kK`J&Pk+TD?WS5ztoj#opx&nL*&{{okL z3!-G@<~GQtz?TESD@&(x3P}!|oAI*S3wc;HW=95>`MO)=Y-MPq^dOqedr zdDDVGvt{Zr>7`aKtw_P*W%K1JNVN#aX7cj@IDR0^mST`470*J)a|w{oVS?}wI6ean zi_u&GoW|wvCcDV= zoRR}WZZOYbfJr#a2HBHHlSM`{{faOS1Mhhy+u9CC3y}R!YSgj%F~YwM^9aDp@3H^3?EG7W3e)xqBa^^-^dbfEhEI;g|7sWl<-1_=s$?-_ ziD_qE=dS|ZAk^$v!^BW_x`rT7Ibn4YP)6XmGdA=()A&UsHiZPp{C2;%QdfHd%oe2? zw}NsG>Zc&G{YWrmZYuM5S>l(I62{cz=Q_zAN;j@63rESb$_5s!TsTgJjFmHnJ3MvtSW1v?T|9>d6mzD=(0ob1oYZiWO+c`1y~4LfcWz@f5kN&iV~aU+grqq4Wnp-%v=O{7921i0l~4zIYX; z!F#FB48}tzBjG)d9{&D*K&gDi{0CKVY)h8@#J|XqG@)t$>S&-GhdRnj)Us7E0Bl*j z#Z(0Ueptz*p~3TW$s$d*DWBI8hhh>8^9`YG2zLfv9XRr#Jkrj$Uy$(Rf4?aRvlTe* zGnOw?{32i`l(c+T{3pN-6>?IJvKpEXW4tw#$@gw1Lk>lNEbsqHrZ0y)748hYSrr_L zD}^{F@E%YeIDQh83J+w3%HMVphvKju3$YauCDRyD3|kF6_!Jzid^t$I;vrv3GGBv@ zY@~D8Bz&i^1c4KVW(1BuI+3MOS zA;CiEd}G+mmryHK*WB#$6mVn`j)wW)gO43WpW>HZIIuLZmeKH?^e{NdKMy(O|A1Ek zv_#gE0KEEc3)ziVKCn4pHPPvd!OLrS0p5(&Fo#Wf+>O0u;PlEsc>~FW zoEDMacbN?FN+OJpVYpwgckpIy6q>RqmBPp~PCGAfG7)4@a_-AWVQa#8%|*yx>k^)`< zU}*V{1bsg2X>4Et>~q{G=aoxqvmi*|@!>hA7DE7#gNaLGGYJ(qqg;+j25}C1e3nfy z@FyYtL2x_@!N)ZFoyz4t+W_>F2|RcbcNzFtNnFJ%p9Z|212z(X-4eeS{L29zZ3SH5 zZ%(?>Hwv&LeMe8oYK2YI%t^Wu9e?<|q?fpj-X@}fLeE(rZ4%*&- zNRj;P{reT!>Z}$yX|pZsDOxm{)i5pG$bg)IE>wnVMAJW%9 zj$Qvq(R5Up$l!J^wO4|1!&uc-`XXXP9SK_4St&9pbX%rRQH%wCO#oos^Z~FDTmco7K8Y zDMgR*`y}{h8UBm<`ii2!7?zXHcG(t5 zZ$`ZO35M5Y`yzd9=<6{>35vA`s$W!;*jW2|r@n4xd{-6u^jRGqt*yH9%j_%Op=bli zmJ=Ndiqey?oa|>_Q4%t%qa-CQw!FJRxr0OHck1gFhSS=hoanhrQ7D&kqH{Bko5p`y zQR299{c(NW?!lcj+@xI7)*sW?9Uh(Itj~(ukzcq+(YDO2PWWgOepbC#Q9?bdbt^1? z50^ixXaXeV6Z%ORxJQiskz6+E>*L&?=zGcN=@A{{XLS-p8CO`}H~L}g?@*NV&Z;N4 zp7^{PtKaVRC%w4F^`vjpT>oxGQv|D5*SVhb?KZA|Qc*%?`H^9}ykYeEh_*pH9>x6I zp|4LVIwWJ;m-RKve5B`_`Z}iDPx5$NdxB5?bb$H&I=7o(xLfsA=P242Ncj}=`MkdV zD@Fcb{c_^-E-u$8jrK9*Pr~*D{};L3Z%^f4^zd$Hx%lOitbau3R_4S({ zC(^s4Uj24u{nKXiEOuRHIewAH5pPFwJfLVda#qXC)=x0q<6J-EjcW(fk!C)Rusjvx z8)3cpve$l_qE#&GugAImP1Em))@?gp;@1Gz-_HI0`U$QlIQ#VVm%aKeJf4cOek{%O zO);DyreiC&E3;niU^<4pagjX~*l&=&rIhujL>I-Q&zo`B_9=bM7{1x~HNxW{ef=E6 z-OF@4dCVyrhZxgzQ>@JvWpiO_L%G6f$Z~C)9K*SX?V;wi z*~+{lo>i31tA|)u_At$4k27qKC4If0;Zd7i%mb3aKGq4!X&zXo%{1$o^7JRg*GCzC zJ=SLr^NV;p&V8R?9*@{p)75t>8~1!W{CZ>WO8s4yE!pr#xs3ALU9qz7W_+%U>fcZj zH$GzYmKH6gohy68EBo*UWe&%-w<-G`#v3o2VqN$qukUWw^YzMhao^pnBOlwK?0cCn zq$l6ZWuIi;QrXA3?E9EzS4Q>U&oqzo)y-Kb_n6mhNY{Rl^=T99r}J|p%S&FH?My$l zsd{yvV!UKCo3XWITL3sy<|_6dp{d1qrCotH!gxfbAvgC`zbD?`NK0@Hpe`9lyRkaTz;Epn78j{ zez>}=+@I>6V*Wj*B*s0?^qq^fq31`q&dsf!W*(paD(Z-Dr9#Po|E<2*WluD`b^w}k)=Xoi+)Ik64{T%)Mk|}7g zP=7ww(XZdh^~XJAR7MHwF_UnRGyHbl-u)-0yrD5x)V)W2de~<^M@hBU?=Ah$4$=}6d1zh3jY@pd)|USDN@ytIa41hd%rRwW zjD35U#gt3#=QfWj$qR4ivd2CDmr=4N^>d2mIJV6;^{OVJq(l#1)&IZ7l%3IKuQ7$0 zgtDY|DiI#}j(FR(eYYw*_j0-1qii$F#xGjmzTLocFuy@}98~vyFeYMcDbgzPS_PVJ za_Trf^1Ck?AMNl7olgDM$6H#rhWs?m79U|;y|=+JupuP!#}6~4?%P08>eo{8|98Fr zzwZ4{=F$Is=|(l#b#!H1**W4V_KQ{ap^HZE?MQd>h*D~IicI{q7|!tDTW@)Trz2Gf zU4$bkHI-W9HrD?8_0-=Slk%RzHds{#c=$W`8ZjG+9EM)>*zwmFJf+FMp|A1(HVrw< zbdcNFrew+7ErnC++%|4zeL8Xh?pyhvOb?|&v@}#Pg`z* zz76!^Z=r#VmDKO-%WtRBF~%HZMi4`?%%BV_3^8V$uOl8qC|{Ub#|E>1Lqa1Tdw^;4 zX(Az=@@S!aXcvs&?PA5P#iGhB&@|}LvW@dxTGQUjG~Kxlf3_;S-a~WC$N1UrOF7{| zk0xjC*)?Tf?KAxoXR(cA*ieiPiVmBZj`u2?+tVC{=C)hdp-_I%;5L4Ie?5lR`N1fm z>}h4^EHuY?m|+*059`AY`QXZ)QFd-bupU%)zFJ^dkr|bp$J4q5?YEHr(mL$BlwH@S z{P-cpOY0j~m7P2gQt-ll! z#&wnLZ&ca6!P{=JUoN5SeGH3ec&D=KAyn~%2dj9C{BA0{c18T5wVeYVEVs@vVAh1~ z`a8AV#KGw}>lw{mD%@sO*)>(NFIt1To7>Rbr_60=oxP?c*Sni>p7Yw=P_lMXc$>B# zV5h&0b^HykBR;&&db8W}e+2h?xeblyYq`xH_Ki8F`IBCouVa4fRd(&q!TDhxJGJ?= z7Zj=PhnRO%_Zc2Xo?*YCWRHeqHqQOYFMdkN`e~i(KEq@DE^d=iGLNqFSU=5eX#J_g zyqjbmeU@QLb9qCQQYe(?@oi`4ehZb0ei|hyf(Ab-;Kg4jT ze}U`W{^1{Z?Filw+Ys3q(eQ7%ev6TV-G3{yt!!dCc5^+=0Y{Zxi}CyK=2*Sc*qg1- zvahE4UA#20-K!_tqq5&ucJ{Qx_!*0TkomBa>v!^8d4l^NW4PP7d=r-+_sVy2ImMF` zT)vI*xbjn6zBQrz50s7Hb`8{)pJcw1UDJB$sIh&E_m8~tF)k-M|5(}mSAsLn+9^Io=s7r|Te>|Bjb8z3$~rC8pDFPy6e??d3GC%`V18 zZ4N1k2N&1}eb^gwgWILpcJ{HZQoCnk?e{P*NY<3YU1l5j5Rc_H51y+hyuAdQANBeW ztui%0B-4ugCG`hX68{9Uf8tcwWEhOsMU`Rw&RoRvGMfL_aVwhd~ zy=)ytWwW^+dzWkLNO9QfN7j)~=ofEGH0@wdLfXE>G<}5Yr@20_Y-ZPISRdv3+nL5Z zTdwQx*Ap#S?*9_^|0WOqZOZQ0yLuwbEPI z!dvaL+3N3me00<63~SIBd*a{o;7}$+Q}Pk^w!h1oet9D&p7J zQeD}T+|F9NvvO%4*4c4B&2Tm=dwL{+qHh&rPf=|3%r; zHz|fk_)c*7oL5d+$v8i|m5e&KdzS0RczjvqGHRv%qoN%%TTeRavigE&W8_)?v$Cg_ zTt*#ndzW=Z+@7+lD@?~I)9ZE=soj6o*AMV`iEhf)zJ~n-okV#h;huEq^@Mw(`Gb5< z@_CK#s~f<4neRuudn$jw*Y`CK*SvBw1Sxy3lB}xB{P_g)r^s@kIO3mz{TTC^_%+D& zB%g2M@?q9Hf=9C}^7R*4k7$;%#Bjfn%gN_a)O<c5Y9 z?)q0*_GA;6lsyqlG;iVdw|ng;SZCbK!Ef(Y$aZr*`Q9zuZi#uC<92jXi+onu3~^S^ zE^U2@ZEA*f;77Tf+PPIv;@v;w@?qBdqe@P`&^UgKb!tqBPb8f`uEfTv{IklQ{B!}& z05JcjJF?vF1k?S~%4TH^CD|z1=>Jf5MQStmBf2SO{7+?fZl_tcf2r)Mi+lbnWmo6k z;<30q!NrZEN=}4tWw?iwoEUef$95|5Z|-Eds~cl^7nJNW$J^9BnY-0lYIB { - node(oxynoe, () -> { + node(retusa, Seq.with(new SectorComplete(windsweptIslands)), () -> { + node(oxynoe, Seq.with(new SectorComplete(coastline)), () -> { node(cyerce, () -> { node(aegires, () -> { node(navanax, () -> { @@ -533,6 +533,14 @@ public class TechTree implements ContentList{ ), () -> { }); + + node(coastline, Seq.with( + new SectorComplete(windsweptIslands), + new Research(navalFactory), + new Research(payloadConveyor) + ), () -> { + //TODO naval fortress + }); }); });