From 04c465c8f0968c2500ef7efa7bc7daf1cb73e17e Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 13 Nov 2020 17:33:32 -0500 Subject: [PATCH] Bugfixes --- core/assets/bundles/bundle.properties | 2 +- core/assets/maps/biomassFacility.msav | Bin 0 -> 15179 bytes core/assets/maps/biomassResearchFacility.msav | Bin 15169 -> 0 bytes core/src/mindustry/ai/BlockIndexer.java | 28 +++++++++++++----- core/src/mindustry/ai/Pathfinder.java | 8 +---- core/src/mindustry/content/SectorPresets.java | 2 +- .../ui/dialogs/SchematicsDialog.java | 4 +-- tools/src/mindustry/tools/FontGenerator.java | 2 +- 8 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 core/assets/maps/biomassFacility.msav delete mode 100644 core/assets/maps/biomassResearchFacility.msav diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 5ec95a64bd..671eff2048 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -560,7 +560,7 @@ sector.overgrowth.name = Overgrowth sector.tarFields.name = Tar Fields sector.saltFlats.name = Salt Flats sector.fungalPass.name = Fungal Pass -sector.biomassResearchFacility.name = Biomass Research Facility +sector.biomassFacility.name = Biomass Synthesis Facility #unused #sector.crags.name = Crags diff --git a/core/assets/maps/biomassFacility.msav b/core/assets/maps/biomassFacility.msav new file mode 100644 index 0000000000000000000000000000000000000000..37132355e28919271252805fbe0f95adf12d912d GIT binary patch literal 15179 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

rNW z9Q!m`mj1iimF00E)bX8uNl3t%>c4i0B0&YWcm8+S5_#jx*Eu>lC(dOr%n!G{F!S|| zb+ao2ESgMMb-aB`|2FfTS-t5&21n>DsTk3yFS|FaELWK#RzH98!^Y0QrE!s`DA0G4)xt%u_p99y+k8p1@lwz< z!R>RN{h?KP z4@J(r-}QZu-(%fBE9YC>d&Hjq$G2*p>AsY@*Uz^5K34wxd+JZ!q)MG5+4aIw>Fcdc z^4gF2E;)8qKu$j1=kKg%<+ESpRz6lc`(Ewf=ilZl_P@Qpa zm+GCb_=oeX`gE!MpT+(2!a3J3t)BHl>++5pmv?JQZFl~zZF25Y<|*mxi=MkS<$v9j zT4(?HN5rQmhQ0-V3OAa+WBj<=>HGUjf2>;8zwPbLh?)H?^<(VfpXw(6g}(0guE|^e zAV#frpZDj~sx^1d1n!@7y?*AigMTCKubp{s^HqD-H~tf_wBnCeQvcPrXX% z(CsC!Rhzayxp`gW3qwtNE_*UJ1p1N_x&)K zX_z!8fqR?*f{>m`~BZ&aXd>y*^Geyo|9(3{jdG1e)=!VT9zK|m;b`*>+nP z<9@s53~r9gN##{${zV<0{<{0vm*|JZi+8?f-C+HoZ#}F3dp#+0=c?4>wXTno{P%x0 zId`e7xo-B7_uLuc-}YLY>n-{x_;KSb!*^U3`*~Kh$3Mt#vMI8u_OS|Ay}Q%V;B?7; zm*nm*cly>QNC(KTuS#A&`L3A9`@b6nPyS@x5piT+N9`M)lU56#cbz|YqFaXXpXp2c z!w-HK_?Aspwr7;HHT)>v@L9OwzQ7zUTm9;ScS5``3$OY86N=gMOY^bLyn5%q+4ttW z{j6E=(~Fz6)2J z`c!0Uu;}WdeA{2E9>ipY?O!jjFIIT&`~A*;-`4zV`fy+2@+O_tjmw@1e*G;pr~C8o ztB$do<{q~-bbNh8M%Mg9jgI{61)8-@F^`tE>z=m|j8&biIV<#XJHnx5A9DX^ zU)i7VtGMe|)4b@=T}*l|s?RDLU(`7Mn8om-DNj*$woumF&+RXw=6J^%pFj2Gjkp|d zp3H(ZYK#GIudU2?s!I5MuKM#H&u8}+7;aq1!f~w4{M&PrW1os9p0RZbE`FFaEoQ>p z_qE3BICkxMYSNp!r{TNFnkyP1z7Muej-MFwkh$Og^?{Ygf{p$z*N8tb;k(H38yl>- z6^gVje&+a^KG|vUskZ6oLyhk}%A0xL>fHTZrRMY13cU7p79{;C-Sr`R!`7DN9fy|* zbyvK-)Fsv1nd!q<;km1`c(<#Cx^Y5?$NSYR%KWpKu1(k<_WtgVj=JRq_cASZ#cbIi zSGnPn+#1!UiAxfubsXpXxYV&`CD;8qb$@uCK6$V!^@ZA}#CZ>%=r!c8U#)Ul>SL`P z^S|pyej9x#%9uQjSNyOqM;`0bA5(G;A6!2ne}&KhWImwQfu439xv96X?Sec*FAl<>95#j5{CX(=fBVOzvohK`C0HD z<4xbY6;U649RKwFW8{zNn#axv?X&vn(7n9Zs@!m$%%@k)oXx2>Y}tM+F6Jp-a;WE( z-ohD+MSbVqDQZ8{dp7Fsq2N;+Zp3al9l89z{!vp4@lVw%4-F@OsP0*@*(6ynqQK;> z&@ZtMNp-352c;o?&t2j!e0Nqb9R~4xBsPH zIWZ;r3NQQq>{5Tml&Pm*QP~)MM#0``?WRX%uP%t3-Lz;=Lx~?d*Ue3NDHjf%tQR&3 zPKdg(c{h`E!WBKGS}$*%SKH)X9FVtP%FOD|E;Uam>X2UJIzOu;DrJVQT&8Cv)GoBW zTBQEjLbZ6i)9I8si(@#wZ?59D)aBY6dTIOV1)`$M&MsXzd&P8Dk$=lV&K1eoS_aMN z=Mt*3GXKxHEL^ESWqGo4@#K`cr^=UCPWaB2vRn4`tvO3A3~!{LV}1IfuJ6V?@pqs8 zi~H>MII=ZRkum&nZFa@~F%-M6|{?h)5?swc%Cs@DVT>Qw} z-jFd|>=Ne<3E9bo$BwL3y-;NBud-~$%*FRvL~qUSIGz6Zib~d#H=kSXPuHb0ixC$r-c=i_3YgqryY9!|2w_7e@(#h(ujigI;h zShsqn!tdn|R>tu)TzlKlJ%7{jiep<}82+BbK0EVMqWE5xhwIqaJA~y<{wtlLWY=r# zQEfJ-YsX1$iPX2}*G1epHc4z}8pll~&sB~t{@g}eUm6)Md}Da~&@A<}k)IMG+k6-8 z+))?E6~s^`ab1A-1`e^A|!{p<5zv6c60tKt-9&Hl27G0JRv)WO^R+)HHj zx(l*Ti5VVUtEtm${P_NRkCr!Yw2yo?`H>sAL}W(srPK~VL!O}ht`}-8@7dq@XfVZ| z&&XeatK=_hR#jS(iNC<_BSzNSW0Q8yUwv&wyst*V{{5`6ZnyRIww|rcJ|nnsOWSFO z?PoUB|5JUzcQn~ZI8JHva+W5+%QtGc)DQm>U$C3&{)B_qKi;(OViYd__i^!L59TdZ zzd2&oE^=e2=i<5jFxN|%5PrM-L~WZnvR{DythbpDes%dcYdgSO|KBXS26p?TwlaC%;0#EWdr7o30NZ1WGU=`CAiue|KW-zlM&4mokTOrIfq@x7kpCAHp_i*tAF zbLeY19=Gg%d_{7Y!}qf{Zte)ZUvFyvXTRQ``gu~f8RFWsyeo9Fe%6ciSvvfmruLFK zY2N<7TVoc&y8RWw_Mi{7QM!x>c|w) zO;!wN_x`Ob=eWma_-NaiY&gC6=a74@NUi7gSwvb%Ja`;pO)9k6RCjHZ+FV zyPw|bxvB8Oyt|5lAOFp3{V(}qCx`sH)d9AxGOk8pb7#z{Z>$gx{D0o|;x@VAxb$r=u9Th^I$`^X-3ziG z%J@$0f9G=VFUy?oCE1@Rv@$rj?{N@%EOmC~**y+BD$Xmvf4Jg8%oc@@E9W$9+|_Ka zApJa4$VxhM;)YKTwY-l$vgeNOyTdcvZR(wt)n$2sACEruIVw_SS2bOI{ky)Jlofo| z?@KqfuTb2(DqR`k?mQ(p2y5-S5BTn&qzC z5i4u^Zdssn>3!+@pE?}}y6w1mW_8PaVTJA9JTrpVPqta@Vy-m+|re#twzH|OQ5}8@bSyH}}ZH`5r=ao%0PnaKPN=$d)XDSYTWR-K0Q(*VD z2ZujhW+?h`^HertN%-W+a^)OXKKAjeO!qi1bxHh5!o0ovSl2aFdOvwtGL^sg)4?qq zCGjVA`mI&E%dov^JNGfwd>wg<#~atEfBVU|Lv*+7W`-(_$=_!yJt*xw9J#FUwn<)d z&J^W}_7ZI&%N3{3RVG`nxOnc}&C+Q5Lg6hwFJ7%$_n+nKewHeQSbyam!D_J=mR$a} z-`!@*-{&ie&RPHDy!57|peg0d$;TqSPY)UPKb8Fw@$B_A*X#%1UTs5KKc7{7(obs({tIqquFJRESc=#)HD8|{=5DVnQJ7WJSz+OS+icJ6 zbBdcB%6>@xYWKae)>P`ezWJ2~f04{dQC~io6=a{dS|7EtFniJA2ca{~0X} zYj@V1G#o{S`{&!0^KH)8PkP4sC0faTH^Vu5 z<2{yL(lPA`wR0C;c1-=GTdcBP`bD*wp`Kx#!px%&zExQrs9x^p_RXa8t8n>=XFKbk zeBJ-(=6#lVPKAH#9sjEBt=o8Apa0#HxwCg~cDH^von`iC;dKvvCe(eJ!IWE4nt4WL z$Bx|NA66~njXMAE&w8alrGI|2KFsD=FYCYBC0n?J`M|A)+Qx^^AAH;M%0>G6lZw)( z{h7fvfBQ=h)8wSSVwio#(%%@N4lx|5q>JFME?(psrsz_3Uv! zwMPHhyEfK4S|uIVyLdzUz;d&@H*7xU2+gTKH<7oNvu0J$alOTT`KLPBcIR!{_=Wq` zZ3Wp6zum5scYb-J?-0L;rR%8WBgf;f_xpVNB>n2}mhu-iU9I&q-~8GBpvb)X|ElZ9 zPkp!gIq!bpyb0c4A2vy@xBv9uS~l+maj)=&m<>~l`>2cx?-t&FQpJE?8eE1`9 zA49*jE7PR#vsHUeU#>Ki=YMWvdSP#~&iXZfF0{Wh;yR^iiwbC)Fb+HNcEyW$uh)_X!u_`)K4 z@!py9|6KA`WW9bW^HTF~)fZCD*SDKqIQu7Z)^n~Gr;}Z0u0Q;h^#%9-KZ~^XZ#kUZ z(^3(}G`)J0pSa`S43`ZS_Su5AIgbr59@alE(&6tD-k9)nxw+lr- z=*c^`o;AH7tWe`M?{UN4{}U=s>)&(vQhl=ds5ECK|2dPtx3-&V#qF2*DAN%CAuL)) z*w@6;5_VlOl^gP!qnGa#|110Udhlb*>${%aY^;w_`Sz>awT$b%+Sl2NRzFh9 z*6sf>J1J)8`H3}N53c#_2|S)I_4joqzuxD0FCX`de|Y&ldWpLD!Slj0bwBsKeb{Zg zBXv{!x^mfMJ%%k0kLkPIygyyGW8csB@3els>Q|^Q%iZ^>{>*$1qyKOIWj<}>=bC-G X|Nr6tKaL-t`~U0H|E#mWH~s?vt63l^ literal 0 HcmV?d00001 diff --git a/core/assets/maps/biomassResearchFacility.msav b/core/assets/maps/biomassResearchFacility.msav deleted file mode 100644 index b9faa4a7f47a42a5190cb49519032b8a50a59973..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15169 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 L{J(gzYr{DJkoELu diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index b61511684d..3fc012eeaa 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -208,16 +208,30 @@ public class BlockIndexer{ public Seq getEnemy(Team team, BlockFlag type){ returnArray.clear(); Seq data = state.teams.present; - for(int i = 0; i < data.size; i++){ - Team enemy = data.items[i].team; - if(enemy == team) continue; - TileArray set = getFlagged(enemy)[type.ordinal()]; - if(set != null){ - for(Tile tile : set){ - returnArray.add(tile); + //when team data is not initialized, scan through every team. this is terrible + if(data.isEmpty()){ + for(Team enemy : Team.all){ + if(enemy == team) continue; + TileArray set = getFlagged(enemy)[type.ordinal()]; + if(set != null){ + for(Tile tile : set){ + returnArray.add(tile); + } + } + } + }else{ + for(int i = 0; i < data.size; i++){ + Team enemy = data.items[i].team; + if(enemy == team) continue; + TileArray set = getFlagged(enemy)[type.ordinal()]; + if(set != null){ + for(Tile tile : set){ + returnArray.add(tile); + } } } } + return returnArray; } diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index d36cb32291..e26ae14fd0 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -351,13 +351,7 @@ public class Pathfinder implements Runnable{ threadList.add(path); //add to main thread's list of paths - Core.app.post(() -> { - mainList.add(path); - //TODO - //if(fieldMap[team.id] != null){ - // fieldMap[team.id].put(target, path); - //} - }); + Core.app.post(() -> mainList.add(path)); //fill with impassables by default for(int x = 0; x < world.width(); x++){ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 804c6769da..8b1459552a 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -31,7 +31,7 @@ public class SectorPresets implements ContentList{ difficulty = 2; }}; - biomassFacility = new SectorPreset("biomassResearchFacility", serpulo, 81){{ + biomassFacility = new SectorPreset("biomassFacility", serpulo, 81){{ captureWave = 20; difficulty = 3; }}; diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 52f59a190e..44b54df434 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -30,9 +30,7 @@ public class SchematicsDialog extends BaseDialog{ public SchematicsDialog(){ super("@schematics"); - Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> { - ((Texture)t).setWrap(TextureWrap.repeat); - }; + Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> ((Texture)t).setWrap(TextureWrap.repeat); shouldPause = true; addCloseButton(); diff --git a/tools/src/mindustry/tools/FontGenerator.java b/tools/src/mindustry/tools/FontGenerator.java index ff13b8fd53..1c1ef50013 100644 --- a/tools/src/mindustry/tools/FontGenerator.java +++ b/tools/src/mindustry/tools/FontGenerator.java @@ -11,7 +11,7 @@ import java.io.*; 1. take set of pre-defined icons and SVGs 2. use Fontello API to get a font with these 3. combine fontello font and standard font, get output font - 4. use apache ttf API to generate a file with constants for every icon size+type (during annotation processing) + 4. use json to generate a file with constants for every icon size+type (during annotation processing) */ public class FontGenerator{